Merge pull request #2859 from gravitl/release-v0.23.0

patch: fix azure-ad,github callback
gravitl · Mar 15, 2024 · 194a900 · 194a900
2 parents d390f44 + d70d33f
commit 194a900
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/auth/azure-ad.go b/auth/azure-ad.go
@@ -66,7 +66,7 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-	user, err := logic.GetUser(content.Email)
+	user, err := logic.GetUser(content.UserPrincipalName)
 	if err != nil {
 		handleOauthUserNotFound(w)
 		return

diff --git a/auth/github.go b/auth/github.go
@@ -66,7 +66,7 @@ func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-	user, err := logic.GetUser(content.Email)
+	user, err := logic.GetUser(content.Login)
 	if err != nil {
 		handleOauthUserNotFound(w)
 		return