@openstax/ts-utils 1.5.8 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/services/authProvider/browser.d.ts +1 -2
- package/dist/cjs/services/authProvider/browser.js +7 -6
- package/dist/cjs/tsconfig.without-specs.cjs.tsbuildinfo +1 -1
- package/dist/esm/services/authProvider/browser.d.ts +1 -2
- package/dist/esm/services/authProvider/browser.js +7 -6
- package/dist/esm/tsconfig.without-specs.esm.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,9 @@ exports.browserAuthProvider = void 0;
|
|
|
4
4
|
const __1 = require("../..");
|
|
5
5
|
const config_1 = require("../../config");
|
|
6
6
|
const guards_1 = require("../../guards");
|
|
7
|
+
const helpers_1 = require("../../routing/helpers");
|
|
7
8
|
const embeddedAuthProvider_1 = require("./utils/embeddedAuthProvider");
|
|
9
|
+
const isUserData = (0, helpers_1.unsafePayloadValidator)();
|
|
8
10
|
const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
|
|
9
11
|
const config = configProvider[(0, guards_1.ifDefined)(configSpace, 'auth')];
|
|
10
12
|
const accountsBase = (0, __1.once)(() => (0, config_1.resolveConfigValue)(config.accountsBase));
|
|
@@ -12,7 +14,7 @@ const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
|
|
|
12
14
|
const queryKey = 'auth';
|
|
13
15
|
const authQuery = new URLSearchParams(queryString).get(queryKey);
|
|
14
16
|
const referrer = window.document.referrer ? new URL(window.document.referrer) : undefined;
|
|
15
|
-
const isEmbedded = window.
|
|
17
|
+
const isEmbedded = window.parent !== window;
|
|
16
18
|
const trustedParent = isEmbedded && referrer && referrer.hostname.match(/^(openstax\.org|((.*)(\.openstax\.org|local|localhost)))$/) ? referrer : undefined;
|
|
17
19
|
const { embeddedQueryValue, getAuthorizedEmbedUrl } = (0, embeddedAuthProvider_1.embeddedAuthProvider)(() => getUserData(), { queryKey, window });
|
|
18
20
|
let userData = {
|
|
@@ -71,12 +73,11 @@ const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
|
|
|
71
73
|
* requests user identity from accounts api using given token or cookie
|
|
72
74
|
*/
|
|
73
75
|
const getFetchUser = async () => {
|
|
74
|
-
const response = await window.fetch((await accountsBase()).replace(/\/+$/, '') + '/api/user', getAuthorizedFetchConfigFromData(userData));
|
|
76
|
+
const response = await window.fetch((await accountsBase()).replace(/\/+$/, '') + '/api/user?always_200=true', getAuthorizedFetchConfigFromData(userData));
|
|
75
77
|
if (response.status === 200) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
return { ...userData, user: undefined };
|
|
78
|
+
const body = await response.json();
|
|
79
|
+
const user = isUserData(body) ? body : undefined;
|
|
80
|
+
return { ...userData, user };
|
|
80
81
|
}
|
|
81
82
|
const message = await response.text();
|
|
82
83
|
throw new Error(`Error response from Accounts ${response.status}: ${message}`);
|