Merge branch 'main' into fix/after-meeting-ends-migration

This commit is contained in:
kodiakhq[bot] 2022-08-30 18:28:44 +00:00 committed by GitHub
commit f4d6a2f2a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -18,10 +18,10 @@ This guide explains the settings you need to use to configure SAML with your Ide
**Mapping Attributes / Attribute Statements:**
id -> user.id
http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier -> id
email -> user.email
http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress -> email
firstName -> user.firstName
http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname -> firstName
lastName -> user.lastName
http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname -> lastName

View File

@ -328,7 +328,7 @@ export default NextAuth({
if (account.provider === "saml") {
idP = IdentityProvider.SAML;
}
user.email_verified = user.email_verified || profile.email_verified;
user.email_verified = user.email_verified || user.emailVerified || profile.email_verified;
if (!user.email_verified) {
return "/auth/error?error=unverified-email";