@openstax/ts-utils 1.31.2 → 1.32.1

package/dist/cjs/routing/index.d.ts

@@ -25,6 +25,20 @@ export type RouteMatchRecord<R> = R extends AnyRoute<R> ? {
     route: R;
     params: ParamsForRoute<R>;
 } : never;
+type Flatten<T> = T extends any ? {
+    [K in keyof T]: T[K];
+} : never;
+export type ExternalRoute<R> = R extends Route<infer N, infer P, infer Sa, infer Sr, infer Ri, infer Ro> & infer E ? Route<N, P, Sa, Sr extends {
+    payload: any;
+} ? Flatten<Pick<Sr, 'payload'>> : Record<string, never>, Ri, Ro> & Flatten<Omit<E, 'name' | 'path' | 'handler' | 'requestServiceProvider'>> : never;
+/** this utility simplifies the route type to remove stuff that is only
+ * relevant internal to the route, like the service types, keeping only
+ * the payload type which is necessary for the apiGateway
+ *
+ * this helps avoid the "type too complicated" error that typescript throws
+ * when there are a lot of routes with complex services
+ **/
+export declare const routesList: <R>(routes: R[]) => ExternalRoute<R>[];
 /**
  * The conditional type for the payload for a given route, `R`. This isn't a route structure, its
  * a convention based on the request middleware
@@ -140,7 +154,9 @@ export declare const makeCreateRoute: <Sa, Ri, Ex = {}>() => CreateRoute<Sa, Ri,
  */
 export declare const makeRenderRouteUrl: <Ru extends {
     path: string;
-}>() => <R extends Ru>(route: R, params: ParamsForRoute<R>, query?: QueryParams) => string;
+}>() => <R>(route: ExternalRoute<R> extends Ru ? R & {
+    path: string;
+} : R extends Ru ? R : never, params: ParamsForRoute<R>, query?: QueryParams) => string;
 /**
  * A pre-made result from `makeRenderRouteUrl`, this function interpolates parameter and query
  * arguments into a route path.
@@ -153,7 +169,9 @@ export declare const makeRenderRouteUrl: <Ru extends {
  * @param query the query parameters to add to the route path
  * @returns the interpolated route path
  */
-export declare const renderAnyRouteUrl: <R extends any>(route: R, params: ParamsForRoute<R>, query?: QueryParams) => string;
+export declare const renderAnyRouteUrl: <R>(route: ExternalRoute<R> extends any ? R & {
+    path: string;
+} : R extends any ? R : never, params: ParamsForRoute<R>, query?: QueryParams) => string;
 type RequestPathExtractor<Ri> = (request: Ri) => string;
 type RequestLogExtractor<Ri> = (request: Ri) => JsonCompatibleStruct;
 type RequestRouteMatcher<Ri, R> = (request: Ri, route: R) => boolean;

package/dist/cjs/routing/index.js

@@ -39,11 +39,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.METHOD = exports.apiHtmlResponse = exports.apiTextResponse = exports.apiJsonResponse = exports.makeGetRequestResponder = exports.renderAnyRouteUrl = exports.makeRenderRouteUrl = exports.makeCreateRoute = void 0;
+exports.METHOD = exports.apiHtmlResponse = exports.apiTextResponse = exports.apiJsonResponse = exports.makeGetRequestResponder = exports.renderAnyRouteUrl = exports.makeRenderRouteUrl = exports.makeCreateRoute = exports.routesList = void 0;
 const pathToRegexp = __importStar(require("path-to-regexp"));
 const query_string_1 = __importDefault(require("query-string"));
 const helpers_1 = require("../misc/helpers");
 const console_1 = require("../services/logger/console");
+/** this utility simplifies the route type to remove stuff that is only
+ * relevant internal to the route, like the service types, keeping only
+ * the payload type which is necessary for the apiGateway
+ *
+ * this helps avoid the "type too complicated" error that typescript throws
+ * when there are a lot of routes with complex services
+ **/
+const routesList = (routes) => routes;
+exports.routesList = routesList;
 /**
  * Makes a createRoute function that can be used to create routes (this is a factory factory). The
  * `makeCreateRoute` function is typically called once in the backend and once in the frontend to

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

@@ -1,6 +1,6 @@
 import { ConfigProviderForConfig } from '../../config';
 import { FetchConfig, GenericFetch } from '../../fetch';
-import { User } from '.';
+import { ApiUser, User } from '.';
 type Config = {
     accountsBase: string;
 };
@@ -26,7 +26,7 @@ export interface Window {
     addEventListener: (event: 'message', callback: EventHandler) => void;
     removeEventListener: (event: 'message', callback: EventHandler) => void;
 }
-export type UpdatableUserFields = Partial<Pick<User, 'consent_preferences' | 'first_name' | 'last_name'>>;
+export type UpdatableUserFields = Partial<Pick<ApiUser, 'consent_preferences' | 'first_name' | 'last_name'>>;
 export declare const browserAuthProvider: <C extends string = "auth">({ window, configSpace }: Initializer<C>) => (configProvider: { [_key in C]: ConfigProviderForConfig<Config>; }) => {
     /**
      * gets the authentication token
@@ -65,7 +65,7 @@ export declare const browserAuthProvider: <C extends string = "auth">({ window,
      * updates user settings, for example the cookie consent preferences
      */
     updateUser: (updates: UpdatableUserFields) => Promise<{
-        user: User;
+        user: ApiUser;
         token: string | null;
     }>;
 };

