@openstax/ts-utils 1.31.2 → 1.32.0

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

@@ -38,7 +38,7 @@ export type ApiClientResponse<Ro> = Ro extends any ? {
 } : never;
 export type ExpandRoute<T> = T extends ((...args: infer A) => infer R) & {
     renderUrl: (...args: infer Ar) => Promise<string>;
-} ? ((...args: A) => R) & {
+} ? (...args: A) => R & {
     renderUrl: (...args: Ar) => Promise<string>;
 } : never;
 export type MapRoutesToClient<Ru> = [Ru] extends [AnyRoute<Ru>] ? {

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/index.d.ts

@@ -13,18 +13,6 @@ export declare const isFolderValue: (thing: any) => thing is FolderValue;
 export interface FileServerAdapter {
     putFileContent: (source: FileValue, content: string) => Promise<FileValue>;
     getSignedViewerUrl: (source: FileValue) => Promise<string>;
-    getPublicViewerUrl: (source: FileValue) => Promise<string>;
     getFileContent: (source: FileValue) => Promise<Buffer>;
-    getSignedFileUploadConfig: () => Promise<{
-        url: string;
-        payload: {
-            [key: string]: string;
-        };
-    }>;
-    copyFileTo: (source: FileValue, destinationPath: string) => Promise<FileValue>;
-    copyFileToDirectory: (source: FileValue, destinationDirectory: string) => Promise<FileValue>;
-    isTemporaryUpload: (source: FileValue) => boolean;
-    getFileChecksum: (source: FileValue) => Promise<string>;
-    filesEqual: (sourceA: FileValue, sourceB: FileValue) => Promise<boolean>;
 }
 export declare const isFileOrFolder: (thing: any) => thing is FileValue | FolderValue;

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

@@ -5,20 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localFileServer = void 0;
 /* cspell:ignore originalname */
-const crypto_1 = __importDefault(require("crypto"));
 const fs_1 = __importDefault(require("fs"));
 const https_1 = __importDefault(require("https"));
 const path_1 = __importDefault(require("path"));
 const cors_1 = __importDefault(require("cors"));
 const express_1 = __importDefault(require("express"));
 const multer_1 = __importDefault(require("multer"));
-const uuid_1 = require("uuid");
 const assertions_1 = require("../../assertions");
 const config_1 = require("../../config");
 const guards_1 = require("../../guards");
 const helpers_1 = require("../../misc/helpers");
 /* istanbul ignore next */
-const startServer = (0, helpers_1.memoize)((port, uploadDir) => {
+const startServer = (0, helpers_1.once)((port, uploadDir) => {
     // TODO - re-evaluate the `preservePath` behavior to match whatever s3 does
     const upload = (0, multer_1.default)({ dest: uploadDir, preservePath: true });
     const fileServerApp = (0, express_1.default)();
@@ -63,9 +61,6 @@ const localFileServer = (initializer) => (configProvider) => {
     const getSignedViewerUrl = async (source) => {
         return `https://${await host}:${await port}/${source.path}`;
     };
-    const getPublicViewerUrl = async (source) => {
-        return `https://${await host}:${await port}/${source.path}`;
-    };
     const getFileContent = async (source) => {
         const filePath = path_1.default.join(await fileDir, source.path);
         return fs_1.default.promises.readFile(filePath);
@@ -77,56 +72,10 @@ const localFileServer = (initializer) => (configProvider) => {
         await fs_1.default.promises.writeFile(filePath, content);
         return source;
     };
-    const getSignedFileUploadConfig = async () => {
-        const prefix = 'uploads/' + (0, uuid_1.v4)();
-        return {
-            url: `https://${await host}:${await port}/`,
-            payload: {
-                key: prefix + '/${filename}',
-            }
-        };
-    };
-    const copyFileTo = async (source, destinationPath) => {
-        const sourcePath = path_1.default.join(await fileDir, source.path);
-        const destPath = path_1.default.join(await fileDir, destinationPath);
-        const destDirectory = path_1.default.dirname(destPath);
-        await fs_1.default.promises.mkdir(destDirectory, { recursive: true });
-        await fs_1.default.promises.copyFile(sourcePath, destPath);
-        return {
-            ...source,
-            path: destinationPath
-        };
-    };
-    const copyFileToDirectory = async (source, destination) => {
-        const destinationPath = path_1.default.join(destination, source.label);
-        return copyFileTo(source, destinationPath);
-    };
-    const isTemporaryUpload = (source) => {
-        return source.path.indexOf('uploads/') === 0;
-    };
-    const getFileChecksum = async (source) => {
-        const filePath = path_1.default.join(await fileDir, source.path);
-        const fileContent = await fs_1.default.promises.readFile(filePath);
-        return crypto_1.default.createHash('md5').update(fileContent).digest('hex');
-    };
-    const filesEqual = async (sourceA, sourceB) => {
-        const [aSum, bSum] = await Promise.all([
-            getFileChecksum(sourceA),
-            getFileChecksum(sourceB)
-        ]);
-        return aSum === bSum;
-    };
     return {
         getSignedViewerUrl,
-        getPublicViewerUrl,
         getFileContent,
         putFileContent,
-        getSignedFileUploadConfig,
-        copyFileTo,
-        copyFileToDirectory,
-        isTemporaryUpload,
-        getFileChecksum,
-        filesEqual,
     };
 };
 exports.localFileServer = localFileServer;

package/dist/cjs/services/fileServer/s3FileServer.d.ts

@@ -4,7 +4,6 @@ import { FileServerAdapter } from '.';
 export type Config = {
     bucketName: string;
     bucketRegion: string;
-    publicViewerDomain?: string;
 };
 interface Initializer<C> {
     configSpace?: C;

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

@@ -1,15 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.s3FileServer = void 0;
 /* cspell:ignore presigner */
 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");
 const config_1 = require("../../config");
@@ -18,9 +12,6 @@ const s3FileServer = (initializer) => (configProvider) => {
     const config = configProvider[(0, guards_1.ifDefined)(initializer.configSpace, 'deployed')];
     const bucketName = (0, __1.once)(() => (0, config_1.resolveConfigValue)(config.bucketName));
     const bucketRegion = (0, __1.once)(() => (0, config_1.resolveConfigValue)(config.bucketRegion));
-    const publicViewerDomain = (0, __1.once)(() => 'publicViewerDomain' in config && config.publicViewerDomain
-        ? (0, config_1.resolveConfigValue)(config.publicViewerDomain)
-        : undefined);
     const s3Service = (0, __1.once)(async () => {
         var _a, _b;
         const args = { apiVersion: '2012-08-10', region: await bucketRegion() };
@@ -36,10 +27,6 @@ const s3FileServer = (initializer) => (configProvider) => {
             expiresIn: 3600, // 1 hour
         });
     };
-    const getPublicViewerUrl = async (source) => {
-        const host = (0, assertions_1.assertDefined)(await publicViewerDomain(), new Error(`Tried to get public viewer URL for ${source.path} but no publicViewerDomain configured`));
-        return `https://${host}/${source.path}`;
-    };
     const getFileContent = async (source) => {
         const bucket = await bucketName();
         const command = new client_s3_1.GetObjectCommand({ Bucket: bucket, Key: source.path });
@@ -57,75 +44,10 @@ const s3FileServer = (initializer) => (configProvider) => {
         await (await s3Service()).send(command);
         return source;
     };
-    /*
-     * https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_s3_presigned_post.html
-     * https://docs.aws.amazon.com/AmazonS3/latest/userguide/HTTPPOSTExamples.html
-     * https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-post-example.html
-     */
-    const getSignedFileUploadConfig = async () => {
-        const prefix = 'uploads/' + (0, uuid_1.v4)();
-        const bucket = (await bucketName());
-        const Conditions = [
-            { acl: 'private' },
-            { bucket },
-            ['starts-with', '$key', prefix]
-        ];
-        const defaultFields = {
-            acl: 'private',
-        };
-        const { url, fields } = await (0, s3_presigned_post_1.createPresignedPost)(await s3Service(), {
-            Bucket: bucket,
-            Key: prefix + '/${filename}',
-            Conditions,
-            Fields: defaultFields,
-            Expires: 3600, // 1 hour
-        });
-        return {
-            url, payload: fields
-        };
-    };
-    const copyFileTo = async (source, destinationPath) => {
-        const bucket = (await bucketName());
-        const destinationPathWithoutLeadingSlash = destinationPath.replace(/^\//, '');
-        const command = new client_s3_1.CopyObjectCommand({
-            Bucket: bucket,
-            Key: destinationPathWithoutLeadingSlash,
-            CopySource: path_1.default.join(bucket, source.path),
-        });
-        await (await s3Service()).send(command);
-        return {
-            ...source,
-            path: destinationPathWithoutLeadingSlash
-        };
-    };
-    const copyFileToDirectory = async (source, destination) => {
-        const destinationPath = path_1.default.join(destination, source.label);
-        return copyFileTo(source, destinationPath);
-    };
-    const isTemporaryUpload = (source) => {
-        return source.path.indexOf('uploads/') === 0;
-    };
-    const getFileChecksum = async (source) => {
-        const bucket = (await bucketName());
-        const command = new client_s3_1.HeadObjectCommand({ Bucket: bucket, Key: source.path });
-        const response = await (await s3Service()).send(command);
-        return (0, assertions_1.assertDefined)(response.ETag);
-    };
-    const filesEqual = async (sourceA, sourceB) => {
-        const [aSum, bSum] = await Promise.all([getFileChecksum(sourceA), getFileChecksum(sourceB)]);
-        return aSum === bSum;
-    };
     return {
         getFileContent,
         putFileContent,
         getSignedViewerUrl,
-        getPublicViewerUrl,
-        getSignedFileUploadConfig,
-        copyFileTo,
-        copyFileToDirectory,
-        isTemporaryUpload,
-        getFileChecksum,
-        filesEqual,
     };
 };
 exports.s3FileServer = s3FileServer;

package/dist/cjs/services/searchProvider/openSearch.js

@@ -29,6 +29,10 @@ const openSearchService = (initializer = {}) => (configProvider) => {
         maxRetries: 4, // default is 3
         requestTimeout: 5000, // default is 30000
         pingTimeout: 2000, // default is 30000
+        sniffOnConnectionFault: true,
+        sniffOnStart: true,
+        resurrectStrategy: 'ping',
+        agent: { keepAlive: false },
         node: await (0, config_1.resolveConfigValue)(config.node),
     }));
     return (indexConfig) => {
@@ -64,9 +68,6 @@ const openSearchService = (initializer = {}) => (configProvider) => {
                 body: params.body,
                 id: params.id,
                 refresh: true
-            }, {
-                requestTimeout: 10000,
-                maxRetries: 1,
             });
         };
         const bulkIndex = async (items) => {
@@ -78,9 +79,6 @@ const openSearchService = (initializer = {}) => (configProvider) => {
                     item.body
                 ]),
                 refresh: true
-            }, {
-                requestTimeout: 10000,
-                maxRetries: 1,
             });
         };
         const search = async (options) => {