Merge pull request #48 from Tsovak/tsovak/fix-panic

Fix panic during error returning if Dataset\Query couldn't have found

src/server/dekart/query.go

@@ -3,11 +3,12 @@ package dekart
 import (
 	"context"
 	"crypto/sha1"
+	"fmt"
+	"time"
+
 	"dekart/src/proto"
 	"dekart/src/server/job"
 	"dekart/src/server/user"
-	"fmt"
-	"time"
 
 	"github.com/google/uuid"
 	"github.com/rs/zerolog/log"
@@ -284,6 +285,7 @@ func (s Server) CancelQuery(ctx context.Context, req *proto.CancelQueryRequest)
 		}
 	}
 	if reportID == "" {
+		err := fmt.Errorf("query not found id:%s", req.QueryId)
 		log.Warn().Str("QueryId", req.QueryId).Msg("Query not found")
 		return nil, status.Error(codes.NotFound, err.Error())
 	}

src/server/user/claims.go

@@ -86,9 +86,14 @@ func (c ClaimsCheck) GetContext(r *http.Request) context.Context {
 	return userCtx
 }
 
-//GetClaims from the context
+// GetClaims from the context
 func GetClaims(ctx context.Context) *Claims {
-	return ctx.Value(contextKey).(*Claims)
+	value, isExist := ctx.Value(contextKey).(*Claims)
+	if isExist {
+		return value
+	}
+
+	return nil
 }
 
 func (c ClaimsCheck) getPublicKeyFromAmazon(token *jwt.Token) (interface{}, error) {