@azure/msal-common 14.6.0 → 14.6.2-alpha.0

package/src/authority/AuthorityFactory.ts

@@ -4,10 +4,6 @@
  */
 
 import { Authority, formatAuthorityUri } from "./Authority";
-import {
-    createClientConfigurationError,
-    ClientConfigurationErrorCodes,
-} from "../error/ClientConfigurationError";
 import { INetworkModule } from "../network/INetworkModule";
 import {
     createClientAuthError,
@@ -20,99 +16,59 @@ import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient"
 import { PerformanceEvents } from "../telemetry/performance/PerformanceEvent";
 import { invokeAsync } from "../utils/FunctionWrappers";
 
-/** @internal */
-export class AuthorityFactory {
-    /**
-     * Create an authority object of the correct type based on the url
-     * Performs basic authority validation - checks to see if the authority is of a valid type (i.e. aad, b2c, adfs)
-     *
-     * Also performs endpoint discovery.
-     *
-     * @param authorityUri
-     * @param networkClient
-     * @param protocolMode
-     */
-    static async createDiscoveredInstance(
-        authorityUri: string,
-        networkClient: INetworkModule,
-        cacheManager: ICacheManager,
-        authorityOptions: AuthorityOptions,
-        logger: Logger,
-        performanceClient?: IPerformanceClient,
-        correlationId?: string
-    ): Promise<Authority> {
-        performanceClient?.addQueueMeasurement(
-            PerformanceEvents.AuthorityFactoryCreateDiscoveredInstance,
-            correlationId
-        );
-        const authorityUriFinal = Authority.transformCIAMAuthority(
-            formatAuthorityUri(authorityUri)
-        );
-
-        // Initialize authority and perform discovery endpoint check.
-        const acquireTokenAuthority: Authority =
-            AuthorityFactory.createInstance(
-                authorityUriFinal,
-                networkClient,
-                cacheManager,
-                authorityOptions,
-                logger,
-                performanceClient,
-                correlationId
-            );
-
-        try {
-            await invokeAsync(
-                acquireTokenAuthority.resolveEndpointsAsync.bind(
-                    acquireTokenAuthority
-                ),
-                PerformanceEvents.AuthorityResolveEndpointsAsync,
-                logger,
-                performanceClient,
-                correlationId
-            )();
-            return acquireTokenAuthority;
-        } catch (e) {
-            throw createClientAuthError(
-                ClientAuthErrorCodes.endpointResolutionError
-            );
-        }
-    }
+/**
+ * Create an authority object of the correct type based on the url
+ * Performs basic authority validation - checks to see if the authority is of a valid type (i.e. aad, b2c, adfs)
+ *
+ * Also performs endpoint discovery.
+ *
+ * @param authorityUri
+ * @param networkClient
+ * @param protocolMode
+ * @internal
+ */
+export async function createDiscoveredInstance(
+    authorityUri: string,
+    networkClient: INetworkModule,
+    cacheManager: ICacheManager,
+    authorityOptions: AuthorityOptions,
+    logger: Logger,
+    correlationId: string,
+    performanceClient?: IPerformanceClient
+): Promise<Authority> {
+    performanceClient?.addQueueMeasurement(
+        PerformanceEvents.AuthorityFactoryCreateDiscoveredInstance,
+        correlationId
+    );
+    const authorityUriFinal = Authority.transformCIAMAuthority(
+        formatAuthorityUri(authorityUri)
+    );
 
-    /**
-     * Create an authority object of the correct type based on the url
-     * Performs basic authority validation - checks to see if the authority is of a valid type (i.e. aad, b2c, adfs)
-     *
-     * Does not perform endpoint discovery.
-     *
-     * @param authorityUrl
-     * @param networkInterface
-     * @param protocolMode
-     */
-    static createInstance(
-        authorityUrl: string,
-        networkInterface: INetworkModule,
-        cacheManager: ICacheManager,
-        authorityOptions: AuthorityOptions,
-        logger: Logger,
-        performanceClient?: IPerformanceClient,
-        correlationId?: string
-    ): Authority {
-        // Throw error if authority url is empty
-        if (!authorityUrl) {
-            throw createClientConfigurationError(
-                ClientConfigurationErrorCodes.urlEmptyError
-            );
-        }
+    // Initialize authority and perform discovery endpoint check.
+    const acquireTokenAuthority: Authority = new Authority(
+        authorityUriFinal,
+        networkClient,
+        cacheManager,
+        authorityOptions,
+        logger,
+        correlationId,
+        performanceClient
+    );
 
-        return new Authority(
-            authorityUrl,
-            networkInterface,
-            cacheManager,
-            authorityOptions,
+    try {
+        await invokeAsync(
+            acquireTokenAuthority.resolveEndpointsAsync.bind(
+                acquireTokenAuthority
+            ),
+            PerformanceEvents.AuthorityResolveEndpointsAsync,
             logger,
             performanceClient,
             correlationId
+        )();
+        return acquireTokenAuthority;
+    } catch (e) {
+        throw createClientAuthError(
+            ClientAuthErrorCodes.endpointResolutionError
         );
     }
 }