From 5cc884766e12e24bf84c0c29bc34e569f8195bd8 Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Thu, 15 Oct 2020 14:02:53 +0200
Subject: [PATCH] improve ValidateAuthReqScopes

---
 pkg/op/authrequest.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/op/authrequest.go b/pkg/op/authrequest.go
index 86e2275..4d6118c 100644
--- a/pkg/op/authrequest.go
+++ b/pkg/op/authrequest.go
@@ -111,20 +111,20 @@ func ValidateAuthReqScopes(client Client, scopes []string) ([]string, error) {
 	}
 	openID := false
 	for i := len(scopes) - 1; i >= 0; i-- {
-		switch scopes[i] {
-		case oidc.ScopeOpenID:
+		scope := scopes[i]
+		if scope == oidc.ScopeOpenID {
 			openID = true
-		case oidc.ScopeProfile,
-			oidc.ScopeEmail,
-			oidc.ScopePhone,
-			oidc.ScopeAddress,
-			oidc.ScopeOfflineAccess:
-		default:
-			if !utils.Contains(client.AllowedScopes(), scopes[i]) {
-				scopes[i] = scopes[len(scopes)-1]
-				scopes[len(scopes)-1] = ""
-				scopes = scopes[:len(scopes)-1]
-			}
+			continue
+		}
+		if !(scope == oidc.ScopeProfile ||
+			scope == oidc.ScopeEmail ||
+			scope == oidc.ScopePhone ||
+			scope == oidc.ScopeAddress ||
+			scope == oidc.ScopeOfflineAccess) &&
+			!utils.Contains(client.AllowedScopes(), scope) {
+			scopes[i] = scopes[len(scopes)-1]
+			scopes[len(scopes)-1] = ""
+			scopes = scopes[:len(scopes)-1]
 		}
 	}
 	if !openID {