Skip to content

Node interop: Add handling for redirect URI based on platform #7908

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.

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
merged 21 commits into from
Jul 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Add handling for redirect URI based on platform #7908",
"packageName": "@azure/msal-node-extensions",
"email": "[email protected]",
"dependentChangeType": "patch"
}
75 changes: 53 additions & 22 deletions extensions/msal-node-extensions/src/broker/NativeBrokerPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,11 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
"NativeBrokerPlugin - acquireTokenSilent called",
request.correlationId
);
const authParams = this.generateRequestParameters(request);
const account = await this.getAccount(request);
const platformRequest = request;
const authParams = this.generateRequestParameters(platformRequest);
const account = await this.getAccount(platformRequest);
platformRequest.redirectUri =
this.chooseRedirectUriByPlatform(platformRequest);

return new Promise(
(resolve: (value: AuthenticationResult) => void, reject) => {
Expand All @@ -208,7 +211,7 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
}
}
const authenticationResult = this.getAuthenticationResult(
request,
platformRequest,
result
);
resolve(authenticationResult);
Expand All @@ -218,14 +221,14 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
if (account) {
msalNodeRuntime.AcquireTokenSilentlyAsync(
authParams,
request.correlationId,
platformRequest.correlationId,
account,
resultCallback
);
} else {
msalNodeRuntime.SignInSilentlyAsync(
authParams,
request.correlationId,
platformRequest.correlationId,
resultCallback
);
}
Expand All @@ -247,8 +250,11 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
"NativeBrokerPlugin - acquireTokenInteractive called",
request.correlationId
);
const authParams = this.generateRequestParameters(request);
const account = await this.getAccount(request);
const platformRequest = request;
const authParams = this.generateRequestParameters(platformRequest);
platformRequest.redirectUri =
this.chooseRedirectUriByPlatform(platformRequest);
const account = await this.getAccount(platformRequest);
const windowHandle = providedWindowHandle || Buffer.from([0]);

return new Promise(
Expand All @@ -264,27 +270,28 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
}
}
const authenticationResult = this.getAuthenticationResult(
request,
platformRequest,
result
);
resolve(authenticationResult);
};

try {
switch (request.prompt) {
switch (platformRequest.prompt) {
case PromptValue.LOGIN:
case PromptValue.SELECT_ACCOUNT:
case PromptValue.CREATE:
this.logger.info(
"Calling native interop SignInInteractively API",
request.correlationId
platformRequest.correlationId
);
const loginHint =
request.loginHint || Constants.EMPTY_STRING;
platformRequest.loginHint ||
Constants.EMPTY_STRING;
msalNodeRuntime.SignInInteractivelyAsync(
windowHandle,
authParams,
request.correlationId,
platformRequest.correlationId,
loginHint,
resultCallback
);
Expand All @@ -293,22 +300,22 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
if (account) {
this.logger.info(
"Calling native interop AcquireTokenSilently API",
request.correlationId
platformRequest.correlationId
);
msalNodeRuntime.AcquireTokenSilentlyAsync(
authParams,
request.correlationId,
platformRequest.correlationId,
account,
resultCallback
);
} else {
this.logger.info(
"Calling native interop SignInSilently API",
request.correlationId
platformRequest.correlationId
);
msalNodeRuntime.SignInSilentlyAsync(
authParams,
request.correlationId,
platformRequest.correlationId,
resultCallback
);
}
Expand All @@ -317,26 +324,27 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
if (account) {
this.logger.info(
"Calling native interop AcquireTokenInteractively API",
request.correlationId
platformRequest.correlationId
);
msalNodeRuntime.AcquireTokenInteractivelyAsync(
windowHandle,
authParams,
request.correlationId,
platformRequest.correlationId,
account,
resultCallback
);
} else {
this.logger.info(
"Calling native interop SignIn API",
request.correlationId
platformRequest.correlationId
);
const loginHint =
request.loginHint || Constants.EMPTY_STRING;
platformRequest.loginHint ||
Constants.EMPTY_STRING;
msalNodeRuntime.SignInAsync(
windowHandle,
authParams,
request.correlationId,
platformRequest.correlationId,
loginHint,
resultCallback
);
Expand Down Expand Up @@ -457,7 +465,10 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
request.clientId,
request.authority
);
authParams.SetRedirectUri(request.redirectUri);

authParams.SetRedirectUri(
this.chooseRedirectUriByPlatform(request)
);
authParams.SetRequestedScopes(request.scopes.join(" "));

if (request.claims) {
Expand Down Expand Up @@ -516,6 +527,26 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
return authParams;
}

private chooseRedirectUriByPlatform(request: NativeRequest): string {
this.logger.trace(
"NativeBrokerPlugin - chooseRedirectUriByPlatform called",
request.correlationId
);
let redirectUri: string;
switch (process.platform) {
case "darwin":
redirectUri = "msauth.com.msauth.unsignedapp://auth";
break;
case "win32":
redirectUri = `ms-appx-web://Microsoft.AAD.BrokerPlugin/${request.clientId}`;
break;
default:
redirectUri =
"https://login.microsoftonline.com/common/oauth2/nativeclient";
}
return redirectUri;
}

private getAuthenticationResult(
request: NativeRequest,
authResult: AuthResult
Expand Down
Loading