Addressed 1P failing test

AzureAD · Jul 20, 2023 · f60400f · f60400f
1 parent a8c9663
commit f60400f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/msal-browser/src/config/Configuration.ts b/lib/msal-browser/src/config/Configuration.ts
@@ -11,6 +11,7 @@ import {
     Constants,
     ProtocolMode,
     OIDCOptions,
+    CompareOIDCOptions,
     ServerResponseType,
     LogLevel,
     StubbedNetworkModule,
@@ -327,7 +328,8 @@ export function buildConfiguration(
 
     // Throw an error if user has set OIDCOptions without being in OIDC protocol mode
     if(userInputAuth?.protocolMode !== ProtocolMode.OIDC && 
-        userInputAuth?.OIDCOptions) {
+        userInputAuth?.OIDCOptions &&
+        !CompareOIDCOptions(userInputAuth.OIDCOptions, DEFAULT_AUTH_OPTIONS.OIDCOptions)) {
             throw ClientConfigurationError.createCannotSetOIDCOptionsError();
     }
 
@@ -337,7 +339,7 @@ export function buildConfiguration(
         providedSystemOptions?.allowNativeBroker) {
             throw ClientConfigurationError.createCannotAllowNativeBrokerError();
     }
-    
+
     const overlayedConfig: BrowserConfiguration = {
         auth: {
             ...DEFAULT_AUTH_OPTIONS, 

diff --git a/lib/msal-common/src/authority/OIDCOptions.ts b/lib/msal-common/src/authority/OIDCOptions.ts
@@ -12,3 +12,8 @@ export type OIDCOptions = {
     serverResponseType?: ServerResponseType;
     defaultScopes?: Array<string>;
 };
+
+export function CompareOIDCOptions(first: OIDCOptions, second: OIDCOptions): boolean {
+    return (first.serverResponseType === second.serverResponseType &&
+        first.defaultScopes === second.defaultScopes);
+};
diff --git a/lib/msal-common/src/index.ts b/lib/msal-common/src/index.ts
@@ -48,7 +48,7 @@ export {
 export { AuthorityFactory } from "./authority/AuthorityFactory";
 export { AuthorityType } from "./authority/AuthorityType";
 export { ProtocolMode } from "./authority/ProtocolMode";
-export { OIDCOptions } from "./authority/OIDCOptions";
+export { OIDCOptions, CompareOIDCOptions } from "./authority/OIDCOptions";
 // Broker
 export { INativeBrokerPlugin } from "./broker/nativeBroker/INativeBrokerPlugin";
 // Cache