@amedia/user 0.7.2 → 0.7.4

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.
Files changed (93) hide show
  1. package/dist/index.d.ts +6 -17
  2. package/dist/index.js +7 -2
  3. package/dist/lib/authentication.d.ts +17 -0
  4. package/dist/lib/authentication.js +74 -0
  5. package/dist/lib/authorization.d.ts +14 -0
  6. package/dist/lib/authorization.js +51 -0
  7. package/dist/{cache/engines/indexeddb.d.ts → lib/cache/db.d.ts} +2 -3
  8. package/dist/lib/cache/db.js +13 -0
  9. package/dist/lib/cache/global.d.ts +9 -0
  10. package/dist/lib/cache/global.js +16 -0
  11. package/dist/lib/cache/types.d.ts +5 -0
  12. package/dist/lib/cache/types.js +2 -0
  13. package/dist/lib/queue.d.ts +5 -0
  14. package/dist/lib/queue.js +17 -0
  15. package/dist/lib/tools.d.ts +1 -0
  16. package/dist/lib/tools.js +2 -0
  17. package/dist/lib/user.d.ts +2 -0
  18. package/dist/lib/user.js +3 -0
  19. package/dist/services/cache.d.ts +9 -0
  20. package/dist/services/cache.js +34 -0
  21. package/dist/services/jupiter.d.ts +4 -4
  22. package/dist/services/jupiter.js +72 -0
  23. package/dist/services/pluto.d.ts +10 -6
  24. package/dist/services/pluto.js +40 -0
  25. package/package.json +1 -1
  26. package/src/actions/authorization.ts +2 -2
  27. package/src/actions/preferences.spec.ts +2 -14
  28. package/src/actions/preferences.ts +26 -54
  29. package/src/cache/index.spec.ts +2 -2
  30. package/src/clients/europa.spec.ts +51 -19
  31. package/src/clients/europa.ts +70 -53
  32. package/src/clients/jupiter.spec.ts +26 -0
  33. package/src/clients/jupiter.ts +3 -2
  34. package/src/clients/mercury.spec.ts +5 -7
  35. package/src/clients/mercury.ts +4 -2
  36. package/src/clients/pluto.spec.ts +0 -2
  37. package/src/eventHandlers/activation.ts +2 -2
  38. package/src/index-authentcation.spec.ts +2 -1
  39. package/src/index-subscription.spec.ts +20 -13
  40. package/src/index.ts +58 -34
  41. package/src/types.ts +1 -0
  42. package/src/utils/getOrUpdate.spec.ts +168 -0
  43. package/src/utils/getOrUpdate.ts +27 -3
  44. package/dist/actions/authentication.d.ts +0 -4
  45. package/dist/actions/authorization.d.ts +0 -3
  46. package/dist/actions/preferences.d.ts +0 -9
  47. package/dist/actions/preferences.spec.d.ts +0 -1
  48. package/dist/actions/userData.d.ts +0 -2
  49. package/dist/cache/engines/global.d.ts +0 -21
  50. package/dist/cache/engines/global.spec.d.ts +0 -1
  51. package/dist/cache/index.d.ts +0 -11
  52. package/dist/cache/index.spec.d.ts +0 -4
  53. package/dist/cache/types.d.ts +0 -11
  54. package/dist/clients/europa.d.ts +0 -12
  55. package/dist/clients/europa.spec.d.ts +0 -1
  56. package/dist/clients/jupiter.d.ts +0 -30
  57. package/dist/clients/jupiter.spec.d.ts +0 -1
  58. package/dist/clients/mercury.d.ts +0 -18
  59. package/dist/clients/mercury.spec.d.ts +0 -4
  60. package/dist/clients/nebula.d.ts +0 -2
  61. package/dist/clients/nebula.spec.d.ts +0 -1
  62. package/dist/clients/pluto.d.ts +0 -3
  63. package/dist/clients/pluto.spec.d.ts +0 -1
  64. package/dist/eventHandlers/activation.d.ts +0 -15
  65. package/dist/eventHandlers/authentication.d.ts +0 -17
  66. package/dist/eventHandlers/userAttributes.d.ts +0 -14
  67. package/dist/index-authentcation.spec.d.ts +0 -4
  68. package/dist/index-subscription.spec.d.ts +0 -4
  69. package/dist/index-userdata.spec.d.ts +0 -4
  70. package/dist/index.js.LICENSE.txt +0 -14
  71. package/dist/index.js.gz +0 -0
  72. package/dist/lib/cookie.d.ts +0 -5
  73. package/dist/lib/rpc.d.ts +0 -6
  74. package/dist/services/europa.d.ts +0 -12
  75. package/dist/services/europa.spec.d.ts +0 -1
  76. package/dist/services/jupiter.spec.d.ts +0 -1
  77. package/dist/services/mercury.d.ts +0 -18
  78. package/dist/services/mercury.spec.d.ts +0 -4
  79. package/dist/services/nebula.d.ts +0 -22
  80. package/dist/services/nebula.spec.d.ts +0 -1
  81. package/dist/services/pluto.spec.d.ts +0 -1
  82. package/dist/store/index.d.ts +0 -13
  83. package/dist/store/index.spec.d.ts +0 -1
  84. package/dist/store/store.d.ts +0 -13
  85. package/dist/store/store.spec.d.ts +0 -1
  86. package/dist/types.d.ts +0 -24
  87. package/dist/utils/customEventWrapper.d.ts +0 -17
  88. package/dist/utils/deepEquals.d.ts +0 -4
  89. package/dist/utils/getOrUpdate.d.ts +0 -6
  90. package/dist/utils/log.d.ts +0 -26
  91. package/dist/utils/queue.d.ts +0 -12
  92. package/dist/utils/url.d.ts +0 -3
  93. package/dist/utils/url.spec.d.ts +0 -1
