Skip to content

improvement(auth): make Microsoft emailVerified derivation total #5157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 2 commits into from
Jun 20, 2026
+17 −4
Merged

improvement(auth): make Microsoft emailVerified derivation total #5157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac8b583
improvement(auth): make Microsoft emailVerified derivation total
waleedlatif1 Jun 20, 2026
035b81f
test(auth): lock in unverified for a string verified-email claim
waleedlatif1 Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion apps/sim/lib/oauth/microsoft.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,20 @@ describe('deriveMicrosoftEmailVerified', () => {
expect(deriveMicrosoftEmailVerified({ email_verified: 'true' }, EMAIL)).toBe(true)
})

it('treats a malformed verified-email claim as unverified', () => {
it('treats malformed (non-array) verified-email claims as unverified without throwing', () => {
expect(deriveMicrosoftEmailVerified({ verified_primary_email: 'not-an-array' }, EMAIL)).toBe(
false
)
expect(deriveMicrosoftEmailVerified({ verified_primary_email: 123 }, EMAIL)).toBe(false)
expect(deriveMicrosoftEmailVerified({ verified_secondary_email: { foo: 'bar' } }, EMAIL)).toBe(
false
)
expect(deriveMicrosoftEmailVerified({ verified_primary_email: null }, EMAIL)).toBe(false)
})
Comment thread
waleedlatif1 marked this conversation as resolved.

it('does not treat a string claim equal to the email as verified (guards the old unsafe cast)', () => {
expect(deriveMicrosoftEmailVerified({ verified_primary_email: EMAIL }, EMAIL)).toBe(false)
expect(deriveMicrosoftEmailVerified({ verified_secondary_email: EMAIL }, EMAIL)).toBe(false)
})
})

Expand Down
9 changes: 6 additions & 3 deletions apps/sim/lib/oauth/microsoft.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ export function deriveMicrosoftEmailVerified(
if (claims.email_verified !== undefined) {
return Boolean(claims.email_verified)
}
const verifiedPrimaryEmail = claims.verified_primary_email as string[] | undefined
const verifiedSecondaryEmail = claims.verified_secondary_email as string[] | undefined
return Boolean(verifiedPrimaryEmail?.includes(email) || verifiedSecondaryEmail?.includes(email))
const { verified_primary_email: verifiedPrimary, verified_secondary_email: verifiedSecondary } =
claims
return (
(Array.isArray(verifiedPrimary) && verifiedPrimary.includes(email)) ||
(Array.isArray(verifiedSecondary) && verifiedSecondary.includes(email))
)
}
Loading