package/dist/cjs/services/authProvider/decryption.d.ts

@@ -1,15 +1,19 @@
 import type { ConfigProviderForConfig } from '../../config';
-import { AuthProvider, CookieAuthProvider } from '.';
+import { GenericFetch } from '../../fetch';
+import { ApiUser, AuthProvider, CookieAuthProvider } from '.';
 type Config = {
+    accountsBase: string;
     cookieName: string;
     encryptionPrivateKey: string;
     signaturePublicKey: string;
 };
 interface Initializer<C> {
     configSpace?: C;
+    fetch: GenericFetch;
 }
 export type DecryptionAuthProvider = AuthProvider & {
     getTokenExpiration: (tokenString?: string) => Promise<number | null | undefined>;
+    loadUserData: () => Promise<ApiUser | undefined>;
 };
 export declare const decryptionAuthProvider: <C extends string = "decryption">(initializer: Initializer<C>) => (configProvider: { [_key in C]: ConfigProviderForConfig<Config>; }) => CookieAuthProvider<DecryptionAuthProvider>;
 export {};

package/dist/cjs/services/authProvider/decryption.js

@@ -6,14 +6,17 @@ const errors_1 = require("../../errors");
 const guards_1 = require("../../guards");
 const helpers_1 = require("../../misc/helpers");
 const decryptAndVerify_1 = require("./utils/decryptAndVerify");
