Add error

Author: tnorling

lib/msal-common/src/authority/TrustedAuthority.ts

@@ -3,6 +3,7 @@ import { INetworkModule } from "../network/INetworkModule";
 import { OpenIdConfigResponse } from "./OpenIdConfigResponse";
 import { InstanceMetadataType } from "./InstanceMetadataType";
 import { IInstanceDiscoveryMetadata } from "./IInstanceDiscoveryMetadata";
+import { ClientConfigurationError } from "../error/ClientConfigurationError";
 
 export class TrustedAuthority {
     private static InstanceMetadata: InstanceMetadataType = {};
@@ -15,8 +16,7 @@ export class TrustedAuthority {
     public static setTrustedAuthoritiesFromConfig(knownAuthorities: Array<string>, instanceMetadata: Array<IInstanceDiscoveryMetadata>): void {
         if (!this.getTrustedHostList().length){
             if (knownAuthorities.length && instanceMetadata.length) {
-                // TODO Put better error here
-                throw "Cannot pass both knownAuthorities and instanceMetadata";
+                ClientConfigurationError.createKnownAuthoritiesInstanceMetadataError();
             }
 
             this.createInstanceMetadataFromKnownAuthorities(knownAuthorities);

lib/msal-common/src/error/ClientConfigurationError.ts

@@ -60,9 +60,9 @@ export const ClientConfigurationErrorMessage = {
         code: "pkce_params_missing",
         desc: "Both params: code_challenge and code_challenge_method are to be passed if to be sent in the request"
     },
-    b2cKnownAuthoritiesNotSet: {
-        code: "b2c_known_authorities_not_set",
-        desc: "Must set known authorities when validateAuthority is set to True and using B2C"
+    knownAuthoritiesAndInstanceMetadata: {
+        code: "invalid_known_authorities",
+        desc: "knownAuthorities and instanceMetadata cannot both be provided. Please provide instanceMetadata object for AAD, knownAuthorities otherwise."
     },
     untrustedAuthority: {
         code: "untrusted_authority",
@@ -199,11 +199,11 @@ export class ClientConfigurationError extends ClientAuthError {
     }
 
     /**
-     * Throws an error when the user passes B2C authority and does not set knownAuthorities
+     * Throws an error when the user passes both knownAuthorities and instanceMetadata
      */
-    static createKnownAuthoritiesNotSetError(): ClientConfigurationError {
-        return new ClientConfigurationError(ClientConfigurationErrorMessage.b2cKnownAuthoritiesNotSet.code,
-            ClientConfigurationErrorMessage.b2cKnownAuthoritiesNotSet.desc);
+    static createKnownAuthoritiesInstanceMetadataError(): ClientConfigurationError {
+        return new ClientConfigurationError(ClientConfigurationErrorMessage.knownAuthoritiesAndInstanceMetadata.code,
+            ClientConfigurationErrorMessage.knownAuthoritiesAndInstanceMetadata.desc);
     }
 
     /**