zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2026-04-22 16:07:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3930 from gravitl/master

Browse Source 
Master
This commit is contained in:
Abhishek Kondur
2026-03-23 14:50:13 +05:30
committed by GitHub
parent 0eb175a62b 81398cdd44
commit e149f8e582
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pro/auth/azure-ad.go
+2 -1
View File
@@ -86,7 +86,7 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
inviteExists = true
}
// check if user approval is already pending
if !inviteExists && logic.IsPendingUser(content.Email) {
if !inviteExists && (logic.IsPendingUser(content.Email) || logic.IsPendingUser(content.UserPrincipalName)) {
handleOauthUserSignUpApprovalPending(w)
return
}
@@ -109,6 +109,7 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
return
}
logic.DeleteUserInvite(content.Email)
logic.DeletePendingUser(content.UserPrincipalName)
logic.DeletePendingUser(content.Email)
} else {
if !isEmailAllowed(content.Email) {