From 1608b473ebee57b9d7290b6e464abb53bd2fcd8c Mon Sep 17 00:00:00 2001
From: Happy2C0de <46957159+Happy2C0de@users.noreply.github.com>
Date: Thu, 19 Aug 2021 13:23:02 +0200
Subject: [PATCH] Remove false failed errors.
Signed-off-by: Happy2C0de <46957159+Happy2C0de@users.noreply.github.com>
---
connector/oidc/oidc.go | 8 +-------
connector/oidc/oidc_test.go | 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/connector/oidc/oidc.go b/connector/oidc/oidc.go
index 29241dc6..318bcf86 100644
--- a/connector/oidc/oidc.go
+++ b/connector/oidc/oidc.go
@@ -299,10 +299,7 @@ func (c *oidcConnector) createIdentity(ctx context.Context, identity connector.I
preferredUsername, found := claims[prefUsername].(string)
if (!found || c.overrideClaimMapping) && c.preferredUsernameKey != "" {
prefUsername = c.preferredUsernameKey
- preferredUsername, found = claims[prefUsername].(string)
- if !found {
- return identity, fmt.Errorf("missing \"%s\" claim", prefUsername)
- }
+ preferredUsername, _ = claims[prefUsername].(string)
}
hasEmailScope := false
@@ -319,9 +316,6 @@ func (c *oidcConnector) createIdentity(ctx context.Context, identity connector.I
if (!found || c.overrideClaimMapping) && c.emailKey != "" {
emailKey = c.emailKey
email, found = claims[emailKey].(string)
- if !found {
- return identity, fmt.Errorf("missing \"%s\" claim", emailKey)
- }
}
if !found && hasEmailScope {
diff --git a/connector/oidc/oidc_test.go b/connector/oidc/oidc_test.go
index 9040cf5c..3038cebc 100644
--- a/connector/oidc/oidc_test.go
+++ b/connector/oidc/oidc_test.go
@@ -253,7 +253,7 @@ func TestHandleCallback(t *testing.T) {
},
},
{
- name: "customGroupsKeyButGroupsProvidedButOverride",
+ name: "customGroupsKeyDespiteGroupsProvidedButOverride",
overrideClaimMapping: true,
groupsKey: "cognito:groups",
expectUserID: "subvalue",
--
GitLab