Skip to content

Commit 3c83743

Browse files
authored
1 parent ea38ecc commit 3c83743

14 files changed

+274
-147
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "error surfacing changes",
4+
"packageName": "@azure/msal-common",
5+
"email": "akaliugonna@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "error surfacing changes",
4+
"packageName": "@azure/msal-node-extensions",
5+
"email": "akaliugonna@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

extensions/msal-node-extensions/src/broker/NativeBrokerPlugin.ts

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
InteractionRequiredAuthError,
1919
Logger,
2020
LoggerOptions,
21+
PlatformBrokerError,
2122
NativeRequest,
2223
NativeSignOutRequest,
2324
PromptValue,
@@ -38,8 +39,6 @@ import {
3839
LogLevel as MsalRuntimeLogLevel,
3940
} from "@azure/msal-node-runtime";
4041
import { ErrorCodes } from "../utils/Constants.js";
41-
import { StringUtils } from "../utils/StringUtils.js";
42-
import { NativeAuthError } from "../error/NativeAuthError.js";
4342
import { version, name } from "../packageMetadata.js";
4443

4544
export class NativeBrokerPlugin implements INativeBrokerPlugin {
@@ -648,58 +647,70 @@ export class NativeBrokerPlugin implements INativeBrokerPlugin {
648647
);
649648
}
650649

651-
private wrapError(error: unknown): NativeAuthError | Object | null {
650+
private wrapError(error: unknown): PlatformBrokerError | Object | null {
652651
if (
653652
error &&
654653
typeof error === "object" &&
655654
this.isMsalRuntimeError(error)
656655
) {
657656
const { errorCode, errorStatus, errorContext, errorTag } =
658657
error as MsalRuntimeError;
659-
const tagString = StringUtils.tagToString(errorTag);
660-
const enhancedErrorContext = errorContext
661-
? `${errorContext} (Error Code: ${errorCode}, Tag: ${tagString})`
662-
: `(Error Code: ${errorCode}, Tag: ${tagString})`;
658+
659+
const msalNodeRuntimeError = new PlatformBrokerError(
660+
ErrorStatus[errorStatus],
661+
errorContext,
662+
errorCode,
663+
errorTag
664+
);
665+
666+
let wrappedError;
667+
663668
switch (errorStatus) {
664669
case ErrorStatus.InteractionRequired:
665670
case ErrorStatus.AccountUnusable:
666-
return new InteractionRequiredAuthError(
671+
wrappedError = new InteractionRequiredAuthError(
667672
ErrorCodes.INTERATION_REQUIRED_ERROR_CODE,
668-
enhancedErrorContext
673+
msalNodeRuntimeError.message
669674
);
675+
break;
670676
case ErrorStatus.NoNetwork:
671677
case ErrorStatus.NetworkTemporarilyUnavailable:
672-
return createClientAuthError(
678+
wrappedError = createClientAuthError(
673679
ClientAuthErrorCodes.noNetworkConnectivity
674680
);
681+
break;
675682
case ErrorStatus.ServerTemporarilyUnavailable:
676-
return new ServerError(
683+
wrappedError = new ServerError(
677684
ErrorCodes.SERVER_UNAVAILABLE,
678685
errorContext
679686
);
687+
break;
680688
case ErrorStatus.UserCanceled:
681-
return createClientAuthError(
689+
wrappedError = createClientAuthError(
682690
ClientAuthErrorCodes.userCanceled
683691
);
692+
break;
684693
case ErrorStatus.AuthorityUntrusted:
685-
return createClientConfigurationError(
694+
wrappedError = createClientConfigurationError(
686695
ClientConfigurationErrorCodes.untrustedAuthority
687696
);
697+
break;
688698
case ErrorStatus.UserSwitched:
689699
// Not an error case, if there's customer demand we can surface this as a response property
690700
return null;
691701
case ErrorStatus.AccountNotFound:
692-
return createClientAuthError(
702+
wrappedError = createClientAuthError(
693703
ClientAuthErrorCodes.noAccountFound
694704
);
705+
break;
695706
default:
696-
return new NativeAuthError(
697-
ErrorStatus[errorStatus],
698-
enhancedErrorContext,
699-
errorCode,
700-
errorTag
707+
wrappedError = createClientAuthError(
708+
ClientAuthErrorCodes.platformBrokerError
701709
);
702710
}
711+
712+
wrappedError.platformBrokerError = msalNodeRuntimeError;
713+
return wrappedError;
703714
}
704715
throw error;
705716
}

extensions/msal-node-extensions/src/error/NativeAuthError.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

extensions/msal-node-extensions/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ export { CrossPlatformLockOptions } from "./lock/CrossPlatformLockOptions.js";
1414
export { PersistenceCreator } from "./persistence/PersistenceCreator.js";
1515
export { IPersistenceConfiguration } from "./persistence/IPersistenceConfiguration.js";
1616
export { Environment } from "./utils/Environment.js";
17-
export { StringUtils } from "./utils/StringUtils.js";
1817
export { NativeBrokerPlugin } from "./broker/NativeBrokerPlugin.js";

extensions/msal-node-extensions/src/utils/StringUtils.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)