@venizia/ardor-admin 0.1.4-3 → 0.1.4-5

package/dist/providers/auth.js

@@ -11,9 +11,15 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 var DefaultAuthProvider_1;
-import { inject } from '@venizia/ignis-inversion';
+import { getError, inject } from '@venizia/ignis-inversion';
 import { removeDoubleSlashes } from 'ra-core';
 import { BaseProvider, CoreBindings, RequestMethods, } from '@venizia/ardor-kernel';
+/**
+ * The options hold data (`paths`); behaviour is in the protected hooks, each taking one `opts`
+ * object: `buildSignInBody`, `resolveUsername`, `beforeSaveSession`, `saveSession` and
+ * `readSignInSession` around `login`, and the page paths (`signInPath`, `afterLoginPath`,
+ * `loginPagePath`, `unauthorizedPagePath`).
+ */
 let DefaultAuthProvider = DefaultAuthProvider_1 = class DefaultAuthProvider extends BaseProvider {
     constructor(restDataProvider, authProviderOptions, authService, permissionProvider) {
         super({ scope: DefaultAuthProvider_1.name });
@@ -22,26 +28,153 @@ let DefaultAuthProvider = DefaultAuthProvider_1 = class DefaultAuthProvider exte
         this.authService = authService;
         this.permissionProvider = permissionProvider;
     }
-    login(params) {
-        return new Promise((resolve, reject) => {
-            this.restDataProvider
-                .send({
-                resource: (this.authProviderOptions.paths?.signIn ?? '/auth/login'),
-                params: { method: RequestMethods.POST, body: params },
-            })
-                .then((rs) => {
-                const { userId, token } = rs.data;
-                this.authService.saveAuth({ token, userId, username: params.username });
-                resolve({
-                    ...rs,
-                    redirectTo: removeDoubleSlashes(`/${this.authProviderOptions.endpoints?.afterLogin ?? '/'}`),
-                });
-            })
-                .catch((error) => {
-                reject(error);
+    // --- Paths -----------------------------------------------------------------------------------
+    /** Where `login` posts: `paths.signIn`, else the IGNIS auth controller's route. */
+    get signInPath() {
+        return this.authProviderOptions.paths?.signIn ?? '/auth/sign-in';
+    }
+    /** Where the admin goes once `login` resolves: `paths.afterLogin`, else `/`. */
+    get afterLoginPath() {
+        return this.authProviderOptions.paths?.afterLogin ?? '/';
+    }
+    /** The route of the login page, which `checkAuth` and a `401` redirect to. */
+    get loginPagePath() {
+        return '/login';
+    }
+    /** The route a `403` redirects to; the application mounts it. */
+    get unauthorizedPagePath() {
+        return '/unauthorized';
+    }
+    // --- Sign-in hooks ---------------------------------------------------------------------------
+    /**
+     * The body of the sign-in request: the IGNIS sign-in body, made from `params.username` and
+     * `params.password`. Override it when the API wants another shape; `opts.params` as it is posts
+     * the login form unchanged.
+     */
+    buildSignInBody(opts) {
+        return {
+            identifier: { scheme: 'username', value: opts.params?.username },
+            credential: { scheme: 'basic', value: opts.params?.password },
+        };
+    }
+    /**
+     * What a sign-in response carries. IGNIS's auth controller returns whatever the application's
+     * `signIn` returns, so two shapes are read: `{ userId, roles?, token: { value, type } }` (the
+     * recommended one), and `{ token: '<jwt>' }`, a Bearer token whose user id is a claim of the token
+     * itself (`userId`, else `sub`). Roles come from the response, else from the token's `roles`
+     * claim. A response with no token or no user id throws: storing `undefined` would pass `login`
+     * and fail every check after it.
+     */
+    readSignInSession(opts) {
+        const { userId, token, roles } = (opts.data ?? {});
+        const record = typeof token === 'string'
+            ? { value: token, type: 'Bearer' }
+            : token;
+        if (typeof record?.value !== 'string' || record.value.length === 0) {
+            throw getError({
+                message: '[login] The sign-in response carries no token | Expect { userId, token: { value, type } } or { token: <jwt> }',
             });
+        }
+        const claims = this.decodeJwtClaims({ jwt: record.value });
+        const isUserId = (value) => {
+            return typeof value === 'number' || (typeof value === 'string' && value.length > 0);
+        };
+        const resolvedUserId = [userId, claims?.userId, claims?.sub].find(isUserId);
+        if (resolvedUserId === undefined) {
+            throw getError({
+                message: '[login] The sign-in response carries no user id | Send userId next to the token, or put a userId or sub claim in the JWT',
+            });
+        }
+        return {
+            userId: resolvedUserId,
+            token: {
+                value: record.value,
+                type: typeof record.type === 'string' ? record.type : 'Bearer',
+            },
+            roles: this.readRoleNames({ roles: roles ?? claims?.roles }),
+        };
+    }
+    /** The claims of a JWT, or `undefined` for a token that is not one. The signature is not checked. */
+    decodeJwtClaims(opts) {
+        const segment = opts.jwt.split('.')[1];
+        if (!segment) {
+            return undefined;
+        }
+        try {
+            const bytes = Uint8Array.from(atob(segment.replace(/-/g, '+').replace(/_/g, '/')), (char) => char.charCodeAt(0));
+            const claims = JSON.parse(new TextDecoder().decode(bytes));
+            return typeof claims === 'object' && claims !== null
+                ? claims
+                : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    /**
+     * The role names of a list: a string is a name, and an object is named by its `identifier`, else
+     * its `name` (IGNIS's role model has an `identifier`). An entry that is neither is skipped.
+     */
+    readRoleNames(opts) {
+        if (!Array.isArray(opts.roles)) {
+            return [];
+        }
+        const names = [];
+        for (const role of opts.roles) {
+            const named = typeof role === 'object' && role !== null ? role : {};
+            const name = typeof role === 'string'
+                ? role
+                : [named.identifier, named.name].find((v) => typeof v === 'string');
+            if (typeof name === 'string' && name.length > 0) {
+                names.push(name);
+            }
+        }
+        return names;
+    }
+    /** The username `login` remembers with the identity. Default: `params.username`. */
+    resolveUsername(opts) {
+        return opts.params?.username ?? '';
+    }
+    /**
+     * Runs once the sign-in response is read and before the session is saved. A throw or a rejection
+     * rejects `login` and nothing is saved: the place to refuse a user, or to hand the token to
+     * another service.
+     */
+    beforeSaveSession(_opts) {
+        return Promise.resolve();
+    }
+    /**
+     * Saves the session where `checkAuth`, `getIdentity` and `getRoles` read it. A provider that
+     * keeps the session elsewhere overrides this to do nothing; `login` still resolves.
+     */
+    saveSession(opts) {
+        const { session, username } = opts;
+        this.authService.saveAuth({
+            token: session.token,
+            userId: session.userId,
+            roles: session.roles,
+            username,
         });
     }
+    // --- react-admin's auth provider -------------------------------------------------------------
+    /**
+     * Typed `Promise<unknown>`, as it was before it became async: a subclass that overrides `login`
+     * with that signature keeps compiling.
+     */
+    async login(params) {
+        const rs = await this.restDataProvider.send({
+            resource: this.signInPath,
+            params: { method: RequestMethods.POST, body: this.buildSignInBody({ params }) },
+        });
+        const session = this.readSignInSession({ data: rs.data });
+        // Before anything is saved, so a throw here leaves no session behind.
+        await this.beforeSaveSession({ session, params });
+        this.saveSession({ session, username: this.resolveUsername({ params }) });
+        return {
+            ...rs,
+            redirectTo: removeDoubleSlashes(`/${this.afterLoginPath}`),
+        };
+    }
     logout(_params) {
         return new Promise((resolve) => {
             this.authService.cleanUp();
@@ -51,7 +184,7 @@ let DefaultAuthProvider = DefaultAuthProvider_1 = class DefaultAuthProvider exte
     async checkAuth(_params) {
         const token = this.authService.getAuth();
         if (!token?.value) {
-            return Promise.reject({ redirectTo: 'login' });
+            return Promise.reject({ redirectTo: this.loginPagePath });
         }
         if (!this.authProviderOptions.paths?.checkAuth) {
             return Promise.resolve();
@@ -61,7 +194,7 @@ let DefaultAuthProvider = DefaultAuthProvider_1 = class DefaultAuthProvider exte
             params: { method: RequestMethods.GET },
         });
         if (!rs?.data) {
-            return Promise.reject({ redirectTo: 'login' });
+            return Promise.reject({ redirectTo: this.loginPagePath });
         }
         return Promise.resolve();
     }
@@ -70,11 +203,11 @@ let DefaultAuthProvider = DefaultAuthProvider_1 = class DefaultAuthProvider exte
         const status = params?.status ?? params?.statusCode;
         if (status === 401) {
             this.authService.cleanUp();
-            return Promise.reject({ redirectTo: 'login' });
+            return Promise.reject({ redirectTo: this.loginPagePath });
         }
         if (status === 403) {
             return Promise.reject({
-                redirectTo: `/unauthorized`,
+                redirectTo: this.unauthorizedPagePath,
                 logoutUser: false,
             });
         }
@@ -93,8 +226,13 @@ let DefaultAuthProvider = DefaultAuthProvider_1 = class DefaultAuthProvider exte
     getRoles(_params) {
         return Promise.resolve(this.authService.getRoles());
     }
+    /**
+     * Refreshes the session through the network service's `refresh`, the one place a refresh is made:
+     * `true` when it was refreshed, `false` when the service has no refresh to make. The `401`
+     * recovery calls the same method, so one burst of 401s and this call share one refresh.
+     */
     refreshToken() {
-        return Promise.resolve();
+        return this.restDataProvider.getNetworkService().refresh();
     }
     value(container) {
         // A subclass with its own constructor rarely forwards the optional 4th argument to `super`.

package/dist/providers/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/providers/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/providers/auth.ts"],"names":[],"mappings":"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"}

package/dist/providers/i18n.d.ts

@@ -1,12 +1,32 @@
 import { type Container } from '@venizia/ignis-inversion';
-import { type I18nProvider } from 'ra-core';
+import { type I18nProvider, type TranslationMessages } from 'ra-core';
 import { BaseProvider } from '@venizia/ardor-kernel';
 import { type II18nProviderOptions } from '../common/index.js';
-import { type IFeature } from '../features/feature.js';
+import { type TFeature } from '../features/feature.js';
+/**
+ * The options hold data (`i18nSources`, `languages`); the hooks are `resolveInitialLocale` and
+ * `composeMessages`, each taking one `opts` object.
+ */
 export declare class DefaultI18nProvider extends BaseProvider<I18nProvider> {
     protected i18nProviderOptions: II18nProviderOptions;
-    protected features: Array<IFeature>;
-    constructor(i18nProviderOptions: II18nProviderOptions, features?: Array<IFeature>);
+    protected features: Array<TFeature>;
+    constructor(i18nProviderOptions: II18nProviderOptions, features?: Array<TFeature>);
+    /**
+     * The locale the admin starts in: the browser's language when it is one of `locales`, else `en`.
+     * Read when the provider is built, not when the module is imported, and not at all outside a
+     * browser.
+     */
+    protected resolveInitialLocale(opts: {
+        locales: Array<string>;
+    }): string;
+    /**
+     * The messages of a locale: the features' messages first, the application's own source over them
+     * (the application may relabel a feature), English for a locale the application has no source for.
+     */
+    protected composeMessages(opts: {
+        locale: string;
+        messages: object;
+    }): TranslationMessages;
     value(_container: Container): I18nProvider;
 }
 //# sourceMappingURL=i18n.d.ts.map

package/dist/providers/i18n.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/providers/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAU,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAgB,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAKnD,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,YAAY,CAAC;IAG/D,SAAS,CAAC,mBAAmB,EAAE,oBAAoB;IAEnD,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;gBAFzB,mBAAmB,EAAE,oBAAoB,EAEzC,QAAQ,GAAE,KAAK,CAAC,QAAQ,CAAM;IAKjC,KAAK,CAAC,UAAU,EAAE,SAAS,GAAG,YAAY;CAyCpD"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/providers/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAU,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAGtE,OAAO,EAAE,YAAY,EAAgB,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,YAAY,CAAC;IAG/D,SAAS,CAAC,mBAAmB,EAAE,oBAAoB;IAEnD,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;gBAFzB,mBAAmB,EAAE,oBAAoB,EAEzC,QAAQ,GAAE,KAAK,CAAC,QAAQ,CAAM;IAK1C;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,MAAM;IAOxE;;;OAGG;IACH,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,mBAAmB;IAMjF,KAAK,CAAC,UAAU,EAAE,SAAS,GAAG,YAAY;CAmCpD"}

package/dist/providers/i18n.js

@@ -17,33 +17,52 @@ import polyglotI18nProvider from 'ra-i18n-polyglot';
 import { BaseProvider, CoreBindings } from '@venizia/ardor-kernel';
 import { englishMessages } from '../common/locales/index.js';
 import { FeatureMessages } from '../features/messages.js';
-const [language] = (navigator?.language?.length ? navigator.language : 'en-US').split('-');
+/**
+ * The options hold data (`i18nSources`, `languages`); the hooks are `resolveInitialLocale` and
+ * `composeMessages`, each taking one `opts` object.
+ */
 let DefaultI18nProvider = DefaultI18nProvider_1 = class DefaultI18nProvider extends BaseProvider {
     constructor(i18nProviderOptions, features = []) {
         super({ scope: DefaultI18nProvider_1.name });
         this.i18nProviderOptions = i18nProviderOptions;
         this.features = features;
     }
+    /**
+     * The locale the admin starts in: the browser's language when it is one of `locales`, else `en`.
+     * Read when the provider is built, not when the module is imported, and not at all outside a
+     * browser.
+     */
+    resolveInitialLocale(opts) {
+        const browserLanguage = typeof navigator === 'undefined' ? undefined : navigator.language;
+        const [language] = (browserLanguage?.length ? browserLanguage : 'en-US').split('-');
+        return opts.locales.includes(language) ? language : 'en';
+    }
+    /**
+     * The messages of a locale: the features' messages first, the application's own source over them
+     * (the application may relabel a feature), English for a locale the application has no source for.
+     */
+    composeMessages(opts) {
+        const { i18nSources = { en: englishMessages } } = this.i18nProviderOptions;
+        return merge({}, opts.messages, i18nSources?.[opts.locale] ?? englishMessages);
+    }
     value(_container) {
-        const { i18nSources = { en: englishMessages }, listLanguages = [{ locale: 'en', name: 'English' }], } = this.i18nProviderOptions;
-        const listLocales = listLanguages.map(({ locale }) => locale);
-        const initialLocale = listLocales.includes(language) ? language : 'en';
-        // The features' messages first, the application's own sources over them: the application may
-        // relabel a feature.
+        const { languages = [{ locale: 'en', name: 'English' }] } = this.i18nProviderOptions;
+        const initialLocale = this.resolveInitialLocale({
+            locales: languages.map(({ locale }) => locale),
+        });
         const featureMessages = new FeatureMessages({ features: this.features });
-        const compose = (opts) => {
-            return merge({}, opts.messages, i18nSources?.[opts.locale] ?? englishMessages);
-        };
         // ra-i18n-polyglot reads the initial locale synchronously, once, while it is built: that read
         // takes what is there now, and ArdorApplication loads the rest through changeLocale() before
         // react-admin renders. Every later read may wait for a lazy bundle.
         let isBuilding = true;
         const i18nProvider = polyglotI18nProvider((locale) => {
             if (isBuilding || !featureMessages.isPending({ locale })) {
-                return compose({ locale, messages: featureMessages.readNow({ locale }) });
+                return this.composeMessages({ locale, messages: featureMessages.readNow({ locale }) });
             }
-            return featureMessages.read({ locale }).then((messages) => compose({ locale, messages }));
-        }, initialLocale, listLanguages, {
+            return featureMessages
+                .read({ locale })
+                .then((messages) => this.composeMessages({ locale, messages }));
+        }, initialLocale, languages, {
             allowMissing: true,
             onMissingKey: (key, _options, _locale) => key,
         });

package/dist/providers/i18n.js.map

@@ -1 +1 @@
-{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/providers/i18n.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/providers/i18n.ts"],"names":[],"mappings":"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"}

package/dist/providers/rest-data.d.ts

@@ -5,9 +5,36 @@ import { type IDataProvider } from '../common/index.js';
 export declare class DefaultRestDataProvider<TResource extends string = string> extends BaseProvider<IDataProvider<TResource>> {
     protected restDataProviderOptions: IRestDataProviderOptions;
     protected applicationInfo: IApplicationInfo;
-    protected networkService: DefaultNetworkRequestService;
+    private cachedNetworkService?;
     constructor(restDataProviderOptions: IRestDataProviderOptions, applicationInfo: IApplicationInfo);
+    /**
+     * Builds the network service this provider sends through. Override it to return a subclass of
+     * `DefaultNetworkRequestService` that overrides its hooks (`refreshToken`, `resolveAuthToken`, ...).
+     * Called once, on first use, so a subclass's own fields are set by then.
+     */
+    protected createNetworkService(): DefaultNetworkRequestService;
+    protected get networkService(): DefaultNetworkRequestService;
     getNetworkService(): DefaultNetworkRequestService;
+    /**
+     * The ids a bulk write touched, read from the affected rows the server answers (not the ids asked
+     * for). A body that is not a row array leaves `data` out.
+     */
+    protected toAffectedIds(opts: {
+        rows: unknown;
+    }): Array<Identifier> | undefined;
+    /**
+     * The filter, query and list extras a list request sends, from react-admin's list params:
+     * pagination into `limit`/`skip`/`offset`, sort into `order`, `noLimit` lifting both, the
+     * remaining params into the filter, `filter.params` and `meta` into the query, and `meta.extra`
+     * into the list extras (sent in a header). Shared by `getList` and `getManyReference`.
+     */
+    protected buildListFilter(opts: {
+        params: GetListParams & ICustomParams;
+    }): {
+        filter: Record<string, AnyType>;
+        queryKey: Record<string, AnyType>;
+        extra: Record<string, AnyType> | undefined;
+    };
     /** `HttpDataSource` settings that send what this provider sends, channel and tracing id included. */
     getDataSourceAuth(): import("@venizia/ardor-kernel").IDataSourceAuth;
     getListHelper<RecordType extends RaRecord = AnyType>(opts: {
@@ -78,6 +105,10 @@ export declare class DefaultRestDataProvider<TResource extends string = string>
         resource: TResource;
         params: ISendParams;
     }): Promise<ISendResponse<ReturnType>>;
+    /**
+     * react-admin's data provider contract takes positional arguments, `(resource, params)`: the one
+     * place this class does not take an `opts` object. Each method hands them to the `opts` method.
+     */
     value(_container: Container): IDataProvider<TResource>;
 }
 //# sourceMappingURL=rest-data.d.ts.map

package/dist/providers/rest-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rest-data.d.ts","sourceRoot":"","sources":["../../src/providers/rest-data.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rest-data.d.ts","sourceRoot":"","sources":["../../src/providers/rest-data.ts"],"names":[],"mappings":"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"}