Skip to content

fix(microsoft-entra-id): Support corporate proxies with customFetch #12810

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(microsoft-entra-id): Support corporate proxies with customFetch #12810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions packages/core/src/providers/microsoft-entra-id.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,17 @@ export default function MicrosoftEntraID(

config.issuer ??= "https://login.microsoftonline.com/common/v2.0"

// https://authjs.dev/guides/corporate-proxy
const fetchFunction = config[customFetch] || fetch;

return {
id: "microsoft-entra-id",
name: "Microsoft Entra ID",
type: "oidc",
authorization: { params: { scope: "openid profile email User.Read" } },
async profile(profile, tokens) {
// https://learn.microsoft.com/en-us/graph/api/profilephoto-get?view=graph-rest-1.0&tabs=http#examples
const response = await fetch(
const response = await fetchFunction(
`https://graph.microsoft.com/v1.0/me/photos/${profilePhotoSize}x${profilePhotoSize}/$value`,
{ headers: { Authorization: `Bearer ${tokens.access_token}` } }
)
Expand Down Expand Up @@ -142,14 +145,14 @@ export default function MicrosoftEntraID(
async [customFetch](...args) {
const url = new URL(args[0] instanceof Request ? args[0].url : args[0])
if (url.pathname.endsWith(".well-known/openid-configuration")) {
const response = await fetch(...args)
const response = await fetchFunction(...args)
const json = await response.clone().json()
const tenantRe = /microsoftonline\.com\/(\w+)\/v2\.0/
const tenantId = config.issuer?.match(tenantRe)?.[1] ?? "common"
const issuer = json.issuer.replace("{tenantid}", tenantId)
return Response.json({ ...json, issuer })
}
return fetch(...args)
return fetchFunction(...args)
},
[conformInternal]: true,
options: config,
Expand Down