@dehwyyy/auth 1.0.7 → 2.0.0

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@dehwyyy/auth",
-  "version": "1.0.7",
+  "version": "2.0.0",
   "private": false,
   "description": "dehwyyy auth utilities",
   "type": "module",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "module": "dist/v2/index.js",
+  "types": "dist/v2/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.js"
+      "types": "./dist/v2/index.d.ts",
+      "import": "./dist/v2/index.js"
     },
     "./v2": {
-      "import": "./dist/v2/index.js",
-      "types": "./dist/v2/index.d.ts"
-    },
-    "./guard": {
-      "import": "./dist/guard/index.js"
+      "types": "./dist/v2/index.d.ts",
+      "import": "./dist/v2/index.js"
     }
   },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsc && tsc-alias",
+    "gen": "openapi-typescript ./spec/zitadel-oidc.yaml -o ./src/v2/pkg/types/schema.d.ts",
+    "build": "tsc && tsc-alias --resolve-full-paths",
     "prepack": "npm run build",
     "lint": "prettier --check .",
-    "ts": "tsc && tsc-alias",
+    "ts": "tsc && tsc-alias --resolve-full-paths",
+    "test": "bun test",
     "format": "prettier --write ."
   },
   "engines": {
@@ -36,9 +36,11 @@
     "dehwyyy",
     "dehwyyyauth"
   ],
