From 41ce1b1c75036e33b0aec8eb2250d6ae3ab5e7e0 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Sun, 29 Dec 2019 18:42:25 +0100
Subject: [PATCH] Make SuperUser functions more resiliant to nil values

---
 pkg/auth/identity.go         | 2 +-
 pkg/auth/identity_context.go | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/auth/identity.go b/pkg/auth/identity.go
index 4869b72be..73e079609 100644
--- a/pkg/auth/identity.go
+++ b/pkg/auth/identity.go
@@ -43,5 +43,5 @@ func NewSuperUserIdentity() *Identity {
 }
 
 func IsSuperUser(i Identifiable) bool {
-	return superUserID == i.Identity()
+	return i != nil && superUserID == i.Identity()
 }
diff --git a/pkg/auth/identity_context.go b/pkg/auth/identity_context.go
index c0cc13658..b82c58cb3 100644
--- a/pkg/auth/identity_context.go
+++ b/pkg/auth/identity_context.go
@@ -40,7 +40,10 @@ func SetSuperUserContext(ctx context.Context) context.Context {
 	su := NewSuperUserIdentity()
 
 	ctx = SetIdentityToContext(ctx, su)
-	ctx = SetJwtToContext(ctx, DefaultJwtHandler.Encode(su))
+
+	if DefaultJwtHandler != nil {
+		ctx = SetJwtToContext(ctx, DefaultJwtHandler.Encode(su))
+	}
 
 	return ctx
 }