@openstax/ts-utils 1.12.1 → 1.12.3

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

@@ -107,8 +107,10 @@ const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
             return userDataFromParentWindow;
         }
         const userDataFromAuthQuery = await getFetchUser();
-        if ((0, lodash_1.isEqual)(userDataFromAuthQuery, userDataFromParentWindow)) {
-            return userDataFromAuthQuery;
+        // userDataFromParentWindow has an extra field (role)
+        if (userDataFromAuthQuery.token === userDataFromParentWindow.token &&
+            (0, lodash_1.isEqual)(userDataFromAuthQuery.user, userDataFromParentWindow.user)) {
+            return userDataFromParentWindow;
         }
         throw new errors_1.UnauthorizedError();
     });

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

@@ -1,5 +1,5 @@
 import type { FetchConfig } from '../../fetch';
-import type { HttpHeaders } from '../../routing';
+import type { HttpHeaders, QueryParams } from '../../routing';
 export interface TokenUser {
     id: number;
     name: string;
@@ -35,15 +35,16 @@ export declare type AuthProvider = {
     getAuthorizedFetchConfig: () => Promise<FetchConfig>;
 };
 export declare type CookieAuthProviderRequest = {
-    headers: HttpHeaders;
     cookies?: string[];
+    headers: HttpHeaders;
+    queryStringParameters?: QueryParams;
 };
 export declare type CookieAuthProvider = (inputs: {
     request: CookieAuthProviderRequest;
 }) => AuthProvider;
 export declare type StubAuthProvider = (user: User | undefined) => AuthProvider;
 export declare const stubAuthProvider: (user?: User | undefined) => AuthProvider;
-export declare const getAuthTokenOrCookie: (request: CookieAuthProviderRequest, cookieName: string) => [string, {
+export declare const getAuthTokenOrCookie: (request: CookieAuthProviderRequest, cookieName: string, queryKey?: string) => [string, {
     Authorization: string;
 }] | [string, {
     cookie: string;

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

@@ -12,12 +12,15 @@ const stubAuthProvider = (user) => ({
     getAuthorizedFetchConfig: () => Promise.resolve(user ? { headers: { Authorization: user.uuid } } : {})
 });
 exports.stubAuthProvider = stubAuthProvider;
-const getAuthTokenOrCookie = (request, cookieName) => {
-    var _a;
+const getAuthTokenOrCookie = (request, cookieName, queryKey = 'auth') => {
+    var _a, _b;
+    const authParam = request.queryStringParameters ? request.queryStringParameters[queryKey] : undefined;
     const authHeader = (0, helpers_2.getHeader)(request.headers, 'authorization');
-    const cookieValue = cookie_1.default.parse(((_a = request.cookies) === null || _a === void 0 ? void 0 : _a.join('; ')) || '')[cookieName];
-    return authHeader && authHeader.length >= 8 && authHeader.startsWith('Bearer ')
-        ? (0, helpers_1.tuple)(authHeader.slice(7), { Authorization: authHeader })
-        : (0, helpers_1.tuple)(cookieValue, { cookie: cookie_1.default.serialize(cookieName, cookieValue) });
+    const cookieValue = cookie_1.default.parse((_b = (_a = request.cookies) === null || _a === void 0 ? void 0 : _a.join('; ')) !== null && _b !== void 0 ? _b : '')[cookieName];
+    return typeof authParam === 'string'
+        ? (0, helpers_1.tuple)(authParam, { Authorization: `Bearer ${authParam}` })
+        : authHeader && authHeader.length >= 8 && authHeader.startsWith('Bearer ')
+            ? (0, helpers_1.tuple)(authHeader.slice(7), { Authorization: authHeader })
+            : (0, helpers_1.tuple)(cookieValue, { cookie: cookie_1.default.serialize(cookieName, cookieValue) });
 };
 exports.getAuthTokenOrCookie = getAuthTokenOrCookie;