Merge pull request #49 from rgritti/fix-scope-check-function

Fix scope check function

Author: njuettner

zalando/zalando.go

@@ -131,9 +131,9 @@ func ScopeCheck(name string, scopes ...string) func(tc *ginoauth2.TokenContainer
 	return func(tc *ginoauth2.TokenContainer, ctx *gin.Context) bool {
 		scopesFromToken := make([]string, 0)
 		for _, s := range configuredScopes {
-			if cur, ok := tc.Scopes[s].(string); ok {
-				glog.V(2).Infof("Found configured scope %s", cur)
-				scopesFromToken = append(scopesFromToken, cur)
+			if cur, ok := tc.Scopes[s]; ok {
+				glog.V(2).Infof("Found configured scope %s", s)
+				scopesFromToken = append(scopesFromToken, s)
 				ctx.Set(s, cur) // set value from token of configured scope to the context, which you can use in your application.
 			}
 		}
@@ -150,9 +150,9 @@ func ScopeAndCheck(name string, scopes ...string) func(tc *ginoauth2.TokenContai
 	return func(tc *ginoauth2.TokenContainer, ctx *gin.Context) bool {
 		scopesFromToken := make([]string, 0)
 		for _, s := range configuredScopes {
-			if cur, ok := tc.Scopes[s].(string); ok {
-				glog.V(2).Infof("Found configured scope %s", cur)
-				scopesFromToken = append(scopesFromToken, cur)
+			if cur, ok := tc.Scopes[s]; ok {
+				glog.V(2).Infof("Found configured scope %s", s)
+				scopesFromToken = append(scopesFromToken, s)
 				ctx.Set(s, cur) // set value from token of configured scope to the context, which you can use in your application.
 			} else {
 				return false

zalando/zalando_test.go

@@ -4,10 +4,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"net/http/httptest"
 	"os"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
+	"github.com/gin-gonic/gin"
+
 	"github.com/zalando/gin-oauth2"
 	"golang.org/x/oauth2"
 )
@@ -61,3 +66,66 @@ func TestRequestTeamInfo(t *testing.T) {
 	}
 	fmt.Printf("%+v\n", data)
 }
+
+func TestScopeCheck(t *testing.T) {
+	// given
+	tc := &ginoauth2.TokenContainer{
+		Token: &oauth2.Token{
+			AccessToken:  "sdgergSgadGSAHBSHsagsdv.",
+			TokenType:    "Bearer",
+			RefreshToken: "",
+		},
+		Scopes: map[string]interface{}{
+			"my-scope-1": true,
+			"my-scope-2": true,
+			"uid":        "stups_marilyn-updater",
+		},
+		GrantType: "password",
+		Realm:     "/services",
+	}
+	ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
+
+	// when
+	checkFn := ScopeCheck("name", "my-scope-1")
+	result := checkFn(tc, ctx)
+
+	// then
+	assert.True(t, result)
+
+	scopeVal, scopeOk := ctx.Get("my-scope-1")
+	assert.True(t, scopeOk)
+	assert.Equal(t, true, scopeVal)
+}
+
+func TestScopeAndCheck(t *testing.T) {
+	// given
+	tc := &ginoauth2.TokenContainer{
+		Token: &oauth2.Token{
+			AccessToken:  "sdgergSgadGSAHBSHsagsdv.",
+			TokenType:    "Bearer",
+			RefreshToken: "",
+		},
+		Scopes: map[string]interface{}{
+			"my-scope-1": true,
+			"my-scope-2": true,
+			"uid":        "stups_marilyn-updater",
+		},
+		GrantType: "password",
+		Realm:     "/services",
+	}
+	ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
+
+	// when
+	checkFn := ScopeAndCheck("name", "uid", "my-scope-2")
+	result := checkFn(tc, ctx)
+
+	// then
+	assert.True(t, result)
+
+	uidVal, uidOk := ctx.Get("uid")
+	scopeVal, scopeOk := ctx.Get("my-scope-2")
+	assert.True(t, uidOk)
+	assert.Equal(t, "stups_marilyn-updater", uidVal)
+	assert.True(t, scopeOk)
+	assert.Equal(t, true, scopeVal)
+}