@equinor/fusion-framework-module-msal-node 1.0.7 → 1.1.0-next.0

package/dist/types/AuthProvider.d.ts

@@ -29,12 +29,14 @@ export declare class AuthProvider implements IAuthProvider {
      * Acquires an access token for the specified scopes.
      *
      * @param options - An object containing the options for acquiring the token.
-     * @param options.scopes - An array of strings representing the scopes for which the access token is requested.
+     * @param options.request.scopes - An array of strings representing the scopes for which the access token is requested.
      * @returns A promise that resolves to the acquired access token as a string.
      * @throws An error if the token acquisition process fails.
      */
     acquireAccessToken(options: {
-        scopes: string[];
+        request: {
+            scopes: string[];
+        };
     }): Promise<string>;
     /**
      * Initiates the login process with the specified options.
@@ -47,7 +49,9 @@ export declare class AuthProvider implements IAuthProvider {
      * This method is not supported and is intended to be overridden by `AuthProviderInteractive`.
      */
     login(_options: {
-        scopes: string[];
+        request: {
+            scopes: string[];
+        };
     }): Promise<AuthenticationResult>;
     /**
      * Logs out the user by clearing the token cache and removing all accounts.
@@ -76,6 +80,8 @@ export declare class AuthProvider implements IAuthProvider {
      * @throws {@link SilentTokenAcquisitionError} If an error occurs during silent token acquisition.
      */
     acquireToken(options: {
-        scopes: string[];
+        request: {
+            scopes: string[];
+        };
     }): Promise<AuthenticationResult>;
 }

package/dist/types/AuthProvider.interface.d.ts

@@ -26,7 +26,9 @@ export interface IAuthProvider {
      * This method is not supported and should not be used to initiate login unless interactive mode is enabled.
      */
     login(options: {
-        scopes: string[];
+        request: {
+            scopes: string[];
+        };
     }): Promise<AuthenticationResult>;
     /**
      * This method is present for compatibility but will never trigger a user logout flow unless interactive mode is configured.
@@ -41,7 +43,7 @@ export interface IAuthProvider {
      * Acquires an access token for the specified scopes.
      *
      * @param options - An object specifying the required scopes and an optional `interactive` flag.
-     *   - `scopes`: The scopes for which the token is requested.
+     *   - `request.scopes`: The scopes for which the token is requested.
      *   - `interactive`: If true, may trigger an interactive login if silent acquisition fails (not supported unless interactive mode is enabled).
      * @returns A Promise that resolves to a string representing the acquired access token.
      *
@@ -49,7 +51,9 @@ export interface IAuthProvider {
      * This is the primary method for obtaining tokens for API calls or resource access.
      */
     acquireAccessToken(options: {
-        scopes: string[];
+        request: {
+            scopes: string[];
+        };
         interactive?: boolean;
     }): Promise<string>;
 }

package/dist/types/AuthProviderInteractive.d.ts

@@ -48,7 +48,9 @@ export declare class AuthProviderInteractive extends AuthProvider {
      *         authentication server setup fails.
      */
     login(options: {
-        scopes: string[];
+        request: {
+            scopes: string[];
+        };
     }): Promise<AuthenticationResult>;
     /**
      * Acquires an authentication token for the specified scopes.
@@ -67,7 +69,9 @@ export declare class AuthProviderInteractive extends AuthProvider {
      * @throws {@link SilentTokenAcquisitionError} If an error occurs during silent token acquisition.
      */
     acquireToken(options: {
-        scopes: string[];
+        request: {
+            scopes: string[];
+        };
     }): Promise<AuthenticationResult>;
 }
 export {};

package/dist/types/AuthTokenProvider.d.ts

@@ -22,7 +22,11 @@ export declare class AuthTokenProvider implements IAuthProvider {
      *
      * @throws Error Always throws to indicate login is not supported.
      */
-    login(): Promise<AuthenticationResult>;
+    login(_options: {
+        request: {
+            scopes: string[];
+        };
+    }): Promise<AuthenticationResult>;
     /**
      * Not supported in token-only mode. Always throws an error if called.
      *
@@ -36,8 +40,13 @@ export declare class AuthTokenProvider implements IAuthProvider {
      *
      * This is the only supported operation for this provider. No token refresh or acquisition logic is performed.
      *
+     * @param _options - Options parameter (ignored in token-only mode)
      * @returns The static access token as a string.
      */
-    acquireAccessToken(): Promise<string>;
+    acquireAccessToken(_options: {
+        request: {
+            scopes: string[];
+        };
+    }): Promise<string>;
 }
 export default AuthTokenProvider;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.7";
+export declare const version = "1.1.0-next.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-module-msal-node",
-  "version": "1.0.7",
+  "version": "1.1.0-next.0",
   "description": "Fusion Framework module for secure Azure AD authentication in Node.js using MSAL. Supports interactive, silent, and token-only authentication modes with encrypted token storage.",
   "type": "module",
   "main": "dist/esm/index.js",
@@ -36,7 +36,7 @@
     "@azure/msal-node": "^3.7.3",
     "@azure/msal-node-extensions": "^1.5.11",
     "open": "^10.1.1",
