From e5e39b3a6a54e0e9a92ad9dddcf482a3c96b7784 Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Mon, 30 Mar 2020 10:06:48 +0200
Subject: [PATCH] remove pointer on ctxData

---
 internal/api/auth/context.go          | 20 +++++---------------
 internal/api/auth/permissions_test.go |  2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/internal/api/auth/context.go b/internal/api/auth/context.go
index b17affec28..78ef0bc252 100644
--- a/internal/api/auth/context.go
+++ b/internal/api/auth/context.go
@@ -2,7 +2,6 @@ package auth
 
 import (
 	"context"
-	"time"
 
 	"github.com/caos/logging"
 )
@@ -43,24 +42,15 @@ func VerifyTokenAndWriteCtxData(ctx context.Context, token, orgID string, t Toke
 	projectID, err := t.GetProjectIDByClientID(ctx, clientID)
 	logging.LogWithFields("AUTH-GfAoV", "clientID", clientID).OnError(err).Warn("could not read projectid by clientid")
 
-	return context.WithValue(ctx, CtxKeyData{}, &CtxData{UserID: userID, OrgID: orgID, ProjectID: projectID, AgentID: agentID}), nil
+	return context.WithValue(ctx, CtxKeyData{}, CtxData{UserID: userID, OrgID: orgID, ProjectID: projectID, AgentID: agentID}), nil
 }
 
 func GetCtxData(ctx context.Context) CtxData {
-	if data := ctx.Value(CtxKeyData{}); data != nil {
-		ctxData, ok := data.(*CtxData)
-		if ok {
-			return *ctxData
-		}
-		time.Now()
-	}
-	return CtxData{}
+	ctxData, _ := ctx.Value(CtxKeyData{}).(CtxData)
+	return ctxData
 }
 
 func GetPermissionsFromCtx(ctx context.Context) []string {
-	if data := ctx.Value(CtxKeyPermissions{}); data != nil {
-		ctxPermission, _ := data.([]string)
-		return ctxPermission
-	}
-	return nil
+	ctxPermission, _ := ctx.Value(CtxKeyPermissions{}).([]string)
+	return ctxPermission
 }
diff --git a/internal/api/auth/permissions_test.go b/internal/api/auth/permissions_test.go
index 83e5a7f784..0a433f43c6 100644
--- a/internal/api/auth/permissions_test.go
+++ b/internal/api/auth/permissions_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func getTestCtx(userID, orgID string) context.Context {
-	return context.WithValue(context.Background(), CtxKeyData{}, &CtxData{UserID: userID, OrgID: orgID})
+	return context.WithValue(context.Background(), CtxKeyData{}, CtxData{UserID: userID, OrgID: orgID})
 }
 
 type testVerifier struct {