@amedia/user 0.6.0 → 0.7.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/.codeclimate.yml +7 -0
- package/cloudbuild.json +1 -1
- package/dist/index.d.ts +6 -17
- package/dist/index.js +7 -2
- package/dist/lib/authentication.d.ts +17 -0
- package/dist/lib/authentication.js +74 -0
- package/dist/lib/authorization.d.ts +14 -0
- package/dist/lib/authorization.js +51 -0
- package/dist/{cache/engines/indexeddb.d.ts → lib/cache/db.d.ts} +2 -3
- package/dist/lib/cache/db.js +13 -0
- package/dist/lib/cache/global.d.ts +9 -0
- package/dist/lib/cache/global.js +16 -0
- package/dist/lib/cache/types.d.ts +5 -0
- package/dist/lib/cache/types.js +2 -0
- package/dist/lib/queue.d.ts +5 -0
- package/dist/lib/queue.js +17 -0
- package/dist/lib/tools.d.ts +1 -0
- package/dist/lib/tools.js +2 -0
- package/dist/lib/user.d.ts +2 -0
- package/dist/lib/user.js +3 -0
- package/dist/services/cache.d.ts +9 -0
- package/dist/services/cache.js +34 -0
- package/dist/services/jupiter.d.ts +4 -4
- package/dist/services/jupiter.js +72 -0
- package/dist/services/pluto.d.ts +10 -6
- package/dist/services/pluto.js +40 -0
- package/package.json +2 -1
- package/src/actions/authentication.ts +5 -38
- package/src/actions/userData.ts +15 -19
- package/src/clients/europa.ts +5 -9
- package/src/clients/jupiter.spec.ts +5 -5
- package/src/clients/jupiter.ts +28 -22
- package/src/clients/nebula.spec.ts +11 -11
- package/src/clients/nebula.ts +33 -10
- package/src/clients/pluto.spec.ts +6 -3
- package/src/clients/pluto.ts +26 -16
- package/src/eventHandlers/userAttributes.ts +15 -8
- package/src/{index-userdata.spec.ts → index-subscription.spec.ts} +49 -57
- package/src/store/{store.spec.ts → index.spec.ts} +1 -1
- package/src/store/{store.ts → index.ts} +11 -6
- package/src/types.ts +1 -1
- package/src/utils/getOrUpdate.ts +12 -11
- package/dist/actions/authentication.d.ts +0 -4
- package/dist/actions/authorization.d.ts +0 -3
- package/dist/actions/preferences.d.ts +0 -9
- package/dist/actions/preferences.spec.d.ts +0 -1
- package/dist/actions/userData.d.ts +0 -2
- package/dist/cache/engines/global.d.ts +0 -21
- package/dist/cache/engines/global.spec.d.ts +0 -1
- package/dist/cache/index.d.ts +0 -11
- package/dist/cache/index.spec.d.ts +0 -4
- package/dist/cache/types.d.ts +0 -11
- package/dist/clients/europa.d.ts +0 -12
- package/dist/clients/europa.spec.d.ts +0 -1
- package/dist/clients/jupiter.d.ts +0 -29
- package/dist/clients/jupiter.spec.d.ts +0 -1
- package/dist/clients/mercury.d.ts +0 -18
- package/dist/clients/mercury.spec.d.ts +0 -4
- package/dist/clients/nebula.d.ts +0 -22
- package/dist/clients/nebula.spec.d.ts +0 -1
- package/dist/clients/pluto.d.ts +0 -8
- package/dist/clients/pluto.spec.d.ts +0 -1
- package/dist/eventHandlers/activation.d.ts +0 -15
- package/dist/eventHandlers/authentication.d.ts +0 -17
- package/dist/eventHandlers/userAttributes.d.ts +0 -14
- package/dist/index-authentcation.spec.d.ts +0 -4
- package/dist/index-userdata.spec.d.ts +0 -4
- package/dist/index.js.LICENSE.txt +0 -8
- package/dist/lib/cookie.d.ts +0 -5
- package/dist/lib/rpc.d.ts +0 -6
- package/dist/services/europa.d.ts +0 -12
- package/dist/services/europa.spec.d.ts +0 -1
- package/dist/services/jupiter.spec.d.ts +0 -1
- package/dist/services/mercury.d.ts +0 -18
- package/dist/services/mercury.spec.d.ts +0 -4
- package/dist/services/nebula.d.ts +0 -22
- package/dist/services/nebula.spec.d.ts +0 -1
- package/dist/services/pluto.spec.d.ts +0 -1
- package/dist/store/store.d.ts +0 -13
- package/dist/store/store.spec.d.ts +0 -1
- package/dist/types.d.ts +0 -22
- package/dist/utils/customEventWrapper.d.ts +0 -17
- package/dist/utils/getOrUpdate.d.ts +0 -3
- package/dist/utils/log.d.ts +0 -26
- package/dist/utils/queue.d.ts +0 -12
- package/dist/utils/url.d.ts +0 -3
- package/dist/utils/url.spec.d.ts +0 -1
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
const queue = {};
|
|
2
|
+
const add = (key, data) => {
|
|
3
|
+
if (!queue[key]) {
|
|
4
|
+
queue[key] = [];
|
|
5
|
+
}
|
|
6
|
+
queue[key].push(data);
|
|
7
|
+
};
|
|
8
|
+
const getAll = (key) => {
|
|
9
|
+
const keyQueue = queue[key];
|
|
10
|
+
if (!keyQueue) {
|
|
11
|
+
return [];
|
|
12
|
+
}
|
|
13
|
+
delete queue[key];
|
|
14
|
+
return keyQueue;
|
|
15
|
+
};
|
|
16
|
+
export default { add, getAll };
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3F1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sS0FBSyxHQUFpQyxFQUFFLENBQUM7QUFFL0MsTUFBTSxHQUFHLEdBQUcsQ0FBQyxHQUFXLEVBQUUsSUFBYSxFQUFRLEVBQUU7SUFDL0MsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNmLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7S0FDakI7SUFDRCxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQ3hCLENBQUMsQ0FBQztBQUVGLE1BQU0sTUFBTSxHQUFHLENBQUMsR0FBVyxFQUFFLEVBQUU7SUFDN0IsTUFBTSxRQUFRLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzVCLElBQUksQ0FBQyxRQUFRLEVBQUU7UUFDYixPQUFPLEVBQUUsQ0FBQztLQUNYO0lBQ0QsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbEIsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQyxDQUFDO0FBRUYsZUFBZSxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsQ0FBQyJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const getCurrentUrl: {};
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export const getCurrentUrl = {};
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9vbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3Rvb2xzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxFQUFFLENBQUMifQ==
|
package/dist/lib/user.js
ADDED
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
export const login = () => { };
|
|
2
|
+
export const logout = () => { };
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvdXNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsR0FBRyxFQUFFLEdBQUUsQ0FBQyxDQUFDO0FBRTlCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxHQUFHLEVBQUUsR0FBRSxDQUFDLENBQUMifQ==
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Record, Static } from 'runtypes';
|
|
2
|
+
import { Engine } from '../lib/cache/types';
|
|
3
|
+
export declare const setCacheEngine: (engine: Engine) => void;
|
|
4
|
+
declare const _default: {
|
|
5
|
+
get: <T extends Record<any, any>>(key: string, validator: T) => Promise<void | Static<T>>;
|
|
6
|
+
set: (key: string, value: unknown, expires: number) => Promise<void>;
|
|
7
|
+
remove: (key: string) => Promise<void>;
|
|
8
|
+
};
|
|
9
|
+
export default _default;
|
|
@@ -0,0 +1,34 @@
|
|
|
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
|
+
import globalCache from '../lib/cache/global';
|
|
11
|
+
let cacheEngine;
|
|
12
|
+
export const setCacheEngine = (engine) => {
|
|
13
|
+
cacheEngine = engine;
|
|
14
|
+
};
|
|
15
|
+
const getCacheEngine = () => cacheEngine || globalCache;
|
|
16
|
+
const get = (key, validator) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
+
const data = yield getCacheEngine().get(key);
|
|
18
|
+
if (!data) {
|
|
19
|
+
return Promise.resolve();
|
|
20
|
+
}
|
|
21
|
+
try {
|
|
22
|
+
const typedData = validator.check(data);
|
|
23
|
+
return typedData;
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
console.error('Failed validating data', { data, error });
|
|
27
|
+
getCacheEngine().remove(key);
|
|
28
|
+
return Promise.resolve();
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
const set = (key, value, expires) => getCacheEngine().set(key, value, expires);
|
|
32
|
+
const remove = (key) => getCacheEngine().remove(key);
|
|
33
|
+
export default { get, set, remove };
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQ0EsT0FBTyxXQUFXLE1BQU0scUJBQXFCLENBQUM7QUFHOUMsSUFBSSxXQUFtQixDQUFDO0FBRXhCLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUFDLE1BQWMsRUFBRSxFQUFFO0lBQy9DLFdBQVcsR0FBRyxNQUFNLENBQUM7QUFDdkIsQ0FBQyxDQUFDO0FBRUYsTUFBTSxjQUFjLEdBQUcsR0FBVyxFQUFFLENBQUMsV0FBVyxJQUFJLFdBQVcsQ0FBQztBQUVoRSxNQUFNLEdBQUcsR0FBRyxDQUNWLEdBQVcsRUFDWCxTQUFZLEVBQ2UsRUFBRTtJQUM3QixNQUFNLElBQUksR0FBRyxNQUFNLGNBQWMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM3QyxJQUFJLENBQUMsSUFBSSxFQUFFO1FBQ1QsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7S0FDMUI7SUFDRCxJQUFJO1FBQ0YsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN4QyxPQUFPLFNBQWMsQ0FBQztLQUN2QjtJQUFDLE9BQU8sS0FBSyxFQUFFO1FBQ2QsT0FBTyxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQ3pELGNBQWMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM3QixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztLQUMxQjtBQUNILENBQUMsQ0FBQSxDQUFDO0FBRUYsTUFBTSxHQUFHLEdBQUcsQ0FBQyxHQUFXLEVBQUUsS0FBYyxFQUFFLE9BQWUsRUFBRSxFQUFFLENBQzNELGNBQWMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBRTVDLE1BQU0sTUFBTSxHQUFHLENBQUMsR0FBVyxFQUFpQixFQUFFLENBQUMsY0FBYyxFQUFFLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBRTVFLGVBQWUsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxDQUFDIn0=
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Array, Literal, Record, Static, String,
|
|
1
|
+
import { Array, Literal, Record, Static, String, Union } from 'runtypes';
|
|
2
2
|
export declare type AccessFeatures = string[];
|
|
3
3
|
export declare const CheckAccessForPaperSchema: Record<{
|
|
4
4
|
status: Literal<"success">;
|
|
5
5
|
access: Union<[Literal<"granted">, Literal<"denied">]>;
|
|
6
6
|
publication: Record<{
|
|
7
|
-
id:
|
|
7
|
+
id: String;
|
|
8
8
|
domain: String;
|
|
9
9
|
}, false>;
|
|
10
10
|
access_features: Array<String, false>;
|
|
@@ -15,14 +15,14 @@ declare const GetVstokenSchema: Record<{
|
|
|
15
15
|
cookie: String;
|
|
16
16
|
access_features: Array<String, false>;
|
|
17
17
|
}, false>;
|
|
18
|
-
|
|
18
|
+
declare type GetVstoken = Static<typeof GetVstokenSchema>;
|
|
19
19
|
declare const GetNonUserAccessSchema: Record<{
|
|
20
20
|
status: Literal<"success">;
|
|
21
21
|
vstoken_cookie: String;
|
|
22
22
|
uuid: String;
|
|
23
23
|
access_features: Array<String, false>;
|
|
24
24
|
}, false>;
|
|
25
|
-
|
|
25
|
+
declare type GetNonUserAccess = Static<typeof GetNonUserAccessSchema>;
|
|
26
26
|
export declare const checkForAccess: (publicationDomain: string, accessFeatures: AccessFeatures) => Promise<CheckAccessForPaper>;
|
|
27
27
|
export declare const getVstoken: (publicationDomain: string) => Promise<GetVstoken>;
|
|
28
28
|
export declare const getNonUserAccess: (publicationDomain: string) => Promise<GetNonUserAccess>;
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { Array, Literal, Record, String, Union } from 'runtypes';
|
|
2
|
+
const PublicationSchema = Record({
|
|
3
|
+
id: String,
|
|
4
|
+
domain: String,
|
|
5
|
+
});
|
|
6
|
+
export const CheckAccessForPaperSchema = Record({
|
|
7
|
+
status: Literal('success'),
|
|
8
|
+
access: Union(Literal('granted'), Literal('denied')),
|
|
9
|
+
publication: PublicationSchema,
|
|
10
|
+
access_features: Array(String),
|
|
11
|
+
});
|
|
12
|
+
const GetVstokenSchema = Record({
|
|
13
|
+
status: Literal('success'),
|
|
14
|
+
cookie: String,
|
|
15
|
+
access_features: Array(String),
|
|
16
|
+
});
|
|
17
|
+
const GetNonUserAccessSchema = Record({
|
|
18
|
+
status: Literal('success'),
|
|
19
|
+
vstoken_cookie: String,
|
|
20
|
+
uuid: String,
|
|
21
|
+
access_features: Array(String),
|
|
22
|
+
});
|
|
23
|
+
export const checkForAccess = (publicationDomain, accessFeatures) => fetch(`/api/jupiter/v1/check_access_for_paper/${publicationDomain}/?require=any&access_features=${accessFeatures.join(',')}`)
|
|
24
|
+
.then((response) => {
|
|
25
|
+
if (!response.ok) {
|
|
26
|
+
// TODO Handle this.
|
|
27
|
+
throw new Error(`Request not ok (${response.status}: ${response.statusText}).`);
|
|
28
|
+
}
|
|
29
|
+
return response.json();
|
|
30
|
+
})
|
|
31
|
+
.then((json) => {
|
|
32
|
+
try {
|
|
33
|
+
return CheckAccessForPaperSchema.check(json);
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
console.error('Invalid schema', error);
|
|
37
|
+
throw error;
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
export const getVstoken = (publicationDomain) => fetch(`/api/jupiter/v1/get_vstoken/${publicationDomain}`, { method: "post" })
|
|
41
|
+
.then((response) => {
|
|
42
|
+
if (!response.ok) {
|
|
43
|
+
throw new Error(`Request not ok (${response.status}: ${response.statusText}).`);
|
|
44
|
+
}
|
|
45
|
+
return response.json();
|
|
46
|
+
})
|
|
47
|
+
.then((json) => {
|
|
48
|
+
try {
|
|
49
|
+
return GetVstokenSchema.check(json);
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
console.error("Invalid schema", error);
|
|
53
|
+
throw error;
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
export const getNonUserAccess = (publicationDomain) => fetch(`/api/jupiter/v1/non_user_access/${publicationDomain}`, { method: "post" })
|
|
57
|
+
.then((response) => {
|
|
58
|
+
if (!response.ok) {
|
|
59
|
+
throw new Error(`Request not ok (${response.status}: ${response.statusText}).`);
|
|
60
|
+
}
|
|
61
|
+
return response.json();
|
|
62
|
+
})
|
|
63
|
+
.then((json) => {
|
|
64
|
+
try {
|
|
65
|
+
return GetNonUserAccessSchema.check(json);
|
|
66
|
+
}
|
|
67
|
+
catch (error) {
|
|
68
|
+
console.error("Invalid schema", error);
|
|
69
|
+
throw error;
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianVwaXRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy9qdXBpdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBVSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBSXpFLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxDQUFDO0lBQy9CLEVBQUUsRUFBRSxNQUFNO0lBQ1YsTUFBTSxFQUFFLE1BQU07Q0FDZixDQUFDLENBQUM7QUFDSCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxNQUFNLENBQUM7SUFDOUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUM7SUFDMUIsTUFBTSxFQUFFLEtBQUssQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3BELFdBQVcsRUFBRSxpQkFBaUI7SUFDOUIsZUFBZSxFQUFFLEtBQUssQ0FBQyxNQUFNLENBQUM7Q0FDL0IsQ0FBQyxDQUFDO0FBSUgsTUFBTSxnQkFBZ0IsR0FBRyxNQUFNLENBQUM7SUFDOUIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU07SUFDZCxlQUFlLEVBQUUsS0FBSyxDQUFDLE1BQU0sQ0FBQztDQUMvQixDQUFDLENBQUM7QUFJSCxNQUFNLHNCQUFzQixHQUFHLE1BQU0sQ0FBQztJQUNwQyxNQUFNLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQztJQUMxQixjQUFjLEVBQUUsTUFBTTtJQUN0QixJQUFJLEVBQUUsTUFBTTtJQUNaLGVBQWUsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDO0NBQy9CLENBQUMsQ0FBQTtBQUlGLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUM1QixpQkFBeUIsRUFDekIsY0FBOEIsRUFDQSxFQUFFLENBQ2hDLEtBQUssQ0FDSCwwQ0FB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
|
package/dist/services/pluto.d.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
import { Record, Static, String } from 'runtypes';
|
|
2
|
-
export declare const
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { Optional, Record, Static, String } from 'runtypes';
|
|
2
|
+
export declare const SessionSchema: Record<{
|
|
3
|
+
created_at: String;
|
|
4
|
+
updated_at: String;
|
|
5
|
+
user_uuid: String;
|
|
6
|
+
user_name: String;
|
|
7
|
+
tracking_key: String;
|
|
8
|
+
user_agent: Optional<String>;
|
|
9
|
+
user_key: Optional<String>;
|
|
5
10
|
}, false>;
|
|
6
|
-
export declare type Session = Static<typeof
|
|
11
|
+
export declare type Session = Static<typeof SessionSchema>;
|
|
7
12
|
export declare const getCurrentSession: () => Promise<Session>;
|
|
8
|
-
export declare const removeSession: (domain: string) => Promise<void>;
|
|
@@ -0,0 +1,40 @@
|
|
|
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
|
+
import { Optional, Record, String } from 'runtypes';
|
|
11
|
+
export const SessionSchema = Record({
|
|
12
|
+
created_at: String,
|
|
13
|
+
updated_at: String,
|
|
14
|
+
user_uuid: String,
|
|
15
|
+
user_name: String,
|
|
16
|
+
tracking_key: String,
|
|
17
|
+
user_agent: Optional(String),
|
|
18
|
+
// @deprecated Use tracking_key
|
|
19
|
+
user_key: Optional(String),
|
|
20
|
+
});
|
|
21
|
+
export const getCurrentSession = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
+
return fetch(`/api/pluto/v1/sessions/current`)
|
|
23
|
+
.then((response) => {
|
|
24
|
+
if (!response.ok) {
|
|
25
|
+
// TODO Handle this.
|
|
26
|
+
throw new Error(`Request not ok (${response.status}: ${response.statusText}).`);
|
|
27
|
+
}
|
|
28
|
+
return response.json();
|
|
29
|
+
})
|
|
30
|
+
.then((json) => {
|
|
31
|
+
try {
|
|
32
|
+
return SessionSchema.check(json);
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
console.error('Invalid schema', error);
|
|
36
|
+
throw error;
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1dG8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvcGx1dG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQVUsTUFBTSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRTVELE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxNQUFNLENBQUM7SUFDbEMsVUFBVSxFQUFFLE1BQU07SUFDbEIsVUFBVSxFQUFFLE1BQU07SUFDbEIsU0FBUyxFQUFFLE1BQU07SUFDakIsU0FBUyxFQUFFLE1BQU07SUFDakIsWUFBWSxFQUFFLE1BQU07SUFDcEIsVUFBVSxFQUFFLFFBQVEsQ0FBQyxNQUFNLENBQUM7SUFFNUIsK0JBQStCO0lBQy9CLFFBQVEsRUFBRSxRQUFRLENBQUMsTUFBTSxDQUFDO0NBQzNCLENBQUMsQ0FBQztBQUdILE1BQU0sQ0FBQyxNQUFNLGlCQUFpQixHQUFHLEdBQTJCLEVBQUU7SUFDNUQsT0FBQSxLQUFLLENBQUMsZ0NBQWdDLENBQUM7U0FDcEMsSUFBSSxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUU7UUFDakIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUU7WUFDaEIsb0JBQW9CO1lBQ3BCLE1BQU0sSUFBSSxLQUFLLENBQ2IsbUJBQW1CLFFBQVEsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLFVBQVUsSUFBSSxDQUMvRCxDQUFDO1NBQ0g7UUFDRCxPQUFPLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN6QixDQUFDLENBQUM7U0FDRCxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUNiLElBQUk7WUFDRixPQUFPLGFBQWEsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDbEM7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNkLE9BQU8sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDdkMsTUFBTSxLQUFLLENBQUM7U0FDYjtJQUNILENBQUMsQ0FBQyxDQUFBO0VBQUEsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@amedia/user",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"description": "Client lib for working with aID user and associated data",
|
|
5
5
|
"repository": "https://github.com/amedia/amedia-user-js",
|
|
6
6
|
"author": "Amedia Utvikling (ID og data)",
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
"build": "webpack --mode=production"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
+
"@amedia/browserid": "0.1.6",
|
|
14
15
|
"@amedia/frontend-rpc": "0.0.12",
|
|
15
16
|
"dexie": "3.0.3",
|
|
16
17
|
"lodash": "4.17.21",
|
|
@@ -1,16 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
getCurrentSession,
|
|
3
|
-
InternalSessionSchema,
|
|
4
|
-
removeSession,
|
|
5
|
-
Session,
|
|
6
|
-
} from '../clients/pluto';
|
|
1
|
+
import { getCurrentSession, removeSession } from '../clients/pluto';
|
|
7
2
|
import cache from '../cache';
|
|
8
3
|
import { getRPCClient } from '../lib/rpc';
|
|
9
4
|
import { removeCookie } from '../lib/cookie';
|
|
10
5
|
import { getCurrentEnvironment } from '../utils/url';
|
|
11
6
|
import log from '../utils/log';
|
|
12
|
-
|
|
13
|
-
const EXPIRES_10_SECONDS = 10000;
|
|
7
|
+
import { UserAttributes } from '../types';
|
|
14
8
|
|
|
15
9
|
export const login = (requestedUrl: string) => {
|
|
16
10
|
const environment = getCurrentEnvironment();
|
|
@@ -34,41 +28,14 @@ export const logout = async () =>
|
|
|
34
28
|
// TODO: It now clears the entire cache. Might be too aggressive.
|
|
35
29
|
Promise.all([removeSession(window.location.host), cache.clear()])
|
|
36
30
|
.then(() => {
|
|
31
|
+
// TODO This should be separated from logout and instead be setup to listen on state changes on storage
|
|
37
32
|
getRPCClient().userAuthenticated(false);
|
|
38
33
|
clearCookies();
|
|
39
34
|
// In addition to removing the regular cookies we also want to remove VSTOKEN2 on explicit logout
|
|
40
35
|
removeCookie('VSTOKEN2');
|
|
41
|
-
/* @todo Set state
|
|
42
|
-
* state.set('state', {
|
|
43
|
-
isLoggedIn: false,
|
|
44
|
-
}); */
|
|
45
36
|
})
|
|
46
37
|
.catch((reason) => {
|
|
47
|
-
log.error('
|
|
38
|
+
log.error('Failure while logging out', reason);
|
|
48
39
|
});
|
|
49
40
|
|
|
50
|
-
|
|
51
|
-
const IS_LOGGED_IN_CACHE_KEY = 'is_logged_in';
|
|
52
|
-
export const getSession = async (): Promise<Session | null> => {
|
|
53
|
-
if (isFetchingSession) {
|
|
54
|
-
// TODO Perhaps return a promise to be resolved later?
|
|
55
|
-
return null;
|
|
56
|
-
}
|
|
57
|
-
isFetchingSession = true;
|
|
58
|
-
|
|
59
|
-
// Try the cache first
|
|
60
|
-
const cacheResponse = await cache.get(
|
|
61
|
-
IS_LOGGED_IN_CACHE_KEY,
|
|
62
|
-
InternalSessionSchema
|
|
63
|
-
);
|
|
64
|
-
if (cacheResponse) {
|
|
65
|
-
isFetchingSession = false;
|
|
66
|
-
return cacheResponse;
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
// Actually perform a request against backend for the session
|
|
70
|
-
const session = await getCurrentSession();
|
|
71
|
-
cache.set(IS_LOGGED_IN_CACHE_KEY, session, EXPIRES_10_SECONDS);
|
|
72
|
-
isFetchingSession = false;
|
|
73
|
-
return session;
|
|
74
|
-
};
|
|
41
|
+
export const getSession = (): Promise<UserAttributes> => getCurrentSession();
|
package/src/actions/userData.ts
CHANGED
|
@@ -1,32 +1,30 @@
|
|
|
1
|
+
import { getBrowserId } from '@amedia/browserid';
|
|
1
2
|
import log from '../utils/log';
|
|
2
3
|
import { UserAttributes } from '../types';
|
|
3
4
|
import { getSession } from './authentication';
|
|
4
5
|
import { getAccess } from './authorization';
|
|
5
6
|
import { getPrivacyPreferences } from './preferences';
|
|
7
|
+
import store from '../store';
|
|
8
|
+
import { getInfo } from '../clients/nebula';
|
|
6
9
|
|
|
7
|
-
// TODO We may want actions to tell us what they can deliver and not have this "organizer" (wohoo-bad-name) tell the actions..
|
|
8
10
|
const dataServiceMap: {
|
|
9
|
-
|
|
10
|
-
[key in keyof UserAttributes]?: () => Promise<UserAttributes>;
|
|
11
|
+
[key in keyof UserAttributes]?: () => Promise<Partial<UserAttributes>>;
|
|
11
12
|
} = {
|
|
12
|
-
// @ts-ignore
|
|
13
13
|
name: getSession,
|
|
14
|
-
// @ts-ignore
|
|
15
14
|
trackingKey: getSession,
|
|
16
15
|
access: getAccess,
|
|
16
|
+
extraData: () =>
|
|
17
|
+
getBrowserId().then((browserId) =>
|
|
18
|
+
getInfo(
|
|
19
|
+
window.location.hostname,
|
|
20
|
+
browserId,
|
|
21
|
+
store.get('userAttributes')?.trackingKey
|
|
22
|
+
)
|
|
23
|
+
),
|
|
17
24
|
privacyPreferences: getPrivacyPreferences,
|
|
18
25
|
};
|
|
19
26
|
|
|
20
|
-
|
|
21
|
-
const addToCurrentUserData = (data) => {
|
|
22
|
-
currentUserData = { ...currentUserData, ...data };
|
|
23
|
-
};
|
|
24
|
-
const getCurrentUserData = () => currentUserData;
|
|
25
|
-
|
|
26
|
-
export const fetchDataBasedOnAttributes = (
|
|
27
|
-
attributes: Array<keyof UserAttributes>,
|
|
28
|
-
onDataUpdated: (attributes: UserAttributes) => void
|
|
29
|
-
) => {
|
|
27
|
+
export const requestAttributes = (attributes: Array<keyof UserAttributes>) => {
|
|
30
28
|
const requiredServices: Array<() => Promise<UserAttributes>> = [];
|
|
31
29
|
attributes.forEach((attribute) => {
|
|
32
30
|
const service = dataServiceMap[attribute];
|
|
@@ -43,10 +41,8 @@ export const fetchDataBasedOnAttributes = (
|
|
|
43
41
|
const service = requiredServices.pop();
|
|
44
42
|
if (service) {
|
|
45
43
|
service()
|
|
46
|
-
.
|
|
47
|
-
|
|
48
|
-
onDataUpdated(getCurrentUserData());
|
|
49
|
-
})
|
|
44
|
+
// TODO we need to discuss where to do the store updates. userAttributes vs state.
|
|
45
|
+
.then((data) => store.set('userAttributes', data))
|
|
50
46
|
.catch((error) => {
|
|
51
47
|
log.error('Call rejected', service, error);
|
|
52
48
|
});
|
package/src/clients/europa.ts
CHANGED
|
@@ -34,11 +34,7 @@ const updateNamespaceInCache = async (namespace: string, data: Object) => {
|
|
|
34
34
|
};
|
|
35
35
|
|
|
36
36
|
export const updateNamespace = async (namespace: string, data: Object) => {
|
|
37
|
-
const res = await doFetch(
|
|
38
|
-
`//www.aid.no/api/europa/v1/me/${namespace}`,
|
|
39
|
-
'PATCH',
|
|
40
|
-
data
|
|
41
|
-
);
|
|
37
|
+
const res = await doFetch(`/api/europa/v1/me/${namespace}`, 'PATCH', data);
|
|
42
38
|
if (!res.ok) {
|
|
43
39
|
log.error(
|
|
44
40
|
`Could not get namespace: ${namespace}, status: ${res.status}, statusText: ${res.statusText}`,
|
|
@@ -60,7 +56,7 @@ export const getNamespace = async (
|
|
|
60
56
|
}
|
|
61
57
|
}
|
|
62
58
|
|
|
63
|
-
return doFetch(
|
|
59
|
+
return doFetch(`/api/europa/v1/me/${namespace}`, 'GET')
|
|
64
60
|
.then((res) => {
|
|
65
61
|
if (!res.ok) {
|
|
66
62
|
log.error(
|
|
@@ -83,7 +79,7 @@ export const getNamespace = async (
|
|
|
83
79
|
};
|
|
84
80
|
|
|
85
81
|
export const saveNamespace = (namespace: string, data: Object) =>
|
|
86
|
-
doFetch(
|
|
82
|
+
doFetch(`/api/europa/v1/me/${namespace}`, 'PUT', data)
|
|
87
83
|
.then((res) => {
|
|
88
84
|
if (!res.ok) {
|
|
89
85
|
log.error(
|
|
@@ -96,7 +92,7 @@ export const saveNamespace = (namespace: string, data: Object) =>
|
|
|
96
92
|
.then(() => getNamespace(namespace, { ignoreCache: true })); // updates cache
|
|
97
93
|
|
|
98
94
|
export const getAllNamespaces = () =>
|
|
99
|
-
doFetch(
|
|
95
|
+
doFetch(`/api/europa/v1/me`)
|
|
100
96
|
.then((res) => {
|
|
101
97
|
if (!res.ok) {
|
|
102
98
|
log.error(
|
|
@@ -114,7 +110,7 @@ export const getAllNamespaces = () =>
|
|
|
114
110
|
});
|
|
115
111
|
|
|
116
112
|
export const deleteNamespaceKey = (namespace: string, key: string) =>
|
|
117
|
-
doFetch(
|
|
113
|
+
doFetch(`/api/europa/v1/me/${namespace}/${key}`, 'DELETE')
|
|
118
114
|
.then((res) => {
|
|
119
115
|
if (!res.ok) {
|
|
120
116
|
log.error(
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import fetch from 'jest-fetch-mock';
|
|
2
|
+
import cache from '../cache';
|
|
2
3
|
import log from '../utils/log';
|
|
3
4
|
import {
|
|
4
5
|
checkForAccess,
|
|
@@ -10,8 +11,9 @@ import {
|
|
|
10
11
|
getNonUserAccess,
|
|
11
12
|
} from './jupiter';
|
|
12
13
|
|
|
13
|
-
beforeEach(() => {
|
|
14
|
+
beforeEach(async () => {
|
|
14
15
|
fetch.resetMocks();
|
|
16
|
+
await cache.clear();
|
|
15
17
|
});
|
|
16
18
|
|
|
17
19
|
describe('jupiter service', () => {
|
|
@@ -50,7 +52,7 @@ describe('jupiter service', () => {
|
|
|
50
52
|
|
|
51
53
|
await expect(
|
|
52
54
|
checkForAccess(publicationDomain, accessFeatures)
|
|
53
|
-
).rejects.
|
|
55
|
+
).rejects.toBeUndefined();
|
|
54
56
|
});
|
|
55
57
|
|
|
56
58
|
it('should fail on runtime validation', async () => {
|
|
@@ -59,9 +61,7 @@ describe('jupiter service', () => {
|
|
|
59
61
|
|
|
60
62
|
await expect(
|
|
61
63
|
checkForAccess(publicationDomain, accessFeatures)
|
|
62
|
-
).rejects.
|
|
63
|
-
'Expected { status: "success"; access: "granted" | "denied"; publication: { id: number; domain: string; }; access_features: string[]; }, but was incompatible'
|
|
64
|
-
);
|
|
64
|
+
).rejects.toBeUndefined();
|
|
65
65
|
});
|
|
66
66
|
});
|
|
67
67
|
|
package/src/clients/jupiter.ts
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
Union,
|
|
9
9
|
} from 'runtypes';
|
|
10
10
|
import log from '../utils/log';
|
|
11
|
+
import getOrUpdate from '../utils/getOrUpdate';
|
|
11
12
|
|
|
12
13
|
export type AccessFeatures = string[];
|
|
13
14
|
|
|
@@ -45,28 +46,33 @@ export const checkForAccess = (
|
|
|
45
46
|
publicationDomain: string,
|
|
46
47
|
accessFeatures: AccessFeatures
|
|
47
48
|
): Promise<CheckAccessForPaper> =>
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
49
|
+
getOrUpdate('checkForAccess', CheckAccessForPaperSchema, () =>
|
|
50
|
+
fetch(
|
|
51
|
+
`/api/jupiter/v1/check_access_for_paper/${publicationDomain}/?require=any&access_features=${accessFeatures.join(
|
|
52
|
+
','
|
|
53
|
+
)}`
|
|
54
|
+
)
|
|
55
|
+
.then((response) => {
|
|
56
|
+
if (!response.ok) {
|
|
57
|
+
// TODO Handle this.
|
|
58
|
+
throw new Error(
|
|
59
|
+
`Request not ok (${response.status}: ${response.statusText}).`
|
|
60
|
+
);
|
|
61
|
+
}
|
|
62
|
+
return response.json();
|
|
63
|
+
})
|
|
64
|
+
.then((json) => {
|
|
65
|
+
try {
|
|
66
|
+
return {
|
|
67
|
+
ttl: 1000 * 10, // 10 seconds
|
|
68
|
+
data: CheckAccessForPaperSchema.check(json),
|
|
69
|
+
};
|
|
70
|
+
} catch (error) {
|
|
71
|
+
log.error('Invalid schema', error);
|
|
72
|
+
throw error;
|
|
73
|
+
}
|
|
74
|
+
})
|
|
75
|
+
);
|
|
70
76
|
|
|
71
77
|
export const getVstoken = (publicationDomain: string): Promise<GetVstoken> =>
|
|
72
78
|
fetch(`/api/jupiter/v1/get_vstoken/${publicationDomain}`, { method: 'post' })
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import fetch from 'jest-fetch-mock';
|
|
2
|
+
import cache from '../cache';
|
|
2
3
|
import log from '../utils/log';
|
|
3
|
-
import {
|
|
4
|
+
import { getInfo } from './nebula';
|
|
4
5
|
|
|
5
6
|
describe('nebula service', () => {
|
|
6
|
-
beforeEach(() => {
|
|
7
|
+
beforeEach(async () => {
|
|
7
8
|
fetch.resetMocks();
|
|
9
|
+
await cache.clear();
|
|
8
10
|
});
|
|
9
11
|
|
|
10
12
|
describe('GET /info', () => {
|
|
@@ -13,7 +15,7 @@ describe('nebula service', () => {
|
|
|
13
15
|
const browserId = 'fc0bce06-560b-48e4-92f2-840e67178516';
|
|
14
16
|
|
|
15
17
|
it('should return user information', async () => {
|
|
16
|
-
const response
|
|
18
|
+
const response = {
|
|
17
19
|
ad_segments: '1022776316,1037513379,1043845105',
|
|
18
20
|
ad_segments_user: '1022776316,1037513379,1043845105',
|
|
19
21
|
age: 28,
|
|
@@ -35,11 +37,11 @@ describe('nebula service', () => {
|
|
|
35
37
|
fetch.mockResponseOnce(JSON.stringify(response));
|
|
36
38
|
|
|
37
39
|
await expect(
|
|
38
|
-
getInfo(
|
|
39
|
-
).resolves.toEqual(response);
|
|
40
|
+
getInfo(publicationDomain, browserId, userKey)
|
|
41
|
+
).resolves.toEqual({ extraData: response });
|
|
40
42
|
|
|
41
43
|
expect(fetch).toHaveBeenCalledWith(
|
|
42
|
-
`https://services.gcloud.api.no/api/nebula/v1/info?
|
|
44
|
+
`https://services.gcloud.api.no/api/nebula/v1/info?domain=${publicationDomain}&browser_id=${browserId}&user_key=${userKey}`
|
|
43
45
|
);
|
|
44
46
|
});
|
|
45
47
|
|
|
@@ -49,13 +51,11 @@ describe('nebula service', () => {
|
|
|
49
51
|
|
|
50
52
|
await expect(
|
|
51
53
|
getInfo(userKey, publicationDomain, browserId)
|
|
52
|
-
).rejects.
|
|
53
|
-
'Expected { ad_segments?: string; ad_segments_user?: string; age?: number; age_user?: number; birth_year?: string; birth_year_user?: string; gender?: string; gender_user?: string; grunnkrets?: string; grunnkrets_user?: string; postcode?: string; postcode_user?: string; shared_account?: boolean; shared_account_user?: boolean; user_grouping_number?: string; user_grouping_number_user?: string; }, but was incompatible'
|
|
54
|
-
);
|
|
54
|
+
).rejects.toBeUndefined();
|
|
55
55
|
});
|
|
56
56
|
|
|
57
57
|
it('should pass on runtime validation if unknown property is given', async () => {
|
|
58
|
-
const response
|
|
58
|
+
const response = {
|
|
59
59
|
fullname: 'ra. dean baskaran',
|
|
60
60
|
age: 28,
|
|
61
61
|
shared_account: false,
|
|
@@ -65,7 +65,7 @@ describe('nebula service', () => {
|
|
|
65
65
|
|
|
66
66
|
await expect(
|
|
67
67
|
getInfo(userKey, publicationDomain, browserId)
|
|
68
|
-
).resolves.toEqual(response);
|
|
68
|
+
).resolves.toEqual({ extraData: response });
|
|
69
69
|
});
|
|
70
70
|
});
|
|
71
71
|
});
|