@@ -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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
@@ -1,8 +1,12 @@
1
- import { Record, Static, String } from 'runtypes';
2
- export declare const InternalSessionSchema: Record<{
3
- name: String;
4
- trackingKey: String;
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 InternalSessionSchema>;
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.7.2",
3
+ "version": "0.7.4",
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)",
@@ -7,9 +7,9 @@ import { logout } from './authentication';
7
7
  export const getAccess = (): Promise<Pick<UserAttributes, 'access'>> =>
8
8
  checkForAccess(getCurrentPublicationDomain(), ['newspaper']);
9
9
 
10
- export const activate = (accessFeature: string): Promise<boolean> => {
10
+ export const activate = (accessFeatures: string[]): Promise<boolean> => {
11
11
  try {
12
- return activateSubscription(accessFeature);
12
+ return activateSubscription(accessFeatures);
13
13
  } catch (error) {
14
14
  if (error instanceof UserDeactivatedError) {
15
15
  logout();
@@ -1,10 +1,7 @@
1
1
  import fetch from 'jest-fetch-mock';
2
2
  import cache from '../cache';
3
- import queue from '../utils/queue';
4
3
  import { getPrivacyPreferences } from './preferences';
5
4
 
6
- fetch.enableMocks();
7
-
8
5
  beforeEach(() => {
9
6
  fetch.resetMocks();
10
7
  cache.clear();
@@ -15,7 +12,7 @@ const europaResponse = {
15
12
  privacy_preferences: {
16
13
  allow_research_usage: 'true',
17
14
  connect_with_surveys: true,
18
- personalzied_ads: 'false',
15
+ personalized_ads: 'false',
19
16
  personalized_content: false,
20
17
  },
21
18
  },
@@ -28,15 +25,6 @@ describe('privacyPreferences', () => {
28
25
  expect(fetch).toHaveBeenCalledTimes(1);
29
26
  });
30
27
 
31
- it('simultanious call should return same preferences', async () => {
32
- fetch.mockResponse(JSON.stringify(europaResponse));
33
-
34
- jest.spyOn(queue, 'add');
35
- await Promise.all([getPrivacyPreferences(), getPrivacyPreferences()]);
36
- expect(queue.add).toHaveBeenCalledTimes(2);
37
- expect(fetch).toHaveBeenCalledTimes(1);
38
- });
39
-
40
28
  it('should use cache if available', async () => {
41
29
  fetch.mockResponse(JSON.stringify(europaResponse));
42
30
 
@@ -44,7 +32,7 @@ describe('privacyPreferences', () => {
44
32
  Promise.resolve({
45
33
  allowResearchUsage: true,
46
34
  connectWithSurveys: true,
47
- personalziedAds: false,
35
+ personalizedAds: false,
48
36
  personalizedContent: false,
49
37
  })
50
38
  );
@@ -1,12 +1,9 @@
1
1
  import { Record, Boolean } from 'runtypes';
2
- import cache from '../cache';
3
- import { getNamespace } from '../clients/europa';
4
- import { UserAttributes, PrivacyPreferences } from '../types';
5
- import log from '../utils/log';
6
- import queue from '../utils/queue';
2
+ import { getNamespaces } from '../clients/europa';
3
+ import { UserAttributes } from '../types';
4
+ import getOrUpdate from '../utils/getOrUpdate';
7
5
 
8
6
  const CACHE_DURATION = 5 * 60000; // 5 minutes
9
- const PRIVACY_PREFERENCES_QUEUE_KEY = 'privacy_preferences_queue';
10
7
  const PRIVACY_PREFERENCES_CACHE_KEY = 'privacyPreferences';
11
8
 
12
9
  export const PrivacyPreferencesSchema = Record({
@@ -18,52 +15,27 @@ export const PrivacyPreferencesSchema = Record({
18
15
 
19
16
  const toBoolean = (val: string | boolean) => val === 'true' || val === true;
20
17
 
21
- export const getPrivacyPreferences = async (): Promise<UserAttributes> =>
22
- new Promise((resolve, reject) => {
23
- queue.add(PRIVACY_PREFERENCES_QUEUE_KEY, { resolve, reject });
24
- if (queue.peekQueueSize(PRIVACY_PREFERENCES_QUEUE_KEY) > 1) {
25
- return;
26
- }
18
+ export const getPrivacyPreferences = async (): Promise<
19
+ Pick<UserAttributes, 'privacyPreferences'>
20
+ > =>
21
+ getOrUpdate(PRIVACY_PREFERENCES_CACHE_KEY, PrivacyPreferencesSchema, () =>
22
+ getNamespaces(['privacy_preferences']).then((user) => {
23
+ const privacyPreferences: any = user.storage?.privacy_preferences || {};
27
24
 
28
- cache
29
- .get(PRIVACY_PREFERENCES_CACHE_KEY, PrivacyPreferencesSchema)
30
- .then((cacheResponse) => {
31
- if (cacheResponse) {
32
- queue.getAll(PRIVACY_PREFERENCES_QUEUE_KEY).forEach((promise) => {
33
- promise.resolve({ privacyPreferences: cacheResponse });
34
- });
35
- return;
36
- }
37
-
38
- const namespace = 'privacy_preferences';
39
- getNamespace(namespace)
40
- .then((namespaceData) => {
41
- const mappedPrivacy: PrivacyPreferences = {
42
- allowResearchUsage: toBoolean(namespaceData.allow_research_usage),
43
- connectWithSurveys: toBoolean(namespaceData.connect_with_surveys),
44
- personalizedAds: toBoolean(namespaceData.personalized_ads),
45
- personalizedContent: toBoolean(
46
- namespaceData.personalized_content
47
- ),
48
- };
49
-
50
- cache.set(
51
- PRIVACY_PREFERENCES_CACHE_KEY,
52
- mappedPrivacy,
53
- CACHE_DURATION
54
- );
55
- queue.getAll(PRIVACY_PREFERENCES_QUEUE_KEY).forEach((promise) => {
56
- promise.resolve({ privacyPreferences: mappedPrivacy });
57
- });
58
- })
59
- .catch((error) => {
60
- log.error(
61
- `Could not fetch data for namespace: ${namespace}`,
62
- error
63
- );
64
- queue.getAll(PRIVACY_PREFERENCES_QUEUE_KEY).forEach((promise) => {
65
- promise.reject();
66
- });
67
- });
68
- });
69
- });
25
+ return {
26
+ ttl: CACHE_DURATION,
27
+ data: {
28
+ allowResearchUsage: toBoolean(
29
+ privacyPreferences.allow_research_usage
30
+ ),
31
+ connectWithSurveys: toBoolean(
32
+ privacyPreferences.connect_with_surveys
33
+ ),
34
+ personalizedAds: toBoolean(privacyPreferences.personalized_ads),
35
+ personalizedContent: toBoolean(
36
+ privacyPreferences.personalized_content
37
+ ),
38
+ },
39
+ };
40
+ })
41
+ ).then((data) => ({ privacyPreferences: data }));
@@ -6,7 +6,7 @@ import { Record, String } from 'runtypes';
6
6
  import * as MockDate from 'mockdate';
7
7
  import cache, { setCacheEngine } from '.';
8
8
  import log from '../utils/log';
9
- import resetAllMocks = jest.resetAllMocks;
9
+ import restoreAllMocks = jest.restoreAllMocks;
10
10
 
11
11
  const TestDataSchema = Record({
12
12
  test: String,
@@ -14,7 +14,7 @@ const TestDataSchema = Record({
14
14
 
15
15
  let mockEngine;
16
16
  beforeEach(() => {
17
- resetAllMocks();
17
+ restoreAllMocks();
18
18
  MockDate.reset();
19
19
  // @ts-ignore
20
20
  mockEngine = {
@@ -6,12 +6,10 @@ import {
6
6
  clearLocalCache,
7
7
  saveNamespace,
8
8
  deleteNamespaceKey,
9
- getNamespace,
9
+ getNamespaces,
10
10
  getAllNamespaces,
11
11
  } from './europa';
12
12
 
13
- fetch.enableMocks();
14
-
15
13
  beforeEach(() => {
16
14
  fetch.resetMocks();
17
15
  cache.clear();
@@ -24,7 +22,10 @@ describe('Europa', () => {
24
22
  fetch.mockOnce(JSON.stringify({ namespaces: { user_info: userInfo } })); // data retrieved 'GET'
25
23
 
26
24
  const namespaceData = await saveNamespace('user_info', userInfo);
27
- expect(namespaceData).toMatchObject(userInfo);
25
+ expect(fetch).toHaveBeenCalledTimes(2);
26
+ expect(namespaceData).toMatchObject({
27
+ storage: { user_info: userInfo },
28
+ });
28
29
  });
29
30
 
30
31
  it('updateNamespace should update namespace', async () => {
@@ -37,7 +38,7 @@ describe('Europa', () => {
37
38
 
38
39
  const old = await saveNamespace('user_info', oldUserInfo);
39
40
  expect(fetch).toHaveBeenCalledTimes(2);
40
- expect(old).toMatchObject(oldUserInfo);
41
+ expect(old).toMatchObject({ storage: { user_info: oldUserInfo } });
41
42
 
42
43
  const updated = await updateNamespace('user_info', newUserInfo).then(() =>
43
44
  cache.get('europa', EuropaSchema)
@@ -65,29 +66,60 @@ describe('Europa', () => {
65
66
  .mockOnce(JSON.stringify({}), { status: 200 }) // 'DELETE'
66
67
  .mockOnce(JSON.stringify({ namespaces: { euucp: { y: 'y' } } })); // 'PUT'
67
68
 
68
- await saveNamespace('euucp', { x: 'x' });
69
- expect(cache.get('europa', EuropaSchema)).resolves.toMatchObject({
70
- namespaces: { euucp: { x: 'x', y: 'y' } },
71
- }); // expect x and y
69
+ const data = { x: 'x', y: 'y' };
70
+
71
+ await saveNamespace('euucp', data);
72
+ // expect x and y
73
+ expect(await cache.get('europa', EuropaSchema)).toEqual(
74
+ expect.objectContaining({
75
+ namespaces: { euucp: data },
76
+ })
77
+ );
72
78
 
73
79
  await deleteNamespaceKey('euucp', 'x');
74
- expect(cache.get('europa', EuropaSchema)).resolves.toMatchObject({
75
- namespaces: { euucp: { y: 'y' } },
76
- }); // expect only y
80
+ // expect only y
81
+ expect(await cache.get('europa', EuropaSchema)).toEqual(
82
+ expect.objectContaining({
83
+ namespaces: { euucp: { y: 'y' } },
84
+ })
85
+ );
77
86
  });
78
87
 
79
- it('getAllNamespaces should return all europa namespaces', () => {
80
- const namespaceData = {
88
+ it('getAllNamespaces should return all europa namespaces', async () => {
89
+ const data = {
81
90
  euucp: { x: 'x' },
82
91
  user_info: { gender: 'M', post_code: 'U' },
83
92
  };
84
93
 
85
- fetch.mockResponse(JSON.stringify({ namespaces: namespaceData }));
86
- expect(getAllNamespaces()).resolves.toMatchObject(namespaceData);
94
+ fetch.mockResponse(JSON.stringify({ namespaces: data }));
95
+ expect(await getAllNamespaces()).toMatchObject({ namespaces: data });
96
+ });
97
+ });
98
+
99
+ describe('getNamespaces', () => {
100
+ it('should return namespace', async () => {
101
+ const data = { euucp: { x: 'x' } };
102
+ fetch.mockResponse(JSON.stringify({ namespaces: data }));
103
+
104
+ const namespaceData = await getNamespaces(['euucp']);
105
+ expect(namespaceData).toEqual(expect.objectContaining({ storage: data }));
87
106
  });
88
107
 
89
- it('getNamespace should return europa namespace', () => {
90
- fetch.mockResponse(JSON.stringify({ namespaces: { euucp: { x: 'x' } } }));
91
- expect(getNamespace('euucp')).resolves.toMatchObject({ x: 'x' });
108
+ it('should return multiple namespaces', async () => {
109
+ const data = { euucp: { x: 'x' }, user_info: { a: 'a' } };
110
+ fetch.mockResponse(JSON.stringify({ namespaces: data }));
111
+
112
+ const namespaceData = await getNamespaces(['euucp', 'user_info']);
113
+ expect(namespaceData).toEqual(
114
+ expect.objectContaining({
115
+ storage: data,
116
+ })
117
+ );
118
+ });
119
+
120
+ it('should require at least one namespace', async () => {
121
+ await expect(getNamespaces([])).rejects.toThrowError(
122
+ new Error('namespaces array cannot be of length 0')
123
+ );
92
124
  });
93
125
  });
@@ -1,19 +1,25 @@
1
- import { Record, Partial } from 'runtypes';
1
+ import { Record, Unknown, Dictionary, Static, String } from 'runtypes';
2
2
 
3
3
  import cache from '../cache';
4
+ import { UserAttributes } from '../types';
5
+ import getOrUpdate from '../utils/getOrUpdate';
4
6
  import log from '../utils/log';
5
7
 
6
8
  const CACHE_DURATION = 5 * 60000; // 5 minutes
7
9
 
8
- export const EuropaSchema = Record({
9
- namespaces: Partial({}),
10
- });
10
+ export const EuropaSchema = Record({ namespaces: Dictionary(Unknown, String) });
11
11
 
12
12
  export const clearLocalCache = () => cache.remove('europa');
13
13
 
14
- const doFetch = (url: string, method?: string, body?: Object) =>
14
+ const mapEuropaToUserData = (
15
+ data: Static<typeof EuropaSchema>
16
+ ): Pick<UserAttributes, 'storage'> => ({
17
+ storage: data.namespaces,
18
+ });
19
+
20
+ const doFetch = (url: string, method: string = 'GET', body?: Object) =>
15
21
  fetch(url, {
16
- method: method && method,
22
+ method,
17
23
  body: body && JSON.stringify(body),
18
24
  headers: {
19
25
  'Content-Type': 'application/json',
@@ -45,37 +51,36 @@ export const updateNamespace = async (namespace: string, data: Object) => {
45
51
  return updateNamespaceInCache(namespace, data);
46
52
  };
47
53
 
48
- export const getNamespace = async (
49
- namespace: string,
54
+ export const getNamespaces = async (
55
+ namespaces: string[],
50
56
  options: { ignoreCache: boolean } = { ignoreCache: false }
51
- ) => {
52
- if (!options.ignoreCache) {
53
- const cacheData = await cache.get('europa', EuropaSchema);
54
- if (cacheData && cacheData.namespaces[namespace]) {
55
- return cacheData.namespaces[namespace];
56
- }
57
+ ): Promise<Pick<UserAttributes, 'storage'>> => {
58
+ if (namespaces.length === 0) {
59
+ throw new Error('namespaces array cannot be of length 0');
57
60
  }
58
61
 
59
- return doFetch(`/api/europa/v1/me/${namespace}`, 'GET')
60
- .then((res) => {
61
- if (!res.ok) {
62
- log.error(
63
- `Could not get namespace: ${namespace}, status: ${res.status}, statusText: ${res.statusText}`,
64
- res
65
- );
66
- return {};
67
- }
68
- return res.json();
69
- })
70
- .then((data) => {
71
- const validData = EuropaSchema.check(data);
72
- updateNamespaceInCache(namespace, validData.namespaces[namespace]);
73
- return validData.namespaces[namespace] || {};
74
- })
75
- .catch((error) => {
76
- log.error(`Could not get namespace: ${namespace}. Error:${error}`);
77
- return {};
78
- });
62
+ return getOrUpdate(
63
+ 'europa',
64
+ EuropaSchema,
65
+ () =>
66
+ doFetch(`/api/europa/v1/me/${namespaces.join(',')}`)
67
+ .then((res) => {
68
+ if (!res.ok) {
69
+ log.error(
70
+ `Could not get namespaces for: ${namespaces}, status: ${res.status}, statusText: ${res.statusText}`,
71
+ res
72
+ );
73
+ return { namespaces: {} };
74
+ }
75
+ return res.json();
76
+ })
77
+ .then((data) => ({ ttl: CACHE_DURATION, data })),
78
+ (cacheData) =>
79
+ !options.ignoreCache ||
80
+ Object.keys(cacheData.namespaces).filter(
81
+ (namespace) => !Object.keys(namespaces).includes(namespace)
82
+ ).length === 0
83
+ ).then(mapEuropaToUserData);
79
84
  };
80
85
 
81
86
  export const saveNamespace = (namespace: string, data: Object) =>
@@ -89,26 +94,38 @@ export const saveNamespace = (namespace: string, data: Object) =>
89
94
  }
90
95
  return {};
91
96
  })
92
- .then(() => getNamespace(namespace, { ignoreCache: true })); // updates cache
97
+ .then(() => getNamespaces([namespace], { ignoreCache: true })); // updates cache
93
98
 
94
99
  export const getAllNamespaces = () =>
95
- doFetch(`/api/europa/v1/me`)
96
- .then((res) => {
97
- if (!res.ok) {
98
- log.error(
99
- `Could not get all namespaces, status: ${res.status}, statusText: ${res.statusText}`,
100
- res
101
- );
102
- return {};
103
- }
104
- return res.json();
105
- })
106
- .then((data) => {
107
- const europaValidData = EuropaSchema.check(data);
108
- cache.set('europa', europaValidData, CACHE_DURATION);
109
- return europaValidData.namespaces;
110
- });
111
-
100
+ getOrUpdate(
101
+ 'europa',
102
+ EuropaSchema,
103
+ () =>
104
+ doFetch(`/api/europa/v1/me`)
105
+ .then((res) => {
106
+ if (!res.ok) {
107
+ log.error(
108
+ `Could not get all namespaces, status: ${res.status}, statusText: ${res.statusText}`,
109
+ res
110
+ );
111
+ return {};
112
+ }
113
+ return res.json();
114
+ })
115
+ .then((data) => {
116
+ const europaValidData = EuropaSchema.check(data);
117
+ try {
118
+ return {
119
+ ttl: CACHE_DURATION,
120
+ data: europaValidData,
121
+ };
122
+ } catch (error) {
123
+ log.error('Invalid schema', error);
124
+ throw error;
125
+ }
126
+ }),
127
+ () => false
128
+ );
112
129
  export const deleteNamespaceKey = (namespace: string, key: string) =>
113
130
  doFetch(`/api/europa/v1/me/${namespace}/${key}`, 'DELETE')
114
131
  .then((res) => {
@@ -119,4 +136,4 @@ export const deleteNamespaceKey = (namespace: string, key: string) =>
119
136
  );
120
137
  }
121
138
  })
122
- .then(() => getNamespace(namespace, { ignoreCache: true })); // updates cache
139
+ .then(() => getNamespaces([namespace], { ignoreCache: true })); // updates cache
@@ -10,6 +10,7 @@ import {
10
10
  GetNonUserAccess,
11
11
  getNonUserAccess,
12
12
  } from './jupiter';
13
+ import anything = jasmine.anything;
13
14
 
14
15
  beforeEach(async () => {
15
16
  fetch.resetMocks();
@@ -65,6 +66,31 @@ describe('jupiter service', () => {
65
66
  checkForAccess(publicationDomain, accessFeatures)
66
67
  ).rejects.toBeUndefined();
67
68
  });
69
+
70
+ it('should not cache when access denied', (done) => {
71
+ fetch.mockResponseOnce(
72
+ JSON.stringify({
73
+ status: 'success',
74
+ access: 'denied',
75
+ publication: {
76
+ domain: 'www.rb.no',
77
+ id: 95,
78
+ },
79
+ access_features: [],
80
+ })
81
+ );
82
+ const cacheSetSpy = spyOn(cache, 'set');
83
+ expect(checkForAccess(publicationDomain, accessFeatures))
84
+ .resolves.toEqual({ access: [] })
85
+ .then(() => {
86
+ expect(cacheSetSpy).toHaveBeenCalledWith(
87
+ 'checkForAccess',
88
+ anything(),
89
+ 0
90
+ );
91
+ })
92
+ .then(done);
93
+ });
68
94
  });
69
95
 
70
96
  describe('POST /get_vstoken', () => {
@@ -64,9 +64,10 @@ export const checkForAccess = (
64
64
  })
65
65
  .then((json) => {
66
66
  try {
67
+ const data = CheckAccessForPaperSchema.check(json);
67
68
  return {
68
- ttl: 1000 * 10, // 10 seconds
69
- data: CheckAccessForPaperSchema.check(json),
69
+ ttl: data.access === 'granted' ? 1000 * 10 : 0, // 10 seconds
70
+ data,
70
71
  };
71
72
  } catch (error) {
72
73
  log.error('Invalid schema', error);