Merge pull request #195 from yathindrakodithuwakku/revert-contract-revamp

Revert contract revamp

Author: thivi

lib/src/constants/oidc-endpoints.ts

@@ -26,7 +26,13 @@ export const SERVICE_RESOURCES: OIDCEndpoints  = {
     jwksUri: "/oauth2/jwks",
     revocationEndpoint: "/oauth2/revoke",
     tokenEndpoint: "/oauth2/token",
-    userinfoEndpoint: "/oauth2/userinfo"
+    userinfoEndpoint: "/oauth2/userinfo",
+    /**
+     * The well known endpoint path.
+     * @deprecated This will be removed in the next version bump 2.0.0 
+     * as this is already defined in config.wellKnownEndpoint.
+     */
+    wellKnownEndpoint: "/oauth2/token/.well-known/openid-configuration"
 };
 
 export const AUTHORIZATION_ENDPOINT = "authorization_endpoint";

lib/src/core/authentication-core.ts

@@ -438,8 +438,10 @@ export class AuthenticationCore<T> {
             return Promise.resolve();
         }
 
-        if ((configData as any).wellKnownEndpoint) {
-            const wellKnownEndpoint = (configData as any).wellKnownEndpoint;
+        const wellKnownEndpoint = (configData as any).wellKnownEndpoint || 
+            configData?.endpoints?.wellKnownEndpoint;
+
+        if (wellKnownEndpoint) {
 
             let response: Response;
 
@@ -506,7 +508,8 @@ export class AuthenticationCore<T> {
             registrationEndpoint: oidcProviderMetaData.registration_endpoint ?? "",
             revocationEndpoint: oidcProviderMetaData.revocation_endpoint ?? "",
             tokenEndpoint: oidcProviderMetaData.token_endpoint ?? "",
-            userinfoEndpoint: oidcProviderMetaData.userinfo_endpoint ?? ""
+            userinfoEndpoint: oidcProviderMetaData.userinfo_endpoint ?? "",
+            wellKnownEndpoint: await this._authenticationHelper.resolveWellKnownEndpoint()
         };
     }
 
@@ -585,6 +588,12 @@ export class AuthenticationCore<T> {
 
     public async updateConfig(config: Partial<AuthClientConfig<T>>): Promise<void> {
         await this._dataLayer.setConfigData(config);
-        await this.getOIDCProviderMetaData(true);
+
+        if ((config as any).overrideWellEndpointConfig) {
+            config?.endpoints &&
+                (await this._dataLayer.setOIDCProviderMetaData(await this._authenticationHelper.resolveEndpoints({})));
+        } else if (config?.endpoints) {
+            await this.getOIDCProviderMetaData(true);
+        }
     }
 }

lib/src/helpers/authentication-helper.ts

@@ -64,17 +64,34 @@ export class AuthenticationHelper<T> {
         this._cryptoHelper = cryptoHelper;
     }
 
+    public async resolveWellKnownEndpoint(): Promise<string> {
+        const configData = await this._config();
+
+        const wellKnownEndpoint = (configData as any).wellKnownEndpoint || 
+            configData?.endpoints?.wellKnownEndpoint;
+
+        const baseUrl = (configData as any).baseUrl || (configData as any).serverOrigin;
+
+        if (wellKnownEndpoint) {
+            return wellKnownEndpoint;
+        } else {
+            return baseUrl + SERVICE_RESOURCES.wellKnownEndpoint;
+        }
+    }
+
     public async resolveEndpoints(response: OIDCProviderMetaData): Promise<OIDCProviderMetaData> {
         const oidcProviderMetaData = {};
         const configData = await this._config();
 
-        configData.endpoints &&
-            Object.keys(configData.endpoints).forEach((endpointName: string) => {
-                const snakeCasedName = endpointName.replace(/[A-Z]/g, (letter) => `_${ letter.toLowerCase() }`);
-                oidcProviderMetaData[ snakeCasedName ] = configData?.endpoints
-                    ? configData.endpoints[ endpointName ]
-                    : "";
-            });
+        if (configData.overrideWellEndpointConfig) {
+            configData.endpoints &&
+                Object.keys(configData.endpoints).forEach((endpointName: string) => {
+                    const snakeCasedName = endpointName.replace(/[A-Z]/g, (letter) => `_${ letter.toLowerCase() }`);
+                    oidcProviderMetaData[ snakeCasedName ] = configData?.endpoints
+                        ? configData.endpoints[ endpointName ]
+                        : "";
+                });
+        }
 
         return { ...response, ...oidcProviderMetaData };
     }

lib/src/models/client-config.ts

@@ -31,14 +31,19 @@ export interface DefaultAuthClientConfig {
   scope?: string[];
   validateIDToken?: boolean;
   /**
-   * Allowed leeway for id_tokens (in seconds).
+   * The allow explicitly override oidc endpoints.
+   * @deprecated This will be removed in the next version bump 2.0.0.
    */
+  overrideWellEndpointConfig?: boolean;
+  /**
+  * Allowed leeway for id_tokens (in seconds).
+  */
   clockTolerance?: number;
   /**
-   * Specifies if cookies should be sent with access-token requests, refresh-token requests,
-   * custom-grant requests, etc.
-   *
-   */
+  * Specifies if cookies should be sent with access-token requests, refresh-token requests,
+  * custom-grant requests, etc.
+  *
+  */
   sendCookiesInRequests?: boolean;
 }
 
@@ -49,9 +54,9 @@ export interface WellKnownAuthClientConfig extends DefaultAuthClientConfig {
 
 export interface ServerOriginAuthClientConfig extends DefaultAuthClientConfig {
   /**
-   * The asgardeo root domain url with the organization.
-   * @deprecated Use `baseUrl` instead, this will be removed in the next version bump 2.x.x.
-   */
+  * The asgardeo root domain url with the organization.
+  * @deprecated Use `baseUrl` instead, this will be removed in the next version bump 2.0.0.
+  */
   serverOrigin: string;
   endpoints?: Partial<OIDCEndpoints>;
 }

lib/src/models/oidc-provider-meta-data.ts

@@ -269,4 +269,10 @@ export interface OIDCEndpoints {
     checkSessionIframe: string;
     endSessionEndpoint: string;
     issuer: string;
+    /**
+     * The well known endpoint path.
+     * @deprecated This will be removed in the next version bump 2.0.0 
+     * as this is already defined in config.wellKnownEndpoint.
+     */
+    wellKnownEndpoint?: string;
 }