@openstax/ts-utils 1.16.2 → 1.18.0

package/dist/esm/services/authProvider/browser.d.ts

@@ -26,6 +26,7 @@ export interface Window {
     addEventListener: (event: 'message', callback: EventHandler) => void;
     removeEventListener: (event: 'message', callback: EventHandler) => void;
 }
+export declare type UpdatableUserFields = Partial<Pick<User, 'consent_preferences' | 'first_name' | 'last_name'>>;
 export declare const browserAuthProvider: <C extends string = "auth">({ window, configSpace }: Initializer<C>) => (configProvider: { [key in C]: {
     accountsBase: import("../../config").ConfigValueProvider<string>;
 }; }) => {
@@ -62,5 +63,12 @@ export declare const browserAuthProvider: <C extends string = "auth">({ window,
      * loads current user identity. does not reflect changes in identity after being called the first time.
      */
     getUser: () => Promise<User | undefined>;
+    /**
+     * updates user settings, for example the cookie consent preferences
+     */
+    updateUser: (updates: UpdatableUserFields) => Promise<{
+        user: User;
+        token: string | null;
+    }>;
 };
 export {};

package/dist/esm/services/authProvider/browser.js

@@ -1,7 +1,7 @@
 import { once } from '../..';
 import { resolveConfigValue } from '../../config';
 import { ifDefined } from '../../guards';
-import { unsafePayloadValidator } from '../../routing/helpers';
+import { METHOD, unsafePayloadValidator } from '../../routing';
 import { embeddedAuthProvider, PostMessageTypes } from './utils/embeddedAuthProvider';
 const isUserData = unsafePayloadValidator();
 export const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
@@ -99,6 +99,17 @@ export const browserAuthProvider = ({ window, configSpace }) => (configProvider)
     const getUser = async () => {
         return (await getUserData()).user;
     };
+    const updateUser = async (updates) => {
+        const response = await window.fetch((await accountsBase()).replace(/\/+$/, '') + '/api/user', { ...getAuthorizedFetchConfigFromData(userData), method: METHOD.PUT, body: JSON.stringify(updates) });
+        if (response.status === 200) {
+            const user = await response.json();
+            if (isUserData(user)) {
+                return { ...userData, user };
+            }
+        }
+        const message = await response.text();
+        throw new Error(`Error response from Accounts ${response.status}: ${message}`);
+    };
     return {
         /**
          * gets the authentication token
@@ -131,5 +142,9 @@ export const browserAuthProvider = ({ window, configSpace }) => (configProvider)
          * loads current user identity. does not reflect changes in identity after being called the first time.
          */
         getUser,
+        /**
+         * updates user settings, for example the cookie consent preferences
+         */
+        updateUser,
     };
 };

package/dist/esm/services/authProvider/index.d.ts

@@ -30,7 +30,9 @@ export interface ApiUser extends TokenUser {
     }>;
     external_ids: string[];
     is_not_gdpr_location: boolean;
+    self_reported_role: string;
     signed_contract_names: string[];
+    using_openstax: boolean;
 }
 export declare type User = TokenUser | ApiUser;
 export declare type AuthProvider = {

package/dist/esm/services/launchParams/signer.d.ts

@@ -21,7 +21,7 @@ export declare const createLaunchSigner: <C extends string = "launch">({ configS
     jwks: () => Promise<{
         keys: JWK.RawKey[];
     }>;
-    sign: (subject: string, maxExpiresIn?: string | number | null | undefined) => Promise<string>;
+    sign: (subject: string, maxExp?: number | null | undefined) => Promise<string>;
 };
 export declare type LaunchSigner = ReturnType<ReturnType<typeof createLaunchSigner>>;
 export {};

package/dist/esm/services/launchParams/signer.js

@@ -28,17 +28,21 @@ export const createLaunchSigner = ({ configSpace }) => (configProvider) => {
         return keystore;
     });
     const jwks = async () => (await getKeyStore()).toJSON(false);
-    const getExpiresInWithMax = async (maxExpiresIn) => {
+    const getExpiresInWithMax = async (maxExp) => {
         const expiresIn = await getExpiresIn();
-        const maxExpiresInSeconds = typeof maxExpiresIn === 'number' ? maxExpiresIn :
-            typeof maxExpiresIn === 'string' ? Math.floor(ms(maxExpiresIn) / 1000) :
-                undefined;
-        return maxExpiresInSeconds ? Math.min(Math.floor(ms(expiresIn) / 1000), maxExpiresInSeconds) : expiresIn;
+        // The ms library used by jsonwebtoken can handle a value in seconds as well as a string like '1d'
+        if (!maxExp) {
+            return expiresIn;
+        }
+        // Convert both values to seconds for comparison
+        const expiresInSeconds = Math.floor(ms(expiresIn) / 1000);
+        const maxExpSeconds = maxExp - Math.floor(Date.now() / 1000);
+        return Math.min(expiresInSeconds, maxExpSeconds);
     };
-    const sign = async (subject, maxExpiresIn) => {
+    const sign = async (subject, maxExp) => {
         const alg = await getAlg();
         // expiresIn can be a number of seconds or a string like '1h' or '1d'
-        const expiresIn = await getExpiresInWithMax(maxExpiresIn);
+        const expiresIn = await getExpiresInWithMax(maxExp);
         const iss = await getIss();
         const header = { alg, iss };
         return jwt.sign({}, await getPrivateKey(), { algorithm: alg, expiresIn, header, issuer: iss, subject });