@amedia/user 0.1.0 → 0.1.1
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/index.d.ts +206 -20
- package/dist/index.js +493 -40
- package/package.json +1 -1
- package/src/services/mercury.spec.ts +4 -1
- package/src/services/mercury.ts +2 -5
- package/src/services/pluto.spec.ts +38 -0
- package/src/services/pluto.ts +11 -0
- package/tsconfig.json +4 -4
- package/dist/lib/authentication.d.ts +0 -20
- package/dist/lib/authentication.js +0 -78
- package/dist/lib/authorization.d.ts +0 -15
- package/dist/lib/authorization.js +0 -55
- package/dist/lib/cache/db.d.ts +0 -6
- package/dist/lib/cache/db.js +0 -13
- package/dist/lib/cache/global.d.ts +0 -9
- package/dist/lib/cache/global.js +0 -16
- package/dist/lib/cache/types.d.ts +0 -5
- package/dist/lib/cache/types.js +0 -2
- package/dist/lib/dataOrganizer.d.ts +0 -9
- package/dist/lib/dataOrganizer.js +0 -14
- package/dist/lib/eventHandler.d.ts +0 -3
- package/dist/lib/eventHandler.js +0 -11
- package/dist/lib/queue.d.ts +0 -5
- package/dist/lib/queue.js +0 -17
- package/dist/lib/tools.d.ts +0 -1
- package/dist/lib/tools.js +0 -2
- package/dist/lib/types.d.ts +0 -7
- package/dist/lib/types.js +0 -2
- package/dist/lib/user.d.ts +0 -2
- package/dist/lib/user.js +0 -5
- package/dist/lib/userAttributes.d.ts +0 -12
- package/dist/lib/userAttributes.js +0 -18
- package/dist/services/cache.d.ts +0 -9
- package/dist/services/cache.js +0 -34
- package/dist/services/jupiter.d.ts +0 -29
- package/dist/services/jupiter.js +0 -74
- package/dist/services/mercury.d.ts +0 -15
- package/dist/services/mercury.js +0 -32
- package/dist/services/pluto.d.ts +0 -12
- package/dist/services/pluto.js +0 -40
package/dist/index.js
CHANGED
|
@@ -1,44 +1,497 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
11
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
12
|
+
};
|
|
13
|
+
define("lib/cache/global", ["require", "exports"], function (require, exports) {
|
|
14
|
+
"use strict";
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.remove = exports.set = exports.get = void 0;
|
|
17
|
+
// eslint-disable-next-line no-multi-assign
|
|
18
|
+
const cache = ((window || global)['amedia-user-cache'] = {});
|
|
19
|
+
const get = (key) => {
|
|
20
|
+
const data = cache[key];
|
|
21
|
+
return Promise.resolve(data);
|
|
22
|
+
};
|
|
23
|
+
exports.get = get;
|
|
24
|
+
const set = (key, data, expires) => {
|
|
25
|
+
cache[key] = { key, data, expires };
|
|
26
|
+
return Promise.resolve();
|
|
27
|
+
};
|
|
28
|
+
exports.set = set;
|
|
29
|
+
const remove = (key) => {
|
|
30
|
+
delete cache[key];
|
|
31
|
+
return Promise.resolve();
|
|
32
|
+
};
|
|
33
|
+
exports.remove = remove;
|
|
34
|
+
exports.default = { get: exports.get, set: exports.set, remove: exports.remove };
|
|
35
|
+
});
|
|
36
|
+
define("lib/cache/types", ["require", "exports"], function (require, exports) {
|
|
37
|
+
"use strict";
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
});
|
|
40
|
+
define("services/cache", ["require", "exports", "lib/cache/global"], function (require, exports, global_1) {
|
|
41
|
+
"use strict";
|
|
42
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
|
+
exports.setCacheEngine = void 0;
|
|
44
|
+
global_1 = __importDefault(global_1);
|
|
45
|
+
let cacheEngine;
|
|
46
|
+
const setCacheEngine = (engine) => {
|
|
47
|
+
cacheEngine = engine;
|
|
48
|
+
};
|
|
49
|
+
exports.setCacheEngine = setCacheEngine;
|
|
50
|
+
const getCacheEngine = () => cacheEngine || global_1.default;
|
|
51
|
+
const get = (key, validator) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
+
const data = yield getCacheEngine().get(key);
|
|
53
|
+
if (!data) {
|
|
54
|
+
return Promise.resolve();
|
|
55
|
+
}
|
|
56
|
+
try {
|
|
57
|
+
const typedData = validator.check(data);
|
|
58
|
+
return typedData;
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
console.error('Failed validating data', { data, error });
|
|
62
|
+
getCacheEngine().remove(key);
|
|
63
|
+
return Promise.resolve();
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
const set = (key, value, expires) => getCacheEngine().set(key, value, expires);
|
|
67
|
+
const remove = (key) => getCacheEngine().remove(key);
|
|
68
|
+
exports.default = { get, set, remove };
|
|
69
|
+
});
|
|
70
|
+
define("services/pluto", ["require", "exports", "runtypes"], function (require, exports, runtypes_1) {
|
|
71
|
+
"use strict";
|
|
72
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
73
|
+
exports.removeSession = exports.getCurrentSession = exports.SessionSchema = void 0;
|
|
74
|
+
exports.SessionSchema = runtypes_1.Record({
|
|
75
|
+
created_at: runtypes_1.String,
|
|
76
|
+
updated_at: runtypes_1.String,
|
|
77
|
+
user_uuid: runtypes_1.String,
|
|
78
|
+
user_name: runtypes_1.String,
|
|
79
|
+
tracking_key: runtypes_1.String,
|
|
80
|
+
user_agent: runtypes_1.Optional(runtypes_1.String),
|
|
81
|
+
// @deprecated Use tracking_key
|
|
82
|
+
user_key: runtypes_1.Optional(runtypes_1.String),
|
|
83
|
+
});
|
|
84
|
+
const getCurrentSession = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
85
|
+
return fetch(`/api/pluto/v1/sessions/current`)
|
|
86
|
+
.then((response) => {
|
|
87
|
+
if (!response.ok) {
|
|
88
|
+
// TODO Handle this.
|
|
89
|
+
throw new Error(`Request not ok (${response.status}: ${response.statusText}).`);
|
|
90
|
+
}
|
|
91
|
+
return response.json();
|
|
92
|
+
})
|
|
93
|
+
.then((json) => {
|
|
94
|
+
try {
|
|
95
|
+
return exports.SessionSchema.check(json);
|
|
96
|
+
}
|
|
97
|
+
catch (error) {
|
|
98
|
+
console.error('Invalid schema', error);
|
|
99
|
+
throw error;
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
exports.getCurrentSession = getCurrentSession;
|
|
104
|
+
const removeSession = (domain) => __awaiter(void 0, void 0, void 0, function* () {
|
|
105
|
+
return fetch(`/api/pluto/v1/sessions/current?publication_domain=${domain}`, {
|
|
106
|
+
method: 'DELETE',
|
|
107
|
+
}).then((res) => {
|
|
108
|
+
if (!res.ok) {
|
|
109
|
+
throw new Error(`Error, could not perform deleteRequest. Status: ${res.status} Text: ${res.statusText}`);
|
|
26
110
|
}
|
|
27
111
|
});
|
|
28
|
-
// TODO: Perhaps cache the previous response and check against that to avoid
|
|
29
|
-
// TODO: unnecessary calls to onUserUpdated. The README already pretends that we do this ;)
|
|
30
|
-
onUserUpdated(responseAttributes);
|
|
31
112
|
});
|
|
32
|
-
|
|
33
|
-
|
|
113
|
+
exports.removeSession = removeSession;
|
|
114
|
+
});
|
|
115
|
+
define("lib/eventHandler", ["require", "exports"], function (require, exports) {
|
|
116
|
+
"use strict";
|
|
117
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
118
|
+
exports.dispatch = exports.listen = exports.setRootElement = void 0;
|
|
119
|
+
let rootElement = window || global;
|
|
120
|
+
const setRootElement = (element) => {
|
|
121
|
+
rootElement = element;
|
|
122
|
+
};
|
|
123
|
+
exports.setRootElement = setRootElement;
|
|
124
|
+
const listen = (type, listener) => {
|
|
125
|
+
rootElement.addEventListener(type, listener);
|
|
126
|
+
};
|
|
127
|
+
exports.listen = listen;
|
|
128
|
+
const dispatch = (event) => {
|
|
129
|
+
rootElement.dispatchEvent(event);
|
|
130
|
+
};
|
|
131
|
+
exports.dispatch = dispatch;
|
|
132
|
+
});
|
|
133
|
+
define("lib/authentication", ["require", "exports", "services/cache", "services/pluto", "lib/eventHandler"], function (require, exports, cache_1, pluto_1, eventHandler_1) {
|
|
134
|
+
"use strict";
|
|
135
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
136
|
+
exports.listenForAuthenticationRequests = exports.AuthenticationEvents = void 0;
|
|
137
|
+
cache_1 = __importDefault(cache_1);
|
|
138
|
+
const EXPIRES_OFFSET = 10000; // 10 seconds
|
|
139
|
+
var AuthenticationEvents;
|
|
140
|
+
(function (AuthenticationEvents) {
|
|
141
|
+
AuthenticationEvents["REQUEST_LOGIN"] = "amedia_user.authentication.request_login";
|
|
142
|
+
AuthenticationEvents["REQUEST_LOGOUT"] = "amedia_user.authentication.request_logout";
|
|
143
|
+
AuthenticationEvents["REQUEST_AUTH_STATE"] = "amedia_user.authentication.request_auth_state";
|
|
144
|
+
AuthenticationEvents["ON_AUTH_STATE_UPDATED"] = "amedia_user.authentication.on_auth_state_updated";
|
|
145
|
+
})(AuthenticationEvents = exports.AuthenticationEvents || (exports.AuthenticationEvents = {}));
|
|
146
|
+
const login = (requestedUrl) => {
|
|
147
|
+
// TODO Need to get environment smarts from incentive embed
|
|
148
|
+
const url = new URL('https://aid.no/logg_inn/');
|
|
149
|
+
url.searchParams.set('requestedUrl', requestedUrl || window.location.href);
|
|
150
|
+
window.location.href = url.href;
|
|
151
|
+
};
|
|
152
|
+
const logout = () => {
|
|
153
|
+
// TODO Perform logout
|
|
154
|
+
};
|
|
155
|
+
let isFetchingSession = false;
|
|
156
|
+
const IS_LOGGED_IN_CACHE_KEY = 'is_logged_in';
|
|
157
|
+
const getSession = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
158
|
+
if (isFetchingSession) {
|
|
159
|
+
return null;
|
|
160
|
+
}
|
|
161
|
+
isFetchingSession = true;
|
|
162
|
+
// Try the cache first
|
|
163
|
+
const cacheResponse = yield cache_1.default.get(IS_LOGGED_IN_CACHE_KEY, pluto_1.SessionSchema);
|
|
164
|
+
if (cacheResponse) {
|
|
165
|
+
isFetchingSession = false;
|
|
166
|
+
return cacheResponse;
|
|
167
|
+
}
|
|
168
|
+
// Actually perform a request against backend for the session
|
|
169
|
+
const session = yield pluto_1.getCurrentSession();
|
|
170
|
+
cache_1.default.set(IS_LOGGED_IN_CACHE_KEY, session, Date.now() + EXPIRES_OFFSET);
|
|
171
|
+
isFetchingSession = false;
|
|
172
|
+
return session;
|
|
173
|
+
});
|
|
174
|
+
const listenForAuthenticationRequests = () => {
|
|
175
|
+
eventHandler_1.listen(AuthenticationEvents.REQUEST_LOGIN, (evt) => {
|
|
176
|
+
if (!window) {
|
|
177
|
+
throw new Error('Cannot perform login in node-context yet!');
|
|
178
|
+
}
|
|
179
|
+
login(evt.detail.requestedUrl || window.location.href);
|
|
180
|
+
});
|
|
181
|
+
eventHandler_1.listen(AuthenticationEvents.REQUEST_LOGOUT, () => {
|
|
182
|
+
if (!window) {
|
|
183
|
+
throw new Error('Cannot perform login in node-context yet!');
|
|
184
|
+
}
|
|
185
|
+
logout();
|
|
186
|
+
});
|
|
187
|
+
eventHandler_1.listen(AuthenticationEvents.REQUEST_AUTH_STATE, (evt) => {
|
|
188
|
+
// Since this lib might me loaded multiple times, we need to prevent all other processing of this event.
|
|
189
|
+
evt.stopImmediatePropagation();
|
|
190
|
+
getSession().then((session) => {
|
|
191
|
+
// Supports not getting a response. We're probably working on it already and will emit
|
|
192
|
+
// events on window / global when complete.
|
|
193
|
+
if (session === null) {
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
eventHandler_1.dispatch(new CustomEvent(AuthenticationEvents.ON_AUTH_STATE_UPDATED, {
|
|
197
|
+
detail: session,
|
|
198
|
+
}));
|
|
199
|
+
});
|
|
200
|
+
});
|
|
201
|
+
};
|
|
202
|
+
exports.listenForAuthenticationRequests = listenForAuthenticationRequests;
|
|
203
|
+
exports.listenForAuthenticationRequests();
|
|
204
|
+
});
|
|
205
|
+
define("lib/types", ["require", "exports"], function (require, exports) {
|
|
206
|
+
"use strict";
|
|
207
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
208
|
+
});
|
|
209
|
+
define("lib/dataOrganizer", ["require", "exports"], function (require, exports) {
|
|
210
|
+
"use strict";
|
|
211
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
212
|
+
exports.fetchDataBasedOnAttributes = void 0;
|
|
213
|
+
/**
|
|
214
|
+
* Jeg tror ikke vi burde gjøre det slik som dette.
|
|
215
|
+
* Denne funksjonen var hentet ut fra userAttribute kun for å
|
|
216
|
+
* kunne mocke implementasjonen så jeg kunne teste event-callback mekanismen.
|
|
217
|
+
*
|
|
218
|
+
* En implementasjon som dette vil gjøre det vanskelig svare etterhvert som vi får data.
|
|
219
|
+
*/
|
|
220
|
+
const fetchDataBasedOnAttributes = (attributes) =>
|
|
221
|
+
// TODO: Implement fetching based on attributes
|
|
222
|
+
({
|
|
223
|
+
isLoggedIn: true,
|
|
224
|
+
name: 'Donald Duck',
|
|
225
|
+
});
|
|
226
|
+
exports.fetchDataBasedOnAttributes = fetchDataBasedOnAttributes;
|
|
227
|
+
});
|
|
228
|
+
define("lib/userAttributes", ["require", "exports", "lib/dataOrganizer", "lib/eventHandler"], function (require, exports, dataOrganizer_1, eventHandler_2) {
|
|
229
|
+
"use strict";
|
|
230
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
231
|
+
exports.listenForUserAttributeRequests = exports.AmediaUserEvents = void 0;
|
|
232
|
+
var AmediaUserEvents;
|
|
233
|
+
(function (AmediaUserEvents) {
|
|
234
|
+
AmediaUserEvents["REQUEST_USER_ATTRIBUTES"] = "amedia-user.request-user-attributes";
|
|
235
|
+
AmediaUserEvents["ON_USER_ATTRIBUTES_UPDATED"] = "amedia-user.on-user-attributes-updated";
|
|
236
|
+
})(AmediaUserEvents = exports.AmediaUserEvents || (exports.AmediaUserEvents = {}));
|
|
237
|
+
const listenForUserAttributeRequests = () => {
|
|
238
|
+
eventHandler_2.listen(AmediaUserEvents.REQUEST_USER_ATTRIBUTES, (evt) => {
|
|
239
|
+
// Prevent other instances of this package from further processing
|
|
240
|
+
evt.stopImmediatePropagation();
|
|
241
|
+
eventHandler_2.dispatch(new CustomEvent(AmediaUserEvents.ON_USER_ATTRIBUTES_UPDATED, {
|
|
242
|
+
detail: dataOrganizer_1.fetchDataBasedOnAttributes(evt.detail),
|
|
243
|
+
}));
|
|
244
|
+
});
|
|
245
|
+
};
|
|
246
|
+
exports.listenForUserAttributeRequests = listenForUserAttributeRequests;
|
|
247
|
+
exports.listenForUserAttributeRequests();
|
|
248
|
+
});
|
|
249
|
+
define("index", ["require", "exports", "lib/authentication", "lib/userAttributes", "lib/eventHandler"], function (require, exports, authentication_1, userAttributes_1, eventHandler_3) {
|
|
250
|
+
"use strict";
|
|
251
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
252
|
+
exports.requestLogin = exports.subscribeToUserUpdates = void 0;
|
|
253
|
+
/**
|
|
254
|
+
* Enables you to subscribe to the user attributes you care about and
|
|
255
|
+
* get notified when something changes
|
|
256
|
+
*
|
|
257
|
+
* If you're wondering about the typing mechanism, here's a good article:
|
|
258
|
+
* https://dev.to/shakyshane/2-ways-to-create-a-union-from-an-array-in-typescript-1kd6
|
|
259
|
+
*
|
|
260
|
+
* @todo We should discuss whether we should support to stop subscribing
|
|
261
|
+
* @todo or resubscribe with different attributes.
|
|
262
|
+
* @param attributes
|
|
263
|
+
* @param onUserUpdated
|
|
264
|
+
*/
|
|
265
|
+
const subscribeToUserUpdates = (attributes, onUserUpdated) => {
|
|
266
|
+
eventHandler_3.listen(userAttributes_1.AmediaUserEvents.ON_USER_ATTRIBUTES_UPDATED, (evt) => {
|
|
267
|
+
const userAttributes = evt.detail;
|
|
268
|
+
// @ts-ignore
|
|
269
|
+
const responseAttributes = {
|
|
270
|
+
isLoggedIn: userAttributes.isLoggedIn,
|
|
271
|
+
};
|
|
272
|
+
attributes.forEach((attribute) => {
|
|
273
|
+
if (userAttributes[attribute] !== undefined) {
|
|
274
|
+
responseAttributes[attribute] = userAttributes[attribute];
|
|
275
|
+
}
|
|
276
|
+
});
|
|
277
|
+
// TODO: Perhaps cache the previous response and check against that to avoid
|
|
278
|
+
// TODO: unnecessary calls to onUserUpdated. The README already pretends that we do this ;)
|
|
279
|
+
onUserUpdated(responseAttributes);
|
|
280
|
+
});
|
|
281
|
+
eventHandler_3.dispatch(new CustomEvent(userAttributes_1.AmediaUserEvents.REQUEST_USER_ATTRIBUTES, {
|
|
282
|
+
detail: attributes,
|
|
283
|
+
}));
|
|
284
|
+
};
|
|
285
|
+
exports.subscribeToUserUpdates = subscribeToUserUpdates;
|
|
286
|
+
/**
|
|
287
|
+
* This will, if necessary, trigger a redirect to www.aid.no and return
|
|
288
|
+
* to the requestedUrl if supplied or the current url before redirecting away if not.
|
|
289
|
+
* @param requestedUrl
|
|
290
|
+
*/
|
|
291
|
+
const requestLogin = (requestedUrl) => eventHandler_3.dispatch(new CustomEvent(authentication_1.AuthenticationEvents.REQUEST_LOGIN, {
|
|
292
|
+
detail: { requestedUrl },
|
|
34
293
|
}));
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
294
|
+
exports.requestLogin = requestLogin;
|
|
295
|
+
});
|
|
296
|
+
define("services/jupiter", ["require", "exports", "runtypes"], function (require, exports, runtypes_2) {
|
|
297
|
+
"use strict";
|
|
298
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
299
|
+
exports.getNonUserAccess = exports.getVstoken = exports.checkForAccess = exports.CheckAccessForPaperSchema = void 0;
|
|
300
|
+
const PublicationSchema = runtypes_2.Record({
|
|
301
|
+
id: runtypes_2.Number,
|
|
302
|
+
domain: runtypes_2.String,
|
|
303
|
+
});
|
|
304
|
+
exports.CheckAccessForPaperSchema = runtypes_2.Record({
|
|
305
|
+
status: runtypes_2.Literal('success'),
|
|
306
|
+
access: runtypes_2.Union(runtypes_2.Literal('granted'), runtypes_2.Literal('denied')),
|
|
307
|
+
publication: PublicationSchema,
|
|
308
|
+
access_features: runtypes_2.Array(runtypes_2.String),
|
|
309
|
+
});
|
|
310
|
+
const GetVstokenSchema = runtypes_2.Record({
|
|
311
|
+
status: runtypes_2.Literal('success'),
|
|
312
|
+
cookie: runtypes_2.String,
|
|
313
|
+
access_features: runtypes_2.Array(runtypes_2.String),
|
|
314
|
+
});
|
|
315
|
+
const GetNonUserAccessSchema = runtypes_2.Record({
|
|
316
|
+
status: runtypes_2.Literal('success'),
|
|
317
|
+
vstoken_cookie: runtypes_2.String,
|
|
318
|
+
uuid: runtypes_2.String,
|
|
319
|
+
access_features: runtypes_2.Array(runtypes_2.String),
|
|
320
|
+
});
|
|
321
|
+
const checkForAccess = (publicationDomain, accessFeatures) => fetch(`/api/jupiter/v1/check_access_for_paper/${publicationDomain}/?require=any&access_features=${accessFeatures.join(',')}`)
|
|
322
|
+
.then((response) => {
|
|
323
|
+
if (!response.ok) {
|
|
324
|
+
// TODO Handle this.
|
|
325
|
+
throw new Error(`Request not ok (${response.status}: ${response.statusText}).`);
|
|
326
|
+
}
|
|
327
|
+
return response.json();
|
|
328
|
+
})
|
|
329
|
+
.then((json) => {
|
|
330
|
+
try {
|
|
331
|
+
return exports.CheckAccessForPaperSchema.check(json);
|
|
332
|
+
}
|
|
333
|
+
catch (error) {
|
|
334
|
+
console.error('Invalid schema', error);
|
|
335
|
+
throw error;
|
|
336
|
+
}
|
|
337
|
+
});
|
|
338
|
+
exports.checkForAccess = checkForAccess;
|
|
339
|
+
const getVstoken = (publicationDomain) => fetch(`/api/jupiter/v1/get_vstoken/${publicationDomain}`, { method: 'post' })
|
|
340
|
+
.then((response) => {
|
|
341
|
+
if (!response.ok) {
|
|
342
|
+
throw new Error(`Request not ok (${response.status}: ${response.statusText}).`);
|
|
343
|
+
}
|
|
344
|
+
return response.json();
|
|
345
|
+
})
|
|
346
|
+
.then((json) => {
|
|
347
|
+
try {
|
|
348
|
+
return GetVstokenSchema.check(json);
|
|
349
|
+
}
|
|
350
|
+
catch (error) {
|
|
351
|
+
console.error('Invalid schema', error);
|
|
352
|
+
throw error;
|
|
353
|
+
}
|
|
354
|
+
});
|
|
355
|
+
exports.getVstoken = getVstoken;
|
|
356
|
+
const getNonUserAccess = (publicationDomain) => fetch(`/api/jupiter/v1/non_user_access/${publicationDomain}`, {
|
|
357
|
+
method: 'post',
|
|
358
|
+
})
|
|
359
|
+
.then((response) => {
|
|
360
|
+
if (!response.ok) {
|
|
361
|
+
throw new Error(`Request not ok (${response.status}: ${response.statusText}).`);
|
|
362
|
+
}
|
|
363
|
+
return response.json();
|
|
364
|
+
})
|
|
365
|
+
.then((json) => {
|
|
366
|
+
try {
|
|
367
|
+
return GetNonUserAccessSchema.check(json);
|
|
368
|
+
}
|
|
369
|
+
catch (error) {
|
|
370
|
+
console.error('Invalid schema', error);
|
|
371
|
+
throw error;
|
|
372
|
+
}
|
|
373
|
+
});
|
|
374
|
+
exports.getNonUserAccess = getNonUserAccess;
|
|
375
|
+
});
|
|
376
|
+
define("lib/authorization", ["require", "exports", "services/jupiter", "services/cache", "lib/eventHandler"], function (require, exports, jupiter_1, cache_2, eventHandler_4) {
|
|
377
|
+
"use strict";
|
|
378
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
379
|
+
exports.listenForAuthorizationRequests = exports.AuthorizationEvents = void 0;
|
|
380
|
+
cache_2 = __importDefault(cache_2);
|
|
381
|
+
const EXPIRES_OFFSET = 10000; // 10 seconds
|
|
382
|
+
const CHECK_FOR_ACCESS_CACHE_KEY = 'check_for_access_to_publication';
|
|
383
|
+
let isCheckingForAccess = false;
|
|
384
|
+
var AuthorizationEvents;
|
|
385
|
+
(function (AuthorizationEvents) {
|
|
386
|
+
AuthorizationEvents["REQUEST_PUBLICATION_ACCESS_STATE_CHECK"] = "amedia_user.authorization.request_publication_access_state_check";
|
|
387
|
+
AuthorizationEvents["ON_PUBLICATION_ACCESS_STATE_UPDATED"] = "amedia_user.authorization.on_publication_access_state_updated";
|
|
388
|
+
})(AuthorizationEvents = exports.AuthorizationEvents || (exports.AuthorizationEvents = {}));
|
|
389
|
+
const checkForAccessToPublication = (publicationDomain, accessFeatures) => __awaiter(void 0, void 0, void 0, function* () {
|
|
390
|
+
if (isCheckingForAccess) {
|
|
391
|
+
return null;
|
|
392
|
+
}
|
|
393
|
+
isCheckingForAccess = true;
|
|
394
|
+
// Try the cache first
|
|
395
|
+
const cacheResponse = yield cache_2.default.get(CHECK_FOR_ACCESS_CACHE_KEY, jupiter_1.CheckAccessForPaperSchema);
|
|
396
|
+
if (cacheResponse) {
|
|
397
|
+
isCheckingForAccess = false;
|
|
398
|
+
return cacheResponse;
|
|
399
|
+
}
|
|
400
|
+
// Actually perform a request against backend for the accessState
|
|
401
|
+
const accessState = yield jupiter_1.checkForAccess(publicationDomain, accessFeatures);
|
|
402
|
+
cache_2.default.set(CHECK_FOR_ACCESS_CACHE_KEY, accessState, Date.now() + EXPIRES_OFFSET);
|
|
403
|
+
isCheckingForAccess = false;
|
|
404
|
+
return accessState;
|
|
405
|
+
});
|
|
406
|
+
const listenForAuthorizationRequests = () => {
|
|
407
|
+
eventHandler_4.listen(AuthorizationEvents.REQUEST_PUBLICATION_ACCESS_STATE_CHECK, (evt) => {
|
|
408
|
+
// Since this lib might me loaded multiple times, we need to prevent all other processing of this event.
|
|
409
|
+
evt.stopImmediatePropagation();
|
|
410
|
+
checkForAccessToPublication(evt.detail.publicationDomain, evt.detail.accessFeatures).then((accessState) => {
|
|
411
|
+
// Supports not getting a response. We're probably working on it already and will emit
|
|
412
|
+
// events on window / global when complete.
|
|
413
|
+
if (!accessState) {
|
|
414
|
+
return;
|
|
415
|
+
}
|
|
416
|
+
eventHandler_4.dispatch(new CustomEvent(AuthorizationEvents.ON_PUBLICATION_ACCESS_STATE_UPDATED, {
|
|
417
|
+
detail: accessState,
|
|
418
|
+
}));
|
|
419
|
+
});
|
|
420
|
+
});
|
|
421
|
+
};
|
|
422
|
+
exports.listenForAuthorizationRequests = listenForAuthorizationRequests;
|
|
423
|
+
exports.listenForAuthorizationRequests();
|
|
424
|
+
});
|
|
425
|
+
define("lib/queue", ["require", "exports"], function (require, exports) {
|
|
426
|
+
"use strict";
|
|
427
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
428
|
+
const queue = {};
|
|
429
|
+
const add = (key, data) => {
|
|
430
|
+
if (!queue[key]) {
|
|
431
|
+
queue[key] = [];
|
|
432
|
+
}
|
|
433
|
+
queue[key].push(data);
|
|
434
|
+
};
|
|
435
|
+
const getAll = (key) => {
|
|
436
|
+
const keyQueue = queue[key];
|
|
437
|
+
if (!keyQueue) {
|
|
438
|
+
return [];
|
|
439
|
+
}
|
|
440
|
+
delete queue[key];
|
|
441
|
+
return keyQueue;
|
|
442
|
+
};
|
|
443
|
+
exports.default = { add, getAll };
|
|
444
|
+
});
|
|
445
|
+
define("lib/cache/db", ["require", "exports", "dexie"], function (require, exports, dexie_1) {
|
|
446
|
+
"use strict";
|
|
447
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
448
|
+
exports.remove = exports.set = exports.get = void 0;
|
|
449
|
+
dexie_1 = __importDefault(dexie_1);
|
|
450
|
+
const db = new dexie_1.default('amedia-user-cache');
|
|
451
|
+
db.version(1).stores({
|
|
452
|
+
cache: 'key,data,expires',
|
|
453
|
+
});
|
|
454
|
+
const cache = db.table('cache');
|
|
455
|
+
const get = (key) => cache.get(key);
|
|
456
|
+
exports.get = get;
|
|
457
|
+
const set = (key, data, expires) => cache.add({ key, data, expires }).then(() => {
|
|
458
|
+
// Void return as per contract. Should do some error logging first I guess
|
|
459
|
+
});
|
|
460
|
+
exports.set = set;
|
|
461
|
+
const remove = (key) => cache.delete(key);
|
|
462
|
+
exports.remove = remove;
|
|
463
|
+
exports.default = { get: exports.get, set: exports.set, remove: exports.remove };
|
|
464
|
+
});
|
|
465
|
+
define("services/mercury", ["require", "exports"], function (require, exports) {
|
|
466
|
+
"use strict";
|
|
467
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
468
|
+
function postLog(url, query) {
|
|
469
|
+
const body = new FormData();
|
|
470
|
+
Object.keys(query).forEach((key) => body.append(key, query[key]));
|
|
471
|
+
const options = {
|
|
472
|
+
method: 'POST',
|
|
473
|
+
body,
|
|
474
|
+
headers: {
|
|
475
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
476
|
+
Accept: 'application/json',
|
|
477
|
+
},
|
|
478
|
+
};
|
|
479
|
+
fetch(url, options).then((res) => {
|
|
480
|
+
if (!res.ok) {
|
|
481
|
+
throw new Error(`Error, status: ${res.status}, text: ${res.statusText}`);
|
|
482
|
+
}
|
|
483
|
+
});
|
|
484
|
+
}
|
|
485
|
+
const backendLog = (level, message, context) => {
|
|
486
|
+
const extendedContext = Object.assign(Object.assign({}, context), { message, url: window.location.href, domain: window.location.host });
|
|
487
|
+
postLog(`//www.aid.no/api/mercury/v1/log/${level}`, extendedContext);
|
|
488
|
+
};
|
|
489
|
+
const log = {
|
|
490
|
+
error: (message, context) => backendLog('error', message, context),
|
|
491
|
+
warn: (message, context) => backendLog('warn', message, context),
|
|
492
|
+
info: (message, context) => backendLog('info', message, context),
|
|
493
|
+
debug: (message, context) => backendLog('debug', message, context),
|
|
494
|
+
};
|
|
495
|
+
exports.default = log;
|
|
496
|
+
});
|
|
497
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/lib/cache/global.ts","../src/lib/cache/types.ts","../src/services/cache.ts","../src/services/pluto.ts","../src/lib/eventHandler.ts","../src/lib/authentication.ts","../src/lib/types.ts","../src/lib/dataOrganizer.ts","../src/lib/userAttributes.ts","../src/index.ts","../src/services/jupiter.ts","../src/lib/authorization.ts","../src/lib/queue.ts","../src/lib/cache/db.ts","../src/services/mercury.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -14,7 +14,10 @@ beforeEach(() => {
|
|
|
14
14
|
describe('Mercury backendlog', () => {
|
|
15
15
|
it('should include level in url', () => {
|
|
16
16
|
backendLog.error('jest message', {});
|
|
17
|
-
expect(fetch
|
|
17
|
+
expect(fetch).toHaveBeenCalledWith(
|
|
18
|
+
expect.stringContaining('/error'),
|
|
19
|
+
expect.anything()
|
|
20
|
+
);
|
|
18
21
|
expect(fetch).toHaveBeenCalledTimes(1);
|
|
19
22
|
});
|
|
20
23
|
|
package/src/services/mercury.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
function
|
|
1
|
+
function postLog(url: string, query: { [index: string]: any }) {
|
|
2
2
|
const body = new FormData();
|
|
3
3
|
Object.keys(query).forEach((key) => body.append(key, query[key]));
|
|
4
4
|
const options: RequestInit = {
|
|
5
|
-
credentials: 'include',
|
|
6
5
|
method: 'POST',
|
|
7
|
-
mode: 'cors',
|
|
8
6
|
body,
|
|
9
7
|
headers: {
|
|
10
8
|
'Content-Type': 'application/x-www-form-urlencoded',
|
|
@@ -15,7 +13,6 @@ function postRequest(url: string, query: { [index: string]: any }) {
|
|
|
15
13
|
if (!res.ok) {
|
|
16
14
|
throw new Error(`Error, status: ${res.status}, text: ${res.statusText}`);
|
|
17
15
|
}
|
|
18
|
-
return res.json();
|
|
19
16
|
});
|
|
20
17
|
}
|
|
21
18
|
|
|
@@ -30,7 +27,7 @@ const backendLog = (
|
|
|
30
27
|
url: window.location.href,
|
|
31
28
|
domain: window.location.host,
|
|
32
29
|
};
|
|
33
|
-
|
|
30
|
+
postLog(`//www.aid.no/api/mercury/v1/log/${level}`, extendedContext);
|
|
34
31
|
};
|
|
35
32
|
|
|
36
33
|
const log = {
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import fetch from 'jest-fetch-mock';
|
|
2
|
+
import { getCurrentSession, removeSession } from './pluto';
|
|
3
|
+
|
|
4
|
+
fetch.enableMocks();
|
|
5
|
+
|
|
6
|
+
beforeEach(() => {
|
|
7
|
+
fetch.resetMocks();
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
describe('Pluto service', () => {
|
|
11
|
+
it('getCurrentSession() should return session data', () => {
|
|
12
|
+
const data = {
|
|
13
|
+
created_at:
|
|
14
|
+
'Wed Apr 28 2021 16:02:04 GMT+0200 (Central European Summer Time)',
|
|
15
|
+
updated_at:
|
|
16
|
+
'Wed Apr 28 2021 16:02:04 GMT+0200 (Central European Summer Time)',
|
|
17
|
+
user_uuid: 'some uuid',
|
|
18
|
+
user_name: 'Earl Hickey',
|
|
19
|
+
tracking_key: 'some tracking key',
|
|
20
|
+
};
|
|
21
|
+
fetch.mockResponseOnce(JSON.stringify(data));
|
|
22
|
+
|
|
23
|
+
getCurrentSession().then((res) => {
|
|
24
|
+
expect(res).toEqual(data);
|
|
25
|
+
});
|
|
26
|
+
expect(fetch).toHaveBeenCalledTimes(1);
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
it('removeSession() should remove session', () => {
|
|
30
|
+
removeSession('www.rb.no');
|
|
31
|
+
expect(
|
|
32
|
+
fetch
|
|
33
|
+
).toHaveBeenCalledWith(
|
|
34
|
+
'/api/pluto/v1/sessions/current?publication_domain=www.rb.no',
|
|
35
|
+
{ method: 'DELETE' }
|
|
36
|
+
);
|
|
37
|
+
});
|
|
38
|
+
});
|