@cemiar/auth-sdk 1.0.0 → 1.0.2

package/dist/browser/CemiarAuthClient.d.ts

@@ -1,5 +1,5 @@
 import { AxiosInstance } from "axios";
-import type { AuthTokens, CemiarAuthClientConfig, CemiarAuthClientInstance, CreateApiClientOptions, EmailCodeResponse, LogoutOptions, VerifyEmailResult } from "../shared/Types.js";
+import { AuthTokens, CemiarAuthClientInstance, CemiarAuthClientConfig, EmailCodeResponse, LogoutOptions, CreateApiClientOptions, UserInfo } from "../shared/Types.js";
 export declare class CemiarAuthClient implements CemiarAuthClientInstance {
     private readonly baseUrl;
     private readonly tenantId;
@@ -9,15 +9,16 @@ export declare class CemiarAuthClient implements CemiarAuthClientInstance {
     private readonly onTokenChange?;
     private readonly onAuthFailure?;
     private readonly logoutRedirectUrl?;
+    private loginMethod;
     private refreshPromise;
     constructor(config: CemiarAuthClientConfig);
     getAccessToken(): string | null;
     setAccessToken(token: string | null): void;
     private authPost;
     sendEmailCode(email: string): Promise<EmailCodeResponse>;
-    verifyEmailCode(email: string, code: string): Promise<VerifyEmailResult>;
+    verifyEmailCode(email: string, code: string): Promise<UserInfo | null>;
+    handleRedirectMicrosoftCallback(routeQueryData: Record<string, string>): UserInfo | null;
     getMicrosoftLoginUrl(extraParams?: Record<string, string>): string;
-    exchangeMicrosoftCode(code: string): Promise<AuthTokens>;
     refreshToken(): Promise<AuthTokens>;
     logout(options?: LogoutOptions): Promise<void>;
     createApiClient(options: CreateApiClientOptions): AxiosInstance;
@@ -26,5 +27,8 @@ export declare class CemiarAuthClient implements CemiarAuthClientInstance {
     private handleResponseError;
     private queueTokenRefresh;
     private handleAuthFailure;
+    private loadLoginMethodFromStorage;
+    private persistLoginMethod;
+    private getCurrentLoginMethod;
 }
 export declare function createCemiarAuthClient(config: CemiarAuthClientConfig): CemiarAuthClientInstance;

package/dist/browser/CemiarAuthClient.js

@@ -1,6 +1,7 @@
 import axios from "axios";
 import { createDefaultTokenStorage } from "./Storage.js";
-import { normalizeBaseUrl, isBrowser } from "../shared/Utils.js";
+import { normalizeBaseUrl, isBrowser, tokenToClaim } from "../shared/Utils.js";
+const LOGIN_METHOD_STORAGE_KEY = "cemiar-auth-login-method";
 function parseAuds(auds) {
     return auds.map(a => a.trim()).filter(Boolean);
 }
@@ -27,6 +28,7 @@ export class CemiarAuthClient {
         this.logoutRedirectUrl =
             (_b = config.logoutRedirectUrl) !== null && _b !== void 0 ? _b : (isBrowser ? `${window.location.origin}/login` : undefined);
         this.storage = (_c = config.storage) !== null && _c !== void 0 ? _c : createDefaultTokenStorage();
+        this.loginMethod = this.loadLoginMethodFromStorage();
     }
     getAccessToken() {
         return this.storage.getToken();
@@ -34,6 +36,9 @@ export class CemiarAuthClient {
     setAccessToken(token) {
         var _a;
         this.storage.setToken(token);
+        if (token === null) {
+            this.persistLoginMethod(null);
+        }
         (_a = this.onTokenChange) === null || _a === void 0 ? void 0 : _a.call(this, token);
     }
     async authPost(path, body, withCredentials = true) {
@@ -56,14 +61,28 @@ export class CemiarAuthClient {
         const data = await this.authPost("/emailCodes/validate", payload);
         const accessToken = extractAccessToken(data);
         this.setAccessToken(accessToken);
+        this.persistLoginMethod("emailCode");
+        const claim = tokenToClaim(accessToken);
         return {
-            accessToken,
-            authenticated: Boolean(data.authenticated),
-            blacklisted: Boolean(data.blacklisted),
-            raw: data
+            email: claim.sub,
+            displayName: claim.displayName
         };
     }
+    handleRedirectMicrosoftCallback(routeQueryData) {
+        const token = routeQueryData["token"];
+        if (token) {
+            this.setAccessToken(token);
+            this.persistLoginMethod("microsoft");
+            const claim = tokenToClaim(token);
+            return {
+                email: claim.sub,
+                displayName: claim.displayName
+            };
+        }
+        return null;
+    }
     getMicrosoftLoginUrl(extraParams = {}) {
+        this.persistLoginMethod("microsoft");
         const params = new URLSearchParams({
             tenantId: this.tenantId,
             auds: this.auds.join(","),
@@ -74,16 +93,6 @@ export class CemiarAuthClient {
         }
         return `${this.baseUrl}/microsoft?${params.toString()}`;
     }
-    async exchangeMicrosoftCode(code) {
-        const payload = {
-            code,
-            ...(this.redirectUrl ? { redirectUrl: this.redirectUrl } : {})
-        };
-        const data = await this.authPost("/microsoft/callback", payload);
-        const accessToken = extractAccessToken(data);
-        this.setAccessToken(accessToken);
-        return { accessToken };
-    }
     async refreshToken() {
         const data = await this.authPost("/refresh", {}, true);
         const accessToken = extractAccessToken(data);
@@ -91,13 +100,18 @@ export class CemiarAuthClient {
         return { accessToken };
     }
     async logout(options = {}) {
-        if (options.clearToken !== false) {
-            this.setAccessToken(null);
+        let loginMethod = options.method;
+        if (!loginMethod) {
+            loginMethod = this.getCurrentLoginMethod();
+            if (options.clearToken !== false) {
+                this.setAccessToken(null);
+            }
         }
         const redirectUrl = options.redirectUrl || this.logoutRedirectUrl;
+        const logoutPath = loginMethod === "microsoft" ? "/microsoft/logout" : "/logout";
         const logoutUrl = redirectUrl
-            ? `${this.baseUrl}/microsoft/logout?redirectUrl=${encodeURIComponent(redirectUrl)}`
-            : `${this.baseUrl}/logout`;
+            ? `${this.baseUrl}${logoutPath}?redirectUrl=${encodeURIComponent(redirectUrl)}`
+            : `${this.baseUrl}${logoutPath}`;
         try {
             if (options.performRedirect === false || !isBrowser) {
                 await axios.post(`${this.baseUrl}/logout`, {}, { withCredentials: true });
@@ -165,6 +179,46 @@ export class CemiarAuthClient {
         this.setAccessToken(null);
         (_a = this.onAuthFailure) === null || _a === void 0 ? void 0 : _a.call(this);
     }
+    loadLoginMethodFromStorage() {
+        if (!isBrowser || !("localStorage" in globalThis)) {
+            return null;
+        }
+        try {
+            const value = window.localStorage.getItem(LOGIN_METHOD_STORAGE_KEY);
+            if (value === "emailCode" || value === "microsoft") {
+                return value;
+            }
+        }
+        catch (error) {
+            console.warn("Failed to read login method from localStorage", error);
+        }
+        return null;
+    }
+    persistLoginMethod(method) {
+        this.loginMethod = method;
+        if (!isBrowser || !("localStorage" in globalThis)) {
+            return;
+        }
+        try {
+            if (method) {
+                window.localStorage.setItem(LOGIN_METHOD_STORAGE_KEY, method);
+            }
+            else {
+                window.localStorage.removeItem(LOGIN_METHOD_STORAGE_KEY);
+            }
+        }
+        catch (error) {
+            console.warn("Failed to persist login method in localStorage", error);
+        }
+    }
+    getCurrentLoginMethod() {
+        if (this.loginMethod) {
+            return this.loginMethod;
+        }
+        const stored = this.loadLoginMethodFromStorage();
+        this.loginMethod = stored;
+        return stored;
+    }
 }
 export function createCemiarAuthClient(config) {
     return new CemiarAuthClient(config);

package/dist/shared/Types.d.ts

@@ -1,5 +1,10 @@
 import type { AxiosInstance, AxiosRequestConfig } from "axios";
 import type { Request, ResponseToolkit } from "@hapi/hapi";
+export type LoginMethod = "emailCode" | "microsoft";
+export interface UserInfo {
+    email: string;
+    displayName?: string;
+}
 export interface TokenStorage {
     getToken(): string | null;
     setToken(token: string | null): void;
@@ -42,6 +47,7 @@ export interface CreateApiClientOptions {
     axiosConfig?: AxiosRequestConfig;
 }
 export interface LogoutOptions {
+    method?: LoginMethod;
     redirectUrl?: string;
     performRedirect?: boolean;
     clearToken?: boolean;
@@ -71,9 +77,9 @@ export interface CemiarAuthClientInstance {
     getAccessToken(): string | null;
     setAccessToken(token: string | null): void;
     getMicrosoftLoginUrl(params?: Record<string, string>): string;
+    handleRedirectMicrosoftCallback(routeQueryData: Record<string, string>): UserInfo | null;
     sendEmailCode(email: string): Promise<EmailCodeResponse>;
-    verifyEmailCode(email: string, code: string): Promise<VerifyEmailResult>;
-    exchangeMicrosoftCode(code: string): Promise<AuthTokens>;
+    verifyEmailCode(email: string, code: string): Promise<UserInfo | null>;
     refreshToken(): Promise<AuthTokens>;
     logout(options?: LogoutOptions): Promise<void>;
     createApiClient(options: CreateApiClientOptions): AxiosInstance;

package/dist/shared/Utils.d.ts

@@ -1,2 +1,4 @@
+import { Claim } from "./models/Claim.js";
 export declare function normalizeBaseUrl(url: string): string;
+export declare function tokenToClaim(token: string): Claim;
 export declare const isBrowser: boolean;

package/dist/shared/Utils.js

@@ -4,4 +4,10 @@ export function normalizeBaseUrl(url) {
     }
     return url.endsWith("/") ? url.slice(0, -1) : url;
 }
+export function tokenToClaim(token) {
+    const payload = token.split(".")[1];
+    const decoded = Buffer.from(payload, "base64").toString("utf-8");
+    const parsed = JSON.parse(decoded);
+    return parsed;
+}
 export const isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined";

package/dist/shared/models/Claim.d.ts

@@ -0,0 +1,13 @@
+export interface Claim {
+    displayName: string;
+    sub: string;
+    iss: string;
+    raw: Record<string, any>;
+    actor_type: ActorType;
+}
+export declare enum ActorType {
+    INTERNAL_USER = "internal_user",
+    CUSTOMER_USER = "customer_user",
+    AUTOMATION_SERVICE = "automation_service",
+    ADMIN = "admin"
+}

package/dist/shared/models/Claim.js

@@ -0,0 +1,7 @@
+export var ActorType;
+(function (ActorType) {
+    ActorType["INTERNAL_USER"] = "internal_user";
+    ActorType["CUSTOMER_USER"] = "customer_user";
+    ActorType["AUTOMATION_SERVICE"] = "automation_service";
+    ActorType["ADMIN"] = "admin";
+})(ActorType || (ActorType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cemiar/auth-sdk",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "description": "Cemiar Auth integration helpers for web apps and APIs.",
     "type": "module",
     "main": "dist/index.js",