address review comments

Author: lashinijay

packages/javascript/package.json

@@ -55,7 +55,6 @@
   "dependencies": {
     "@asgardeo/i18n": "workspace:*",
     "tslib": "2.8.1",
-    "base64url": "^3.0.1",
     "jose": "^5.2.0"
   },
   "publishConfig": {

packages/javascript/src/AsgardeoJavaScriptClient.ts

@@ -55,8 +55,6 @@ class AsgardeoJavaScriptClient<T = Config> implements AsgardeoClient<T> {
 
   private baseURL: string;
 
-  void: void;
-
   constructor(config?: AuthClientConfig<T>, cacheStore?: Storage, cryptoUtils?: Crypto) {
     this.cacheStore = cacheStore ?? new DefaultCacheStore();
     this.cryptoUtils = cryptoUtils ?? new DefaultCrypto();
@@ -178,23 +176,23 @@ class AsgardeoJavaScriptClient<T = Config> implements AsgardeoClient<T> {
       url: `${authorizeURL.origin}${authorizeURL.pathname}`,
     });
 
-    const usernamePasswordAuthenticator: EmbeddedSignInFlowAuthenticator | undefined =
+    const authenticatorName: string = agentConfig.authenticatorName ?? AgentConfig.DEFAULT_AUTHENTICATOR_NAME;
+
+    const targetAuthenticator: EmbeddedSignInFlowAuthenticator | undefined =
       authorizeResponse.nextStep.authenticators.find(
-        (auth: EmbeddedSignInFlowAuthenticator) => auth.authenticator === 'Username & Password',
+        (auth: EmbeddedSignInFlowAuthenticator) => auth.authenticator === authenticatorName,
       );
 
-    if (!usernamePasswordAuthenticator) {
-      // eslint-disable-next-line no-console
-      console.error('Basic authenticator not found among authentication steps.');
-      return Promise.reject(new Error('Basic authenticator not found among authentication steps.'));
+    if (!targetAuthenticator) {
+      throw new Error(`Authenticator '${authenticatorName}' not found among authentication steps.`);
     }
 
     const authnRequest: EmbeddedFlowExecuteRequestConfig = {
       baseUrl: this.baseURL,
       payload: {
         flowId: authorizeResponse.flowId,
         selectedAuthenticator: {
-          authenticatorId: usernamePasswordAuthenticator.authenticatorId,
+          authenticatorId: targetAuthenticator.authenticatorId,
           params: {
             password: agentConfig.agentSecret,
             username: agentConfig.agentID,
@@ -206,18 +204,14 @@ class AsgardeoJavaScriptClient<T = Config> implements AsgardeoClient<T> {
     const authnResponse: EmbeddedSignInFlowHandleResponse = await executeEmbeddedSignInFlow(authnRequest);
 
     if (authnResponse.flowStatus !== EmbeddedSignInFlowStatus.SuccessCompleted) {
-      // eslint-disable-next-line no-console
-      console.error('Agent Authentication Failed.');
-      return Promise.reject(new Error('Agent Authentication Failed.'));
+      throw new Error('Agent authentication failed.');
     }
 
-    const tokenResponse: TokenResponse = await this.auth.requestAccessToken(
+    return this.auth.requestAccessToken(
       authnResponse.authData['code'],
       authnResponse.authData['session_state'],
       authnResponse.authData['state'],
     );
-
-    return tokenResponse;
   }
 
   public async getOBOSignInURL(agentConfig: AgentConfig): Promise<string> {
@@ -228,10 +222,10 @@ class AsgardeoJavaScriptClient<T = Config> implements AsgardeoClient<T> {
     const authURL: string | undefined = await this.auth.getSignInUrl(customParam);
 
     if (authURL) {
-      return Promise.resolve(authURL.toString());
+      return authURL.toString();
     }
 
-    return Promise.reject(new Error('Could not build Authorize URL'));
+    throw new Error('Could not build Authorize URL');
   }
 
   public async getOBOToken(agentConfig: AgentConfig, authCodeResponse: AuthCodeResponse): Promise<TokenResponse> {

packages/javascript/src/models/agent.ts

@@ -28,4 +28,19 @@ export interface AgentConfig {
    * The secret credential for the agent
    */
   agentSecret: string;
+  /**
+   * The authenticator name to match during the embedded sign-in flow.
+   * Defaults to {@link AgentConfig.DEFAULT_AUTHENTICATOR_NAME} if not provided.
+   */
+  authenticatorName?: string;
+}
+
+/**
+ * Namespace that holds constants related to {@link AgentConfig}.
+ */
+export namespace AgentConfig {
+  /**
+   * Default authenticator name used when none is specified.
+   */
+  export const DEFAULT_AUTHENTICATOR_NAME: string = 'Username & Password';
 }