@openstax/ts-utils 1.5.8 → 1.6.0

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

@@ -15,8 +15,7 @@ export declare type EventHandler = (e: {
 }) => void;
 export interface Window {
     fetch: GenericFetch;
-    top: {} | null;
-    parent: Pick<Window, 'postMessage'> | null;
+    parent: Pick<Window, 'postMessage'>;
     location: {
         search: string;
     };

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

@@ -1,7 +1,9 @@
 import { once } from '../..';
 import { resolveConfigValue } from '../../config';
 import { ifDefined } from '../../guards';
+import { unsafePayloadValidator } from '../../routing/helpers';
 import { embeddedAuthProvider, PostMessageTypes } from './utils/embeddedAuthProvider';
+const isUserData = unsafePayloadValidator();
 export const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
     const config = configProvider[ifDefined(configSpace, 'auth')];
     const accountsBase = once(() => resolveConfigValue(config.accountsBase));
@@ -9,7 +11,7 @@ export const browserAuthProvider = ({ window, configSpace }) => (configProvider)
     const queryKey = 'auth';
     const authQuery = new URLSearchParams(queryString).get(queryKey);
     const referrer = window.document.referrer ? new URL(window.document.referrer) : undefined;
-    const isEmbedded = window.top && window.top !== window;
+    const isEmbedded = window.parent !== window;
     const trustedParent = isEmbedded && referrer && referrer.hostname.match(/^(openstax\.org|((.*)(\.openstax\.org|local|localhost)))$/) ? referrer : undefined;
     const { embeddedQueryValue, getAuthorizedEmbedUrl } = embeddedAuthProvider(() => getUserData(), { queryKey, window });
     let userData = {
@@ -68,12 +70,11 @@ export const browserAuthProvider = ({ window, configSpace }) => (configProvider)
      * requests user identity from accounts api using given token or cookie
      */
     const getFetchUser = async () => {
-        const response = await window.fetch((await accountsBase()).replace(/\/+$/, '') + '/api/user', getAuthorizedFetchConfigFromData(userData));
+        const response = await window.fetch((await accountsBase()).replace(/\/+$/, '') + '/api/user?always_200=true', getAuthorizedFetchConfigFromData(userData));
         if (response.status === 200) {
-            return { ...userData, user: await response.json() };
-        }
-        if (response.status === 403) {
-            return { ...userData, user: undefined };
+            const body = await response.json();
+            const user = isUserData(body) ? body : undefined;
+            return { ...userData, user };
         }
         const message = await response.text();
         throw new Error(`Error response from Accounts ${response.status}: ${message}`);