@openstax/ts-utils 1.15.4 → 1.15.5
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.
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.browserAuthProvider = void 0;
|
|
4
|
-
const lodash_1 = require("lodash");
|
|
5
4
|
const __1 = require("../..");
|
|
6
5
|
const config_1 = require("../../config");
|
|
7
|
-
const errors_1 = require("../../errors");
|
|
8
6
|
const guards_1 = require("../../guards");
|
|
9
7
|
const helpers_1 = require("../../routing/helpers");
|
|
10
8
|
const embeddedAuthProvider_1 = require("./utils/embeddedAuthProvider");
|
|
@@ -99,20 +97,7 @@ const browserAuthProvider = ({ window, configSpace }) => (configProvider) => {
|
|
|
99
97
|
return getParentWindowUser();
|
|
100
98
|
}
|
|
101
99
|
// getFetchUser() will throw here if authQuery is not set
|
|
102
|
-
|
|
103
|
-
return getFetchUser();
|
|
104
|
-
}
|
|
105
|
-
const userDataFromParentWindow = await getParentWindowUser();
|
|
106
|
-
if (!authQuery) {
|
|
107
|
-
return userDataFromParentWindow;
|
|
108
|
-
}
|
|
109
|
-
const userDataFromAuthQuery = await getFetchUser();
|
|
110
|
-
// userDataFromParentWindow has an extra field (role)
|
|
111
|
-
if (userDataFromAuthQuery.token === userDataFromParentWindow.token &&
|
|
112
|
-
(0, lodash_1.isEqual)(userDataFromAuthQuery.user, userDataFromParentWindow.user)) {
|
|
113
|
-
return userDataFromParentWindow;
|
|
114
|
-
}
|
|
115
|
-
throw new errors_1.UnauthorizedError();
|
|
100
|
+
return await (embeddedQuery === embeddedQueryValue ? getParentWindowUser() : getFetchUser());
|
|
116
101
|
});
|
|
117
102
|
const getUser = async () => {
|
|
118
103
|
return (await getUserData()).user;
|