+const userSubrequest_1 = require("./utils/userSubrequest");
 const _1 = require(".");
 const decryptionAuthProvider = (initializer) => (configProvider) => {
     const config = configProvider[(0, guards_1.ifDefined)(initializer.configSpace, 'decryption')];
+    const accountsBase = (0, helpers_1.once)(() => (0, resolveConfigValue_1.resolveConfigValue)(config.accountsBase));
     const cookieName = (0, helpers_1.once)(() => (0, resolveConfigValue_1.resolveConfigValue)(config.cookieName));
     const encryptionPrivateKey = (0, helpers_1.once)(() => (0, resolveConfigValue_1.resolveConfigValue)(config.encryptionPrivateKey));
     const signaturePublicKey = (0, helpers_1.once)(() => (0, resolveConfigValue_1.resolveConfigValue)(config.signaturePublicKey));
     return ({ request, logger }) => {
         let user;
+        let userData;
         const getAuthToken = async () => (0, _1.getAuthTokenOrCookie)(request, await cookieName())[0];
         const getAuthorizedFetchConfig = async () => {
             const [token, headers] = (0, _1.getAuthTokenOrCookie)(request, await cookieName());
@@ -22,40 +25,47 @@ const decryptionAuthProvider = (initializer) => (configProvider) => {
             }
             return { headers };
         };
-        const getPayload = async (tokenString) => {
+        const getDecryptedPayload = async (tokenString) => {
             const token = tokenString !== null && tokenString !== void 0 ? tokenString : await getAuthToken();
             if (!token) {
                 return undefined;
             }
             return (0, decryptAndVerify_1.decryptAndVerify)(token, await encryptionPrivateKey(), await signaturePublicKey());
         };
-        const loadUser = async () => {
-            const result = await getPayload();
-            if (!result) {
-                return undefined;
-            }
-            if ('error' in result && result.error == 'expired token') {
-                throw new errors_1.SessionExpiredError();
-            }
-            if ('user' in result) {
-                logger.setContext({ user: result.user.uuid });
-                return result.user;
+        const getUser = async () => {
+            if (!user) {
+                const result = await getDecryptedPayload();
+                if (!result) {
+                    return undefined;
+                }
+                if ('error' in result && result.error == 'expired token') {
+                    throw new errors_1.SessionExpiredError();
+                }
+                if ('user' in result) {
+                    logger.setContext({ user: result.user.uuid });
+                    user = result.user;
+                }
             }
-            return undefined;
+            return user;
         };
         return {
             getAuthToken,
             getAuthorizedFetchConfig,
             getTokenExpiration: async (tokenString) => {
                 var _a;
-                const payload = await getPayload(tokenString);
+                const payload = await getDecryptedPayload(tokenString);
                 return payload ? ((_a = payload.exp) !== null && _a !== void 0 ? _a : null) : undefined;
             },
-            getUser: async () => {
-                if (!user) {
-                    user = await loadUser();
+            getUser,
+            loadUserData: async () => {
+                if (!userData) {
+                    const token = await getAuthToken();
+                    if (!token) {
+                        return undefined;
+                    }
+                    userData = await (0, userSubrequest_1.loadUserData)(initializer.fetch, await accountsBase(), await cookieName(), token);
                 }
-                return user;
+                return userData;
             },
         };
     };

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

@@ -10,14 +10,14 @@ export type ConsentPreferences = {
 export type TokenUser = {
     id: number;
     name: string;
+    uuid: string;
+    faculty_status: string;
+    is_admin: boolean;
+};
+export type ApiUser = TokenUser & {
     first_name: string;
     last_name: string;
     full_name: string;
-    uuid: string;
-    faculty_status: string;
-    is_administrator: boolean;
-} & Partial<ConsentPreferences>;
-export interface ApiUser extends TokenUser {
     contact_infos: Array<{
         type: string;
         value: string;
@@ -34,7 +34,7 @@ export interface ApiUser extends TokenUser {
     self_reported_role: string;
     signed_contract_names: string[];
     using_openstax: boolean;
-}
+} & Partial<ConsentPreferences>;
 export type User = TokenUser | ApiUser;
 export type AuthProvider = {
     getAuthToken: () => Promise<string | null>;

package/dist/cjs/services/authProvider/subrequest.d.ts

@@ -2,8 +2,8 @@ import { ConfigProviderForConfig } from '../../config';
 import { GenericFetch } from '../../fetch';
 import { CookieAuthProvider } from '.';
 type Config = {
-    cookieName: string;
     accountsBase: string;
+    cookieName: string;
 };
 interface Initializer<C> {
     configSpace?: C;

package/dist/cjs/services/authProvider/subrequest.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subrequestAuthProvider = void 0;
-const cookie_1 = __importDefault(require("cookie"));
 const __1 = require("../..");
 const config_1 = require("../../config");
 const guards_1 = require("../../guards");
+const userSubrequest_1 = require("./utils/userSubrequest");
 const _1 = require(".");
 const subrequestAuthProvider = (initializer) => (configProvider) => {
     const config = configProvider[(0, guards_1.ifDefined)(initializer.configSpace, 'subrequest')];
@@ -29,9 +26,7 @@ const subrequestAuthProvider = (initializer) => (configProvider) => {
             if (!token) {
                 return undefined;
             }
-            const headers = { cookie: cookie_1.default.serialize(resolvedCookieName, token) };
-            const user = await initializer.fetch((await accountsBase()).replace(/\/+$/, '') + '/api/user', { headers })
-                .then(response => response.json());
+            const user = await (0, userSubrequest_1.loadUserData)(initializer.fetch, await accountsBase(), resolvedCookieName, token);
             if (user) {
                 logger.setContext({ user: user.uuid });
             }

package/dist/cjs/services/authProvider/utils/userSubrequest.d.ts

@@ -0,0 +1,3 @@
+import { ApiUser } from '..';
+import { GenericFetch } from '../../../fetch';
+export declare const loadUserData: (fetch: GenericFetch, accountsBase: string, cookieName: string, token: string) => Promise<ApiUser | undefined>;

package/dist/cjs/services/authProvider/utils/userSubrequest.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadUserData = void 0;
+const cookie_1 = __importDefault(require("cookie"));
+const loadUserData = (fetch, accountsBase, cookieName, token) => {
+    const headers = { cookie: cookie_1.default.serialize(cookieName, token) };
+    return fetch(accountsBase.replace(/\/+$/, '') + '/api/user', { headers })
+        .then(response => response.json());
+};
+exports.loadUserData = loadUserData;

package/dist/cjs/services/fileServer/s3FileServer.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.s3FileServer = void 0;
 /* cspell:ignore presigner */
+const path_1 = __importDefault(require("path"));
 const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_presigned_post_1 = require("@aws-sdk/s3-presigned-post");
 const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
-const path_1 = __importDefault(require("path"));
 const uuid_1 = require("uuid");
 const __1 = require("../..");
 const assertions_1 = require("../../assertions");