-  "author": "",
+  "author": "dehwyy",
   "license": "MIT",
   "devDependencies": {
+    "@types/bun": "^1.1.0",
+    "openapi-typescript": "^7.4.0",
     "prettier": "^3.0.0",
     "tsc-alias": "^1.8.16",
     "typescript": "5.8.2"

package/dist/client/client.d.ts

@@ -1,2 +0,0 @@
-import type { paths } from './schema';
-export declare const getClient: (app: string, baseUrl: string, redirectBaseUrl: string, redirectUriPrefix?: string) => import("openapi-fetch").Client<paths, `${string}/${string}`>;

package/dist/client/client.js

@@ -1,14 +0,0 @@
-import createClient from 'openapi-fetch';
-import { Middleware } from './middleware';
-let client = null;
-export const getClient = (app, baseUrl, redirectBaseUrl, redirectUriPrefix = "") => {
-    if (!client) {
-        client = createClient({
-            baseUrl,
-            credentials: 'include',
-        });
-        const middleware = new Middleware(app, baseUrl, redirectBaseUrl, redirectUriPrefix);
-        client.use(middleware.RequestCloner, middleware.AuthorizationHeaderAttacher, middleware.TokenRefresher);
-    }
-    return client;
-};

package/dist/client/middleware.d.ts

@@ -1,15 +0,0 @@
-import type { Middleware as OpenAPIMiddleware } from 'openapi-fetch';
-export declare class Middleware {
-    private app;
-    private baseUrl;
-    private redirectBaseUrl;
-    private redirectUriPrefix;
-    constructor(app: string, baseUrl: string, redirectBaseUrl: string, redirectUriPrefix?: string);
-    /**
-     * Middleware для предварительного клонирования запросов с телом.
-     * Этот клон будет использован для повторной попытки в случае 401.
-     */
-    get RequestCloner(): OpenAPIMiddleware;
-    get AuthorizationHeaderAttacher(): OpenAPIMiddleware;
-    get TokenRefresher(): OpenAPIMiddleware;
-}

package/dist/client/middleware.js

@@ -1,51 +0,0 @@
-import { GetAuthService } from '../index';
-export class Middleware {
-    app;
-    baseUrl;
-    redirectBaseUrl;
-    redirectUriPrefix;
-    constructor(app, baseUrl, redirectBaseUrl, redirectUriPrefix = "") {
-        this.app = app;
-        this.baseUrl = baseUrl;
-        this.redirectBaseUrl = redirectBaseUrl;
-        this.redirectUriPrefix = redirectUriPrefix;
-    }
-    /**
-     * Middleware для предварительного клонирования запросов с телом.
-     * Этот клон будет использован для повторной попытки в случае 401.
-     */
-    get RequestCloner() {
-        return {
-            async onRequest({ request }) {
-                // Клонируем только запросы, которые могут иметь тело
-                const methodsWithBody = ['POST', 'PUT', 'PATCH', 'DELETE'];
-                if (methodsWithBody.includes(request.method.toUpperCase())) {
-                    request._clone = request.clone();
-                    console.log('cloned');
-                }
-                return request;
-            },
-        };
-    }
-    get AuthorizationHeaderAttacher() {
-        const auth = GetAuthService(this.app, this.baseUrl, this.redirectBaseUrl, this.redirectUriPrefix);
-        return {
-            async onRequest({ request }) {
-                return auth.WithAuthorizationToken(request);
-            },
-        };
-    }
-    get TokenRefresher() {
-        const t = this;
-        return {
-            async onResponse({ response, request }) {
-                if (response.status !== 401 || request.url.includes('/auth/refresh')) {
-                    return response;
-                }
-                const auth = GetAuthService(t.app, t.baseUrl, t.redirectBaseUrl, t.redirectUriPrefix);
-                const requestToRetry = request._clone || request;
-                return auth.RefreshAndRetry(requestToRetry, response);
-            },
-        };
-    }
-}

package/dist/client/storage/localStorage.d.ts

@@ -1,8 +0,0 @@
-export declare const enum StorageKey {
-    ACCESS_TOKEN = "accessToken"
-}
-export declare class Storage {
-    static Set(key: StorageKey, value: string): void;
-    static Delete(key: StorageKey): void;
-    static Get(key: StorageKey): string | null;
-}

package/dist/client/storage/localStorage.js

@@ -1,15 +0,0 @@
-export var StorageKey;
-(function (StorageKey) {
-    StorageKey["ACCESS_TOKEN"] = "accessToken";
-})(StorageKey || (StorageKey = {}));
-export class Storage {
-    static Set(key, value) {
-        localStorage.setItem(key, value);
-    }
-    static Delete(key) {
-        localStorage.removeItem(key);
-    }
-    static Get(key) {
-        return localStorage.getItem(key);
-    }
-}

package/dist/guard/index.d.ts

@@ -1,11 +0,0 @@
-import { GetAuthService } from '../index';
-import { Route } from '../types';
-export declare class Guard {
-    private getAuthService;
-    private onUserRetrieve?;
-    constructor(getAuthService: () => ReturnType<typeof GetAuthService>, onUserRetrieve?: ((user: {
-        userId: string;
-        roles: string[];
-    }) => void) | undefined);
-    Auth: (roles?: string[]) => (to: Route, from: Route) => Promise<string | true>;
-}

package/dist/guard/index.js

@@ -1,62 +0,0 @@
-import { Storage, StorageKey } from '../client/storage/localStorage';
-let meCache = null;
-const ME_CACHE_TTL_MS = 15 * 1000;
-function arrayIntercept(arr1, arr2) {
-    return arr1.filter((item) => arr2.includes(item));
-}
-export class Guard {
-    getAuthService;
-    onUserRetrieve;
-    constructor(getAuthService, onUserRetrieve) {
-        this.getAuthService = getAuthService;
-        this.onUserRetrieve = onUserRetrieve;
-    }
-    Auth = (roles = []) => {
-        return async (to, from) => {
-            const auth = this.getAuthService();
-            const loginRedirect = auth.GetLoginRedirectPath(to, from);
-            let token = Storage.Get(StorageKey.ACCESS_TOKEN);
-            if (!token) {
-                if (roles.length === 0)
-                    return true;
-                // try to refresh
-                token = await auth.Refresh();
-                if (token) {
-                    Storage.Set(StorageKey.ACCESS_TOKEN, token);
-                }
-                else {
-                    return loginRedirect.redirect();
-                }
-            }
-            const now = Date.now();
-            if (meCache && meCache.expiresAt > now) {
-                const data = meCache.data;
-                if (arrayIntercept(data.roles, roles).length === 0) {
-                    return loginRedirect.redirect();
-                }
-                return true;
-            }
-            const response = await auth.GetMe();
-            if (!response) {
-                console.warn('Access denied');
-                return loginRedirect.redirect();
-            }
-            meCache = { data: response, expiresAt: Date.now() + ME_CACHE_TTL_MS };
-            if (this.onUserRetrieve) {
-                this.onUserRetrieve({
-                    userId: response.userId,
-                    roles: response.roles,
-                });
-            }
-            if (response.roles.length === 0) {
-                console.warn('No roles found');
-                return loginRedirect.redirect();
-            }
-            if (arrayIntercept(response.roles, roles).length === 0) {
-                console.warn('Access denied');
-                return loginRedirect.redirect();
-            }
-            return true;
-        };
-    };
-}

package/dist/index.d.ts

@@ -1,26 +0,0 @@
-import { GetMeResponse, Route } from './types';
-declare class AuthService {
-    private app;
-    private apiURL;
-    private redirectBaseUrl;
-    private redirectUriPrefix;
-    private refreshPromise;
-    constructor(app: string, apiURL: string, redirectBaseUrl: string, redirectUriPrefix?: string);
-    private getClient;
-    /**
-     * @description Refresh access token
-     * @returns  `accessToken` -> refresh ok. `null` -> refresh failed
-     **/
-    private doRefresh;
-    withApp(app: string): this;
-    WithAuthorizationToken(request: Request, token?: string | null): Request;
-    GetLoginRedirectPath(to: Route, from?: Route): {
-        redirect: () => string;
-    };
-    GetMe(verbose?: boolean): Promise<GetMeResponse | null>;
-    Logout(): Promise<boolean>;
-    Refresh(): Promise<string | null>;
-    RefreshAndRetry(request: Request, response: Response): Promise<Response>;
-}
-export declare function GetAuthService(app: string, apiURL: string, redirectBaseUrl: string, redirectUriPrefix: string): AuthService;
-export {};

package/dist/index.js

@@ -1,160 +0,0 @@
-import { getClient } from './client/client';
-import { Storage, StorageKey } from './client/storage/localStorage';
-class AuthService {
-    app;
-    apiURL;
-    redirectBaseUrl;
-    redirectUriPrefix;
-    // теперь обещание возвращает сам новый токен или null
-    refreshPromise = null;
-    constructor(app, apiURL, redirectBaseUrl, redirectUriPrefix = "") {
-        this.app = app;
-        this.apiURL = apiURL;
-        this.redirectBaseUrl = redirectBaseUrl;
-        this.redirectUriPrefix = redirectUriPrefix;
-    }
-    getClient() {
-        return getClient(this.app, this.apiURL, this.redirectBaseUrl, this.redirectUriPrefix);
-    }
-    /**
-     * @description Refresh access token
-     * @returns  `accessToken` -> refresh ok. `null` -> refresh failed
-     **/
-    async doRefresh() {
-        const { data, error } = await this.getClient().POST('/auth/refresh');
-        if (error) {
-            console.error('Refresh error:', error);
-            Storage.Delete(StorageKey.ACCESS_TOKEN);
-            return null;
-        }
-        if (data?.accessToken) {
-            Storage.Set(StorageKey.ACCESS_TOKEN, data.accessToken);
-            return data.accessToken;
-        }
-        Storage.Delete(StorageKey.ACCESS_TOKEN);
-        return null;
-    }
-    withApp(app) {
-        this.app = app;
-        return this;
-    }
-    WithAuthorizationToken(request, token = null) {
-        token ??= Storage.Get(StorageKey.ACCESS_TOKEN);
-        if (token) {
-            request.headers.set('Authorization', `Bearer ${token}`);
-        }
-        return request;
-    }
-    GetLoginRedirectPath(to, from) {
-        const redirectUri = from?.query['redirect_uri'] || encodeURIComponent(to.fullPath);
-        const redirectPath = `${this.redirectBaseUrl}?redirect_uri=${this.redirectUriPrefix}${redirectUri}`;
-        return {
-            redirect: () => {
-                if (redirectPath.startsWith('http')) {
-                    window.location.href = redirectPath;
-                    return "";
-                }
-                return redirectPath;
-            }
-        };
-    }
-    async GetMe(verbose = false) {
-        let token = Storage.Get(StorageKey.ACCESS_TOKEN);
-        if (!token) {
-            token = await this.Refresh();
-            if (!token) {
-                return null;
-            }
-        }
-        const { response, data, error } = await this.getClient().GET('/auth/me', {
-            params: {
-                query: {
-                    app: this.app,
-                    verbose: verbose ? 'all' : 'none',
-                },
-                header: {
-                    Authorization: `Bearer ${token}`,
-                },
-            },
-        });
-        if (error) {
-            console.error(error);
-            return null;
-        }
-        if (!data || !data.user_id) {
-            console.warn('Failed to get user info: ', data);
-            return null;
-        }
-        return {
-            userId: data.user_id,
-            roles: data.roles || [],
-            active: data.active || false,
-            info: !data.info ? undefined : {
-                verified: data.info.verified || false,
-                username: data.info.username,
-                email: data.info.email,
-                avatar: data.info.avatar,
-                data: data.info.data,
-            },
-        };
-    }
-    async Logout() {
-        Storage.Delete(StorageKey.ACCESS_TOKEN);
-        const { response, error } = await this.getClient().POST('/auth/logout');
-        if (error || !response.ok) {
-            console.error(error, response);
-            return false;
-        }
-        return true;
-    }
-    async Refresh() {
-        if (this.refreshPromise) {
-            return this.refreshPromise;
-        }
-        this.refreshPromise = this.doRefresh();
-        let token = null;
-        try {
-            token = await this.refreshPromise;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        finally {
-            this.refreshPromise = null;
-        }
-        return token;
-    }
-    async RefreshAndRetry(request, response) {
-        if (!this.refreshPromise) {
-            this.refreshPromise = this.doRefresh();
-        }
-        let token = null;
-        try {
-            token = await this.refreshPromise;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        finally {
-            this.refreshPromise = null;
-        }
-        if (!token) {
-            return response;
-        }
-        try {
-            const originalRequest = request instanceof Request ? request : new Request(request);
-            const retriedResponse = await fetch(this.WithAuthorizationToken(originalRequest.clone(), token));
-            return retriedResponse;
-        }
-        catch (e) {
-            return response;
-        }
-    }
-}
-let auth = null;
-export function GetAuthService(app, apiURL, redirectBaseUrl, redirectUriPrefix) {
-    if (!auth) {
-        auth = new AuthService(app, apiURL, redirectBaseUrl, redirectUriPrefix);
-    }
-    return auth.withApp(app);
-}

package/dist/types.d.ts

@@ -1,16 +0,0 @@
-export interface GetMeResponse {
-    roles: string[];
-    userId: string;
-    active: boolean;
-    info?: {
-        verified: boolean;
-        avatar?: string;
-        data?: Record<string, unknown>;
-        email?: string;
-        username?: string;
-    };
-}
-export interface Route {
-    query: Record<string, unknown>;
-    fullPath: string;
-}

package/dist/types.js

@@ -1,2 +0,0 @@
-;
-export {};