-    "@equinor/fusion-framework-module": "^5.0.2"
+    "@equinor/fusion-framework-module": "^5.0.5"
   },
   "devDependencies": {
     "typescript": "^5.8.2"

package/src/AuthProvider.interface.ts

@@ -26,7 +26,7 @@ export interface IAuthProvider {
    * @remarks
    * This method is not supported and should not be used to initiate login unless interactive mode is enabled.
    */
-  login(options: { scopes: string[] }): Promise<AuthenticationResult>;
+  login(options: { request: { scopes: string[] } }): Promise<AuthenticationResult>;
 
   /**
    * This method is present for compatibility but will never trigger a user logout flow unless interactive mode is configured.
@@ -42,12 +42,15 @@ export interface IAuthProvider {
    * Acquires an access token for the specified scopes.
    *
    * @param options - An object specifying the required scopes and an optional `interactive` flag.
-   *   - `scopes`: The scopes for which the token is requested.
+   *   - `request.scopes`: The scopes for which the token is requested.
    *   - `interactive`: If true, may trigger an interactive login if silent acquisition fails (not supported unless interactive mode is enabled).
    * @returns A Promise that resolves to a string representing the acquired access token.
    *
    * @remarks
    * This is the primary method for obtaining tokens for API calls or resource access.
    */
-  acquireAccessToken(options: { scopes: string[]; interactive?: boolean }): Promise<string>;
+  acquireAccessToken(options: {
+    request: { scopes: string[] };
+    interactive?: boolean;
+  }): Promise<string>;
 }

package/src/AuthProvider.ts

@@ -37,11 +37,11 @@ export class AuthProvider implements IAuthProvider {
    * Acquires an access token for the specified scopes.
    *
    * @param options - An object containing the options for acquiring the token.
-   * @param options.scopes - An array of strings representing the scopes for which the access token is requested.
+   * @param options.request.scopes - An array of strings representing the scopes for which the access token is requested.
    * @returns A promise that resolves to the acquired access token as a string.
    * @throws An error if the token acquisition process fails.
    */
-  public async acquireAccessToken(options: { scopes: string[] }): Promise<string> {
+  public async acquireAccessToken(options: { request: { scopes: string[] } }): Promise<string> {
     const { accessToken } = await this.acquireToken(options);
     return accessToken;
   }
@@ -56,7 +56,7 @@ export class AuthProvider implements IAuthProvider {
    * @remarks
    * This method is not supported and is intended to be overridden by `AuthProviderInteractive`.
    */
-  public async login(_options: { scopes: string[] }): Promise<AuthenticationResult> {
+  public async login(_options: { request: { scopes: string[] } }): Promise<AuthenticationResult> {
     throw new AuthServerError('Login not supported, use AuthProviderInteractive instead');
   }
 
@@ -94,7 +94,9 @@ export class AuthProvider implements IAuthProvider {
    * @throws {@link NoAccountsError} If no accounts are found in the cache and interactive login is not allowed.
    * @throws {@link SilentTokenAcquisitionError} If an error occurs during silent token acquisition.
    */
-  public async acquireToken(options: { scopes: string[] }): Promise<AuthenticationResult> {
+  public async acquireToken(options: {
+    request: { scopes: string[] };
+  }): Promise<AuthenticationResult> {
     const account = await this.getAccount();
     if (!account) {
       throw new NoAccountsError('No accounts found in cache');
@@ -102,7 +104,7 @@ export class AuthProvider implements IAuthProvider {
 
     try {
       const tokenResponse = await this._client.acquireTokenSilent({
-        scopes: options.scopes,
+        scopes: options.request.scopes,
         account,
       });
       return tokenResponse;

package/src/AuthProviderInteractive.ts

@@ -61,8 +61,8 @@ export class AuthProviderInteractive extends AuthProvider {
    * @throws Will throw an error if the PKCE code generation, browser opening, or
    *         authentication server setup fails.
    */
-  public async login(options: { scopes: string[] }): Promise<AuthenticationResult> {
-    const { scopes } = options;
+  public async login(options: { request: { scopes: string[] } }): Promise<AuthenticationResult> {
+    const { scopes } = options.request;
     const { port, onOpen } = this.#options.server;
 
     // Generate a new PKCE code verifier and challenge
@@ -105,10 +105,12 @@ export class AuthProviderInteractive extends AuthProvider {
    * @throws {@link NoAccountsError} If no accounts are found in the cache and interactive login is not allowed.
    * @throws {@link SilentTokenAcquisitionError} If an error occurs during silent token acquisition.
    */
-  public async acquireToken(options: { scopes: string[] }): Promise<AuthenticationResult> {
-    const { scopes } = options ?? { scopes: [] };
+  public async acquireToken(options: {
+    request: { scopes: string[] };
+  }): Promise<AuthenticationResult> {
+    const { scopes } = options.request ?? { scopes: [] };
     if ((await this.getAccount()) === null) {
-      return this.login({ scopes });
+      return this.login({ request: { scopes } });
     }
     return super.acquireToken(options);
   }

package/src/AuthTokenProvider.ts

@@ -26,7 +26,7 @@ export class AuthTokenProvider implements IAuthProvider {
    *
    * @throws Error Always throws to indicate login is not supported.
    */
-  login(): Promise<AuthenticationResult> {
+  login(_options: { request: { scopes: string[] } }): Promise<AuthenticationResult> {
     throw new Error('Method not supported in token mode');
   }
 
@@ -46,9 +46,10 @@ export class AuthTokenProvider implements IAuthProvider {
    *
    * This is the only supported operation for this provider. No token refresh or acquisition logic is performed.
    *
+   * @param _options - Options parameter (ignored in token-only mode)
    * @returns The static access token as a string.
    */
-  async acquireAccessToken(): Promise<string> {
+  async acquireAccessToken(_options: { request: { scopes: string[] } }): Promise<string> {
     return this.#accessToken;
   }
 }

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '1.0.7';
+export const version = '1.1.0-next.0';