Support custom params for token request

asgardeo · Jul 24, 2024 · 0594053 · 0594053
1 parent 9fe50c4
commit 0594053
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 21 deletions.
diff --git a/lib/src/client.ts b/lib/src/client.ts
@@ -372,7 +372,10 @@ export class AsgardeoSPAClient {
         config?: SignInConfig,
         authorizationCode?: string,
         sessionState?: string,
-        state?: string
+        state?: string,
+        tokenRequestConfig?: {
+            params: Record<string, unknown>
+        }
     ): Promise<BasicUserInfo | undefined> {
         await this._isInitialized();
 
@@ -384,15 +387,16 @@ export class AsgardeoSPAClient {
 
         delete config?.callOnlyOnRedirect;
 
-        return this._client?.signIn(config, authorizationCode, sessionState, state).then((response: BasicUserInfo) => {
-            if (this._onSignInCallback) {
-                if (response.allowedScopes || response.displayName || response.email || response.username) {
-                    this._onSignInCallback(response);
+        return this._client?.signIn(config, authorizationCode, sessionState, state, tokenRequestConfig)
+            .then((response: BasicUserInfo) => {
+                if (this._onSignInCallback) {
+                    if (response.allowedScopes || response.displayName || response.email || response.username) {
+                        this._onSignInCallback(response);
+                    }
                 }
-            }
 
-            return response;
-        });
+                return response;
+            });
     }
 
     /**

diff --git a/lib/src/clients/main-thread-client.ts b/lib/src/clients/main-thread-client.ts
@@ -188,12 +188,16 @@ export const MainThreadClient = async (
         signInConfig?: GetAuthURLConfig,
         authorizationCode?: string,
         sessionState?: string,
-        state?: string
+        state?: string,
+        tokenRequestConfig?: {
+            params: Record<string, unknown>
+        }
     ): Promise<BasicUserInfo> => {
 
         const basicUserInfo =  await _authenticationHelper.handleSignIn(
             shouldStopAuthn,
-            checkSession
+            checkSession,
+            undefined
         );
 
         if(basicUserInfo) {
@@ -217,7 +221,8 @@ export const MainThreadClient = async (
 
             if (resolvedAuthorizationCode && resolvedState) {
                 setSessionStatus("true");
-                return requestAccessToken(resolvedAuthorizationCode, resolvedSessionState, resolvedState);
+                return requestAccessToken(resolvedAuthorizationCode, resolvedSessionState,
+                    resolvedState, tokenRequestConfig);
             }
 
             return _authenticationClient.getAuthorizationURL(signInConfig).then(async (url: string) => {
@@ -304,14 +309,18 @@ export const MainThreadClient = async (
     const requestAccessToken = async (
         resolvedAuthorizationCode: string,
         resolvedSessionState: string,
-        resolvedState: string
+        resolvedState: string,
+        tokenRequestConfig?: {
+            params: Record<string, unknown>
+        }   
     ): Promise<BasicUserInfo> => {
         return await _authenticationHelper.requestAccessToken(
             resolvedAuthorizationCode,
             resolvedSessionState,
             checkSession,
             undefined,
-            resolvedState
+            resolvedState,
+            tokenRequestConfig
         );
     };
 

diff --git a/lib/src/clients/web-worker-client.ts b/lib/src/clients/web-worker-client.ts
@@ -473,7 +473,10 @@ export const WebWorkerClient = async (
     const requestAccessToken = async (
         resolvedAuthorizationCode: string,
         resolvedSessionState: string,
-        resolvedState: string
+        resolvedState: string,
+        tokenRequestConfig?: {
+            params: Record<string, unknown>
+        }
     ): Promise<BasicUserInfo> => {
         const config: AuthClientConfig<WebWorkerClientConfig> = await getConfigData();
         const pkceKey: string = AuthenticationUtils.extractPKCEKeyFromStateParam(resolvedState);
@@ -483,7 +486,8 @@ export const WebWorkerClient = async (
                 code: resolvedAuthorizationCode,
                 pkce: config.enablePKCE ? SPAUtils.getPKCE(pkceKey) : undefined,
                 sessionState: resolvedSessionState,
-                state: resolvedState
+                state: resolvedState,
+                tokenRequestConfig
             },
             type: REQUEST_ACCESS_TOKEN
         };
@@ -548,7 +552,10 @@ export const WebWorkerClient = async (
         params?: GetAuthURLConfig,
         authorizationCode?: string,
         sessionState?: string,
-        state?: string
+        state?: string,
+        tokenRequestConfig?: {
+            params: Record<string, unknown>
+        }
     ): Promise<BasicUserInfo> => {
 
         const basicUserInfo =  await _authenticationHelper.handleSignIn(
@@ -577,7 +584,8 @@ export const WebWorkerClient = async (
             }
 
             if (resolvedAuthorizationCode && resolvedState) {
-                return requestAccessToken(resolvedAuthorizationCode, resolvedSessionState, resolvedState);
+                return requestAccessToken(resolvedAuthorizationCode, resolvedSessionState,
+                    resolvedState, tokenRequestConfig);
             }
 
             return getAuthorizationURL(params)

diff --git a/lib/src/helpers/authentication-helper.ts b/lib/src/helpers/authentication-helper.ts
@@ -471,7 +471,10 @@ export class AuthenticationHelper<
         sessionState?: string,
         checkSession?: () => Promise<void>,
         pkce?: string,
-        state?: string
+        state?: string,
+        tokenRequestConfig?: {
+            params: Record<string, unknown>
+        }
     ): Promise<BasicUserInfo> {
         const config = await this._dataLayer.getConfigData();
 
@@ -490,7 +493,7 @@ export class AuthenticationHelper<
 
         if (authorizationCode) {
             return this._authenticationClient
-                .requestAccessToken(authorizationCode, sessionState ?? "", state ?? "")
+                .requestAccessToken(authorizationCode, sessionState ?? "", state ?? "", undefined, tokenRequestConfig)
                 .then(async () => {
                     // Disable this temporarily
                     /* if (config.storage === Storage.BrowserMemory) {

diff --git a/lib/src/models/client.ts b/lib/src/models/client.ts
@@ -50,7 +50,10 @@ export interface MainThreadClientInterface {
         config?: SignInConfig,
         authorizationCode?: string,
         sessionState?: string,
-        signInRedirectURL?: string
+        signInRedirectURL?: string,
+        tokenRequestConfig?: {
+            params: Record<string, unknown>
+        }
     ): Promise<BasicUserInfo>;
     signOut(signOutRedirectURL?: string): Promise<boolean>;
     requestCustomGrant(config: CustomGrantConfig): Promise<BasicUserInfo | FetchResponse>;
@@ -80,7 +83,10 @@ export interface WebWorkerClientInterface {
         params?: SignInConfig,
         authorizationCode?: string,
         sessionState?: string,
-        signInRedirectURL?: string
+        signInRedirectURL?: string,
+        tokenRequestConfig?: {
+            params: Record<string, unknown>
+        }
     ): Promise<BasicUserInfo>;
     signOut(signOutRedirectURL?: string): Promise<boolean>;
     revokeAccessToken(): Promise<boolean>;

diff --git a/lib/src/models/message.ts b/lib/src/models/message.ts
@@ -70,6 +70,9 @@ export interface AuthorizationInfo {
     sessionState: string;
     pkce?: string;
     state: string;
+    tokenRequestConfig?: {
+        params: Record<string, unknown>
+    }
 }
 
 export type MessageType =