@amedia/user 0.13.35 → 0.13.36
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/user.cjs +1 -1
- package/dist/user.cjs.map +3 -3
- package/dist/user.d.ts +12 -0
- package/dist/user.js +1 -1
- package/dist/user.js.map +3 -3
- package/package.json +5 -2
- package/.codeclimate.yml +0 -8
- package/.eslintignore +0 -2
- package/.eslintrc +0 -11
- package/.prettierrc.json +0 -1
- package/@types/amedia-frontend-rpc.d.ts +0 -11
- package/@types/browserid.d.ts +0 -4
- package/build.js +0 -28
- package/checkVersion.cjs +0 -12
- package/cloudbuild.json +0 -29
- package/cop.json +0 -8
- package/dist/actions/authentication.d.ts +0 -4
- package/dist/actions/authentication.spec.d.ts +0 -1
- package/dist/actions/authorization.d.ts +0 -14
- package/dist/actions/authorization.spec.d.ts +0 -4
- package/dist/actions/preferences.d.ts +0 -9
- package/dist/actions/preferences.spec.d.ts +0 -1
- package/dist/actions/storage.d.ts +0 -7
- package/dist/actions/userData.d.ts +0 -2
- package/dist/actions/userData.spec.d.ts +0 -1
- package/dist/autologin/index.d.ts +0 -7
- package/dist/autologin/index.spec.d.ts +0 -1
- package/dist/autologin/thirdPartyCookie.d.ts +0 -3
- package/dist/autologin/thirdPartyCookie.spec.d.ts +0 -1
- package/dist/cache/engines/global.d.ts +0 -24
- 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 -1
- package/dist/cache/types.d.ts +0 -11
- package/dist/clients/europa.d.ts +0 -24
- package/dist/clients/europa.spec.d.ts +0 -1
- package/dist/clients/jupiter.d.ts +0 -30
- package/dist/clients/jupiter.spec.d.ts +0 -1
- package/dist/clients/mercury.d.ts +0 -3
- package/dist/clients/mercury.spec.d.ts +0 -1
- package/dist/clients/mercuryLog.d.ts +0 -8
- package/dist/clients/mercuryLog.spec.d.ts +0 -1
- package/dist/clients/nebula.d.ts +0 -2
- package/dist/clients/nebula.spec.d.ts +0 -1
- package/dist/clients/pluto.d.ts +0 -4
- 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/eventMap.d.ts +0 -29
- package/dist/eventHandlers/state.d.ts +0 -1
- package/dist/eventHandlers/state.spec.d.ts +0 -1
- package/dist/eventHandlers/storage.d.ts +0 -1
- package/dist/eventHandlers/storage.spec.d.ts +0 -1
- package/dist/eventHandlers/userAttributes.d.ts +0 -1
- package/dist/eventHandlers/userAttributes.spec.d.ts +0 -1
- package/dist/exceptions/PaywallError.d.ts +0 -8
- package/dist/index-authentcation.spec.d.ts +0 -1
- package/dist/index-storage.spec.d.ts +0 -1
- package/dist/index-subscription.spec.d.ts +0 -1
- package/dist/index.d.ts +0 -20
- package/dist/janitor/index.d.ts +0 -10
- package/dist/janitor/index.spec.d.ts +0 -1
- package/dist/janitor/jobs/accessCookieRefresher.d.ts +0 -1
- package/dist/janitor/jobs/accessCookieRefresher.spec.d.ts +0 -1
- package/dist/janitor/jobs/daxsubCookie.d.ts +0 -3
- package/dist/janitor/jobs/daxsubCookie.spec.d.ts +0 -1
- package/dist/janitor/jobs/removeUserStorage.d.ts +0 -1
- package/dist/janitor/jobs/removeUserStorage.spec.d.ts +0 -1
- package/dist/lib/PaywallUnlockRequest.d.ts +0 -17
- package/dist/lib/PaywallUnlockRequest.spec.d.ts +0 -1
- package/dist/lib/UserDataRequest.d.ts +0 -22
- package/dist/lib/UserDataRequest.spec.d.ts +0 -1
- package/dist/lib/cookie.d.ts +0 -9
- package/dist/lib/rpc.d.ts +0 -6
- package/dist/store/index.d.ts +0 -23
- package/dist/store/index.spec.d.ts +0 -1
- package/dist/types.d.ts +0 -22
- package/dist/utils/customEventWrapper.d.ts +0 -19
- package/dist/utils/debouncer.d.ts +0 -26
- package/dist/utils/debouncer.spec.d.ts +0 -1
- package/dist/utils/deepEquals.d.ts +0 -1
- package/dist/utils/expectBootLogs.d.ts +0 -2
- package/dist/utils/getOrUpdate.d.ts +0 -6
- package/dist/utils/getOrUpdate.spec.d.ts +0 -1
- package/dist/utils/localhostCheck.d.ts +0 -1
- package/dist/utils/location.d.ts +0 -3
- package/dist/utils/log.d.ts +0 -9
- package/dist/utils/log.spec.d.ts +0 -1
- package/dist/utils/loginState.d.ts +0 -2
- package/dist/utils/networkError.d.ts +0 -1
- package/dist/utils/queue.d.ts +0 -12
- package/dist/utils/type.d.ts +0 -6
- package/dist/utils/url.d.ts +0 -6
- package/dist/utils/url.spec.d.ts +0 -1
- package/eik.json +0 -10
- package/global.d.ts +0 -1
- package/jest.config.js +0 -7
- package/setupJest.js +0 -1
- package/src/actions/authentication.spec.ts +0 -51
- package/src/actions/authentication.ts +0 -43
- package/src/actions/authorization.spec.ts +0 -369
- package/src/actions/authorization.ts +0 -117
- package/src/actions/preferences.spec.ts +0 -41
- package/src/actions/preferences.ts +0 -41
- package/src/actions/storage.ts +0 -22
- package/src/actions/userData.spec.ts +0 -133
- package/src/actions/userData.ts +0 -68
- package/src/autologin/index.spec.ts +0 -239
- package/src/autologin/index.ts +0 -92
- package/src/autologin/thirdPartyCookie.spec.ts +0 -95
- package/src/autologin/thirdPartyCookie.ts +0 -55
- package/src/cache/engines/global.spec.ts +0 -62
- package/src/cache/engines/global.ts +0 -48
- package/src/cache/index.spec.ts +0 -130
- package/src/cache/index.ts +0 -48
- package/src/cache/types.ts +0 -12
- package/src/clients/europa.spec.ts +0 -209
- package/src/clients/europa.ts +0 -183
- package/src/clients/jupiter.spec.ts +0 -179
- package/src/clients/jupiter.ts +0 -119
- package/src/clients/mercury.spec.ts +0 -59
- package/src/clients/mercury.ts +0 -48
- package/src/clients/mercuryLog.spec.ts +0 -20
- package/src/clients/mercuryLog.ts +0 -67
- package/src/clients/nebula.spec.ts +0 -70
- package/src/clients/nebula.ts +0 -83
- package/src/clients/pluto.spec.ts +0 -165
- package/src/clients/pluto.ts +0 -118
- package/src/eventHandlers/activation.ts +0 -35
- package/src/eventHandlers/authentication.ts +0 -34
- package/src/eventHandlers/eventMap.ts +0 -34
- package/src/eventHandlers/state.spec.ts +0 -48
- package/src/eventHandlers/state.ts +0 -23
- package/src/eventHandlers/storage.spec.ts +0 -114
- package/src/eventHandlers/storage.ts +0 -45
- package/src/eventHandlers/userAttributes.spec.ts +0 -93
- package/src/eventHandlers/userAttributes.ts +0 -31
- package/src/exceptions/PaywallError.ts +0 -16
- package/src/index-authentcation.spec.ts +0 -26
- package/src/index-storage.spec.ts +0 -144
- package/src/index-subscription.spec.ts +0 -213
- package/src/index.ts +0 -59
- package/src/janitor/index.spec.ts +0 -18
- package/src/janitor/index.ts +0 -59
- package/src/janitor/jobs/accessCookieRefresher.spec.ts +0 -213
- package/src/janitor/jobs/accessCookieRefresher.ts +0 -98
- package/src/janitor/jobs/daxsubCookie.spec.ts +0 -109
- package/src/janitor/jobs/daxsubCookie.ts +0 -38
- package/src/janitor/jobs/removeUserStorage.spec.ts +0 -34
- package/src/janitor/jobs/removeUserStorage.ts +0 -12
- package/src/lib/PaywallUnlockRequest.spec.ts +0 -363
- package/src/lib/PaywallUnlockRequest.ts +0 -143
- package/src/lib/UserDataRequest.spec.ts +0 -77
- package/src/lib/UserDataRequest.ts +0 -213
- package/src/lib/cookie.ts +0 -121
- package/src/lib/rpc.ts +0 -19
- package/src/store/index.spec.ts +0 -49
- package/src/store/index.ts +0 -64
- package/src/types.ts +0 -22
- package/src/utils/customEventWrapper.ts +0 -58
- package/src/utils/debouncer.spec.ts +0 -252
- package/src/utils/debouncer.ts +0 -123
- package/src/utils/deepEquals.ts +0 -42
- package/src/utils/expectBootLogs.ts +0 -9
- package/src/utils/getOrUpdate.spec.ts +0 -166
- package/src/utils/getOrUpdate.ts +0 -66
- package/src/utils/localhostCheck.ts +0 -9
- package/src/utils/location.ts +0 -31
- package/src/utils/log.spec.ts +0 -148
- package/src/utils/log.ts +0 -124
- package/src/utils/loginState.ts +0 -24
- package/src/utils/networkError.ts +0 -11
- package/src/utils/queue.ts +0 -32
- package/src/utils/type.ts +0 -19
- package/src/utils/url.spec.ts +0 -33
- package/src/utils/url.ts +0 -35
- package/testSetup.js +0 -19
- package/tsconfig.eslint.json +0 -24
- package/tsconfig.json +0 -18
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import { dispatch, listenWithExclusivity } from '../utils/customEventWrapper';
|
|
2
|
-
import { login, logout } from '../actions/authentication';
|
|
3
|
-
|
|
4
|
-
export enum AuthenticationEvents {
|
|
5
|
-
REQUEST_LOGIN = 'amedia-user.authentication.request-login',
|
|
6
|
-
REQUEST_LOGOUT = 'amedia-user.authentication.request-logout',
|
|
7
|
-
|
|
8
|
-
ON_LOGGED_OUT = 'amedia-user.authentication.on-logged-out',
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
declare global {
|
|
12
|
-
interface WindowEventMap {
|
|
13
|
-
[AuthenticationEvents.REQUEST_LOGIN]: CustomEvent<{
|
|
14
|
-
requestedUrl: string;
|
|
15
|
-
}>;
|
|
16
|
-
[AuthenticationEvents.REQUEST_LOGOUT]: CustomEvent<{
|
|
17
|
-
onLoggedOut: () => void;
|
|
18
|
-
}>;
|
|
19
|
-
[AuthenticationEvents.ON_LOGGED_OUT]: CustomEvent;
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export const listenForAuthenticationRequests = () => {
|
|
24
|
-
listenWithExclusivity(AuthenticationEvents.REQUEST_LOGIN, (evt) => {
|
|
25
|
-
login(evt.detail.requestedUrl);
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
listenWithExclusivity(AuthenticationEvents.REQUEST_LOGOUT, () => {
|
|
29
|
-
logout().finally(() => {
|
|
30
|
-
dispatch(new CustomEvent(AuthenticationEvents.ON_LOGGED_OUT));
|
|
31
|
-
});
|
|
32
|
-
});
|
|
33
|
-
};
|
|
34
|
-
listenForAuthenticationRequests();
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import { State, UserAttributes } from '../types';
|
|
2
|
-
|
|
3
|
-
export enum AmediaUserEvents {
|
|
4
|
-
REQUEST_STATE = 'amedia-user.request-state',
|
|
5
|
-
REQUEST_USER_ATTRIBUTES = 'amedia-user.request-user-attributes',
|
|
6
|
-
REQUEST_STORAGE_NAMESPACES = 'amedia-user.request-storage-namespaces',
|
|
7
|
-
SAVE_STORAGE = 'amedia-user.save-storage-namespaces',
|
|
8
|
-
UPDATE_STORAGE = 'amedia-user.update-storage-namespaces',
|
|
9
|
-
ON_ATTRIBUTES_UPDATED = 'amedia-user.on-user-attributes-updated',
|
|
10
|
-
ON_STATE_UPDATED = 'amedia-user.on-state-updated',
|
|
11
|
-
ON_STORAGE_UPDATED = 'amedia-user.on-storage-updated',
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
declare global {
|
|
15
|
-
interface WindowEventMap {
|
|
16
|
-
[AmediaUserEvents.REQUEST_STATE]: CustomEvent;
|
|
17
|
-
[AmediaUserEvents.REQUEST_USER_ATTRIBUTES]: CustomEvent<
|
|
18
|
-
Array<keyof UserAttributes>
|
|
19
|
-
>;
|
|
20
|
-
[AmediaUserEvents.REQUEST_STORAGE_NAMESPACES]: CustomEvent<Array<string>>;
|
|
21
|
-
[AmediaUserEvents.SAVE_STORAGE]: CustomEvent<{
|
|
22
|
-
[namespace: string]: object;
|
|
23
|
-
}>;
|
|
24
|
-
[AmediaUserEvents.UPDATE_STORAGE]: CustomEvent<{
|
|
25
|
-
[namespace: string]: object;
|
|
26
|
-
}>;
|
|
27
|
-
// @ts-ignore
|
|
28
|
-
[AmediaUserEvents.ON_ATTRIBUTES_UPDATED]: CustomEvent<UserAttributes>;
|
|
29
|
-
[AmediaUserEvents.ON_STATE_UPDATED]: CustomEvent<State>;
|
|
30
|
-
[AmediaUserEvents.ON_STORAGE_UPDATED]: CustomEvent<{
|
|
31
|
-
[index: string]: unknown;
|
|
32
|
-
}>;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
import { dispatch, listenForAllEvents } from '../utils/customEventWrapper';
|
|
2
|
-
import store from '../store';
|
|
3
|
-
import { AmediaUserEvents } from './eventMap';
|
|
4
|
-
import { listenForStateRequests } from './state';
|
|
5
|
-
|
|
6
|
-
beforeEach(() => {
|
|
7
|
-
store.clear();
|
|
8
|
-
});
|
|
9
|
-
|
|
10
|
-
describe('listenForUserAttributeRequests', () => {
|
|
11
|
-
let currentState: any;
|
|
12
|
-
beforeEach(() => {
|
|
13
|
-
listenForAllEvents(AmediaUserEvents.ON_STATE_UPDATED, (evt) => {
|
|
14
|
-
currentState = evt.detail;
|
|
15
|
-
});
|
|
16
|
-
listenForStateRequests();
|
|
17
|
-
});
|
|
18
|
-
|
|
19
|
-
describe('when empty initial state', () => {
|
|
20
|
-
beforeEach(() => {
|
|
21
|
-
dispatch(new CustomEvent(AmediaUserEvents.REQUEST_STATE));
|
|
22
|
-
});
|
|
23
|
-
it('should not return empty state', () => {
|
|
24
|
-
expect(currentState).toBeUndefined();
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
describe('with initial state', () => {
|
|
29
|
-
beforeEach(() => {
|
|
30
|
-
store.set('state', { isLoggedIn: false });
|
|
31
|
-
dispatch(new CustomEvent(AmediaUserEvents.REQUEST_STATE));
|
|
32
|
-
});
|
|
33
|
-
it('should return expected state', () => {
|
|
34
|
-
expect(currentState).toEqual({ isLoggedIn: false });
|
|
35
|
-
});
|
|
36
|
-
describe('when state changes', () => {
|
|
37
|
-
beforeEach(() => {
|
|
38
|
-
store.merge('state', { emergencyMode: ['aid'] });
|
|
39
|
-
});
|
|
40
|
-
it('should have updated state', () => {
|
|
41
|
-
expect(currentState).toEqual({
|
|
42
|
-
isLoggedIn: false,
|
|
43
|
-
emergencyMode: ['aid'],
|
|
44
|
-
});
|
|
45
|
-
});
|
|
46
|
-
});
|
|
47
|
-
});
|
|
48
|
-
});
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import { dispatch, listenWithExclusivity } from '../utils/customEventWrapper';
|
|
2
|
-
import store from '../store';
|
|
3
|
-
import { AmediaUserEvents } from './eventMap';
|
|
4
|
-
|
|
5
|
-
export const listenForStateRequests = () => {
|
|
6
|
-
listenWithExclusivity(AmediaUserEvents.REQUEST_STATE, () => {
|
|
7
|
-
const state = store.get('state');
|
|
8
|
-
if (state && Object.keys(state).length > 0) {
|
|
9
|
-
dispatch(
|
|
10
|
-
new CustomEvent(AmediaUserEvents.ON_STATE_UPDATED, {
|
|
11
|
-
detail: state,
|
|
12
|
-
})
|
|
13
|
-
);
|
|
14
|
-
}
|
|
15
|
-
store.on('state', (updatedState) => {
|
|
16
|
-
dispatch(
|
|
17
|
-
new CustomEvent(AmediaUserEvents.ON_STATE_UPDATED, {
|
|
18
|
-
detail: updatedState,
|
|
19
|
-
})
|
|
20
|
-
);
|
|
21
|
-
});
|
|
22
|
-
});
|
|
23
|
-
};
|
|
@@ -1,114 +0,0 @@
|
|
|
1
|
-
import { dispatch, listenForAllEvents } from '../utils/customEventWrapper';
|
|
2
|
-
import * as userData from '../actions/userData';
|
|
3
|
-
import * as storage from '../actions/storage';
|
|
4
|
-
import store from '../store';
|
|
5
|
-
import { listenForStorageRequests } from './storage';
|
|
6
|
-
import { AmediaUserEvents } from './eventMap';
|
|
7
|
-
|
|
8
|
-
beforeEach(() => {
|
|
9
|
-
store.clear();
|
|
10
|
-
});
|
|
11
|
-
|
|
12
|
-
describe('listenForStorageRequests', () => {
|
|
13
|
-
let currentStorage: any;
|
|
14
|
-
beforeEach(() => {
|
|
15
|
-
listenForAllEvents(AmediaUserEvents.ON_STORAGE_UPDATED, (evt) => {
|
|
16
|
-
currentStorage = evt.detail;
|
|
17
|
-
});
|
|
18
|
-
listenForStorageRequests();
|
|
19
|
-
jest
|
|
20
|
-
.spyOn(userData, 'requestAttributes')
|
|
21
|
-
.mockReturnValue(Promise.resolve());
|
|
22
|
-
jest.spyOn(storage, 'requestStorage').mockReturnValue();
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
describe('AmediaUserEvents.REQUEST_STORAGE_NAMESPACES received', () => {
|
|
26
|
-
beforeEach(() => {
|
|
27
|
-
store.set('state', { isLoggedIn: true });
|
|
28
|
-
});
|
|
29
|
-
|
|
30
|
-
describe('no previous namespaces', () => {
|
|
31
|
-
beforeEach(() => {
|
|
32
|
-
dispatch(
|
|
33
|
-
new CustomEvent(AmediaUserEvents.REQUEST_STORAGE_NAMESPACES, {
|
|
34
|
-
detail: ['privacy_preferences', 'euucp', 'favorite_teams'],
|
|
35
|
-
})
|
|
36
|
-
);
|
|
37
|
-
});
|
|
38
|
-
it('calls requestAttributes with requested attributes', () => {
|
|
39
|
-
expect(storage.requestStorage).toHaveBeenCalledWith([
|
|
40
|
-
'privacy_preferences',
|
|
41
|
-
'euucp',
|
|
42
|
-
'favorite_teams',
|
|
43
|
-
]);
|
|
44
|
-
});
|
|
45
|
-
it('does not receive a storage event', () => {
|
|
46
|
-
expect(currentStorage).toBeUndefined();
|
|
47
|
-
});
|
|
48
|
-
});
|
|
49
|
-
|
|
50
|
-
describe('with some namespaces', () => {
|
|
51
|
-
beforeEach(() => {
|
|
52
|
-
store.set('storage', {
|
|
53
|
-
favorite_teams: { stabaek: true, sf: true },
|
|
54
|
-
});
|
|
55
|
-
dispatch(
|
|
56
|
-
new CustomEvent(AmediaUserEvents.REQUEST_STORAGE_NAMESPACES, {
|
|
57
|
-
detail: ['privacy_preferences', 'euucp', 'favorite_teams'],
|
|
58
|
-
})
|
|
59
|
-
);
|
|
60
|
-
});
|
|
61
|
-
it('calls requestStorage with only namespaces we did not already have', () => {
|
|
62
|
-
expect(storage.requestStorage).toHaveBeenCalledWith([
|
|
63
|
-
'privacy_preferences',
|
|
64
|
-
'euucp',
|
|
65
|
-
]);
|
|
66
|
-
});
|
|
67
|
-
it('receives initial event with previous namespaces', () => {
|
|
68
|
-
expect(currentStorage).toEqual({
|
|
69
|
-
favorite_teams: { stabaek: true, sf: true },
|
|
70
|
-
});
|
|
71
|
-
});
|
|
72
|
-
});
|
|
73
|
-
|
|
74
|
-
describe('with previous state and all attributes', () => {
|
|
75
|
-
beforeEach(() => {
|
|
76
|
-
store.set('storage', {
|
|
77
|
-
favorite_teams: { stabaek: true, sf: true },
|
|
78
|
-
privacy_preferences: { ads: true, tracking: true },
|
|
79
|
-
euucp: { what_is: 'this' },
|
|
80
|
-
});
|
|
81
|
-
dispatch(
|
|
82
|
-
new CustomEvent(AmediaUserEvents.REQUEST_STORAGE_NAMESPACES, {
|
|
83
|
-
detail: ['privacy_preferences', 'euucp', 'favorite_teams'],
|
|
84
|
-
})
|
|
85
|
-
);
|
|
86
|
-
});
|
|
87
|
-
it('does not call requestAttributes', () => {
|
|
88
|
-
expect(storage.requestStorage).not.toHaveBeenCalled();
|
|
89
|
-
});
|
|
90
|
-
it('receives initial event with all namespaces', () => {
|
|
91
|
-
expect(currentStorage).toEqual({
|
|
92
|
-
favorite_teams: { stabaek: true, sf: true },
|
|
93
|
-
privacy_preferences: { ads: true, tracking: true },
|
|
94
|
-
euucp: { what_is: 'this' },
|
|
95
|
-
});
|
|
96
|
-
});
|
|
97
|
-
});
|
|
98
|
-
|
|
99
|
-
describe('when is not logged in', () => {
|
|
100
|
-
beforeEach(() => {
|
|
101
|
-
store.set('state', { isLoggedIn: false });
|
|
102
|
-
dispatch(
|
|
103
|
-
new CustomEvent(AmediaUserEvents.REQUEST_STORAGE_NAMESPACES, {
|
|
104
|
-
detail: ['privacy_preferences', 'euucp', 'favorite_teams'],
|
|
105
|
-
})
|
|
106
|
-
);
|
|
107
|
-
});
|
|
108
|
-
|
|
109
|
-
it('does not call requestAttributes', () => {
|
|
110
|
-
expect(storage.requestStorage).not.toHaveBeenCalled();
|
|
111
|
-
});
|
|
112
|
-
});
|
|
113
|
-
});
|
|
114
|
-
});
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
import store from '../store';
|
|
2
|
-
import { dispatch, listenWithExclusivity } from '../utils/customEventWrapper';
|
|
3
|
-
import { AmediaUserEvents } from './eventMap';
|
|
4
|
-
import { requestStorage, saveStorage, updateStorage } from '../actions/storage';
|
|
5
|
-
import { whenIsLoggedIn } from '../utils/loginState';
|
|
6
|
-
|
|
7
|
-
export const listenForStorageRequests = () => {
|
|
8
|
-
store.on('storage', (storage) => {
|
|
9
|
-
dispatch(
|
|
10
|
-
new CustomEvent(AmediaUserEvents.ON_STORAGE_UPDATED, { detail: storage })
|
|
11
|
-
);
|
|
12
|
-
});
|
|
13
|
-
|
|
14
|
-
listenWithExclusivity(AmediaUserEvents.REQUEST_STORAGE_NAMESPACES, (evt) => {
|
|
15
|
-
whenIsLoggedIn().then(() => {
|
|
16
|
-
const requestedNamespaces = evt.detail;
|
|
17
|
-
const currentStorage = store.get('storage') || {};
|
|
18
|
-
if (Object.keys(currentStorage).length > 0) {
|
|
19
|
-
dispatch(
|
|
20
|
-
new CustomEvent(AmediaUserEvents.ON_STORAGE_UPDATED, {
|
|
21
|
-
detail: currentStorage,
|
|
22
|
-
})
|
|
23
|
-
);
|
|
24
|
-
}
|
|
25
|
-
const missingNamespaces = requestedNamespaces.filter(
|
|
26
|
-
(namespace) => currentStorage[namespace] === undefined
|
|
27
|
-
);
|
|
28
|
-
if (missingNamespaces.length > 0) {
|
|
29
|
-
requestStorage(missingNamespaces);
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
});
|
|
33
|
-
|
|
34
|
-
listenWithExclusivity(AmediaUserEvents.UPDATE_STORAGE, (evt) => {
|
|
35
|
-
whenIsLoggedIn().then(() => {
|
|
36
|
-
updateStorage(evt.detail);
|
|
37
|
-
});
|
|
38
|
-
});
|
|
39
|
-
|
|
40
|
-
listenWithExclusivity(AmediaUserEvents.SAVE_STORAGE, (evt) => {
|
|
41
|
-
whenIsLoggedIn().then(() => {
|
|
42
|
-
saveStorage(evt.detail);
|
|
43
|
-
});
|
|
44
|
-
});
|
|
45
|
-
};
|
|
@@ -1,93 +0,0 @@
|
|
|
1
|
-
import { dispatch, listenForAllEvents } from '../utils/customEventWrapper';
|
|
2
|
-
import { listenForUserAttributeRequests } from './userAttributes';
|
|
3
|
-
import * as userData from '../actions/userData';
|
|
4
|
-
import store from '../store';
|
|
5
|
-
import { AmediaUserEvents } from './eventMap';
|
|
6
|
-
|
|
7
|
-
beforeEach(() => {
|
|
8
|
-
store.clear();
|
|
9
|
-
});
|
|
10
|
-
|
|
11
|
-
describe('listenForUserAttributeRequests', () => {
|
|
12
|
-
let currentAttributes: any;
|
|
13
|
-
beforeEach(() => {
|
|
14
|
-
listenForAllEvents(AmediaUserEvents.ON_ATTRIBUTES_UPDATED, (evt) => {
|
|
15
|
-
currentAttributes = evt.detail;
|
|
16
|
-
});
|
|
17
|
-
listenForUserAttributeRequests();
|
|
18
|
-
jest
|
|
19
|
-
.spyOn(userData, 'requestAttributes')
|
|
20
|
-
.mockReturnValue(Promise.resolve());
|
|
21
|
-
});
|
|
22
|
-
|
|
23
|
-
describe('AmediaUserEvents.REQUEST_USER_ATTRIBUTES received', () => {
|
|
24
|
-
describe('no previous attributes', () => {
|
|
25
|
-
beforeEach(() => {
|
|
26
|
-
dispatch(
|
|
27
|
-
new CustomEvent(AmediaUserEvents.REQUEST_USER_ATTRIBUTES, {
|
|
28
|
-
detail: ['uuid', 'name', 'email'],
|
|
29
|
-
})
|
|
30
|
-
);
|
|
31
|
-
});
|
|
32
|
-
it('calls requestAttributes with requested attributes', () => {
|
|
33
|
-
expect(userData.requestAttributes).toHaveBeenCalledWith([
|
|
34
|
-
'uuid',
|
|
35
|
-
'name',
|
|
36
|
-
'email',
|
|
37
|
-
]);
|
|
38
|
-
});
|
|
39
|
-
it('does not receive an attribute event', () => {
|
|
40
|
-
expect(currentAttributes).toBeUndefined();
|
|
41
|
-
});
|
|
42
|
-
});
|
|
43
|
-
|
|
44
|
-
describe('with some attributes present already', () => {
|
|
45
|
-
beforeEach(() => {
|
|
46
|
-
store.set('userAttributes', {
|
|
47
|
-
uuid: 'someuuid',
|
|
48
|
-
});
|
|
49
|
-
dispatch(
|
|
50
|
-
new CustomEvent(AmediaUserEvents.REQUEST_USER_ATTRIBUTES, {
|
|
51
|
-
detail: ['uuid', 'name', 'email'],
|
|
52
|
-
})
|
|
53
|
-
);
|
|
54
|
-
});
|
|
55
|
-
it('calls requestAttributes with only attributes we did not already know the value of', () => {
|
|
56
|
-
expect(userData.requestAttributes).toHaveBeenCalledWith([
|
|
57
|
-
'name',
|
|
58
|
-
'email',
|
|
59
|
-
]);
|
|
60
|
-
});
|
|
61
|
-
it('receives initial event with previous attributes', () => {
|
|
62
|
-
expect(currentAttributes).toEqual({
|
|
63
|
-
uuid: 'someuuid',
|
|
64
|
-
});
|
|
65
|
-
});
|
|
66
|
-
});
|
|
67
|
-
|
|
68
|
-
describe('with all attributes present already', () => {
|
|
69
|
-
beforeEach(() => {
|
|
70
|
-
store.set('userAttributes', {
|
|
71
|
-
uuid: 'someuuid',
|
|
72
|
-
name: 'Some Name',
|
|
73
|
-
email: 'some@where.com',
|
|
74
|
-
});
|
|
75
|
-
dispatch(
|
|
76
|
-
new CustomEvent(AmediaUserEvents.REQUEST_USER_ATTRIBUTES, {
|
|
77
|
-
detail: ['uuid', 'name', 'email'],
|
|
78
|
-
})
|
|
79
|
-
);
|
|
80
|
-
});
|
|
81
|
-
it('does not call requestAttributes', () => {
|
|
82
|
-
expect(userData.requestAttributes).not.toHaveBeenCalled();
|
|
83
|
-
});
|
|
84
|
-
it('receives initial event with all attributes', () => {
|
|
85
|
-
expect(currentAttributes).toEqual({
|
|
86
|
-
uuid: 'someuuid',
|
|
87
|
-
name: 'Some Name',
|
|
88
|
-
email: 'some@where.com',
|
|
89
|
-
});
|
|
90
|
-
});
|
|
91
|
-
});
|
|
92
|
-
});
|
|
93
|
-
});
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
import { requestAttributes } from '../actions/userData';
|
|
2
|
-
import { dispatch, listenWithExclusivity } from '../utils/customEventWrapper';
|
|
3
|
-
import store from '../store';
|
|
4
|
-
import { AmediaUserEvents } from './eventMap';
|
|
5
|
-
|
|
6
|
-
export const listenForUserAttributeRequests = () => {
|
|
7
|
-
store.on('userAttributes', (user) => {
|
|
8
|
-
dispatch(
|
|
9
|
-
new CustomEvent(AmediaUserEvents.ON_ATTRIBUTES_UPDATED, {
|
|
10
|
-
detail: user,
|
|
11
|
-
})
|
|
12
|
-
);
|
|
13
|
-
});
|
|
14
|
-
listenWithExclusivity(AmediaUserEvents.REQUEST_USER_ATTRIBUTES, (evt) => {
|
|
15
|
-
const requestedAttributes = evt.detail;
|
|
16
|
-
const currentAttributes = store.get('userAttributes') || {};
|
|
17
|
-
if (Object.keys(currentAttributes).length > 0) {
|
|
18
|
-
dispatch(
|
|
19
|
-
new CustomEvent(AmediaUserEvents.ON_ATTRIBUTES_UPDATED, {
|
|
20
|
-
detail: currentAttributes,
|
|
21
|
-
})
|
|
22
|
-
);
|
|
23
|
-
}
|
|
24
|
-
const missingAttributes = requestedAttributes.filter(
|
|
25
|
-
(attribute) => currentAttributes[attribute] === undefined
|
|
26
|
-
);
|
|
27
|
-
if (missingAttributes.length > 0) {
|
|
28
|
-
requestAttributes(missingAttributes);
|
|
29
|
-
}
|
|
30
|
-
});
|
|
31
|
-
};
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
class PaywallError extends Error {
|
|
2
|
-
static ERROR_RELOADED_NO_ACCESS = 'RELOADED_NO_ACCESS';
|
|
3
|
-
|
|
4
|
-
static ERROR_ENABLING_ACCESS_FAILED = 'ENABLING_ACCESS_FAILED';
|
|
5
|
-
|
|
6
|
-
static ERROR_NO_ACCESS_AFTER_SUCCESSFUL_ACTIVATION_WITH_REQUESTED_ACCESS_FEATURES =
|
|
7
|
-
'NO_ACCESS_AFTER_SUCCESSFUL_ACTIVATION_WITH_REQUESTED_ACCESS_FEATURES';
|
|
8
|
-
|
|
9
|
-
public code: string;
|
|
10
|
-
|
|
11
|
-
constructor(message: string, code: string) {
|
|
12
|
-
super(message);
|
|
13
|
-
this.code = code;
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
export default PaywallError;
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
import { goToLoginPage, logout } from './index';
|
|
2
|
-
import * as authentication from './actions/authentication';
|
|
3
|
-
import { listenForAuthenticationRequests } from './eventHandlers/authentication';
|
|
4
|
-
|
|
5
|
-
beforeEach(() => {
|
|
6
|
-
listenForAuthenticationRequests();
|
|
7
|
-
});
|
|
8
|
-
|
|
9
|
-
describe('Public endpoint - authentication', () => {
|
|
10
|
-
it('should call callback on logout complete', async () => {
|
|
11
|
-
jest
|
|
12
|
-
.spyOn(authentication, 'logout')
|
|
13
|
-
.mockImplementation(() => Promise.resolve());
|
|
14
|
-
|
|
15
|
-
await logout();
|
|
16
|
-
expect(authentication.logout).toHaveBeenCalledTimes(1);
|
|
17
|
-
});
|
|
18
|
-
|
|
19
|
-
it('should login', () => {
|
|
20
|
-
jest.spyOn(authentication, 'login').mockImplementation();
|
|
21
|
-
goToLoginPage('https://www.avisnavn.no');
|
|
22
|
-
expect(authentication.login).toHaveBeenCalledWith(
|
|
23
|
-
'https://www.avisnavn.no'
|
|
24
|
-
);
|
|
25
|
-
});
|
|
26
|
-
});
|
|
@@ -1,144 +0,0 @@
|
|
|
1
|
-
import * as europa from './clients/europa';
|
|
2
|
-
import { saveStorage, updateStorage } from './index';
|
|
3
|
-
import store from './store';
|
|
4
|
-
import UserDataRequest from './lib/UserDataRequest';
|
|
5
|
-
import { listenForStorageRequests } from './eventHandlers/storage';
|
|
6
|
-
import { listenForStateRequests } from './eventHandlers/state';
|
|
7
|
-
|
|
8
|
-
beforeEach(() => {
|
|
9
|
-
// Store must be cleared before we listen for user attribute requests
|
|
10
|
-
store.clear();
|
|
11
|
-
|
|
12
|
-
listenForStateRequests();
|
|
13
|
-
listenForStorageRequests();
|
|
14
|
-
});
|
|
15
|
-
|
|
16
|
-
describe('Storage', () => {
|
|
17
|
-
beforeEach(() => {
|
|
18
|
-
spyOn(europa, 'saveNamespace');
|
|
19
|
-
spyOn(europa, 'updateNamespace');
|
|
20
|
-
});
|
|
21
|
-
|
|
22
|
-
describe('when is logged in', () => {
|
|
23
|
-
beforeEach(() => {
|
|
24
|
-
store.set('state', { isLoggedIn: true });
|
|
25
|
-
});
|
|
26
|
-
|
|
27
|
-
describe('when saving storage', () => {
|
|
28
|
-
beforeEach(() => {
|
|
29
|
-
saveStorage({
|
|
30
|
-
user_info: {
|
|
31
|
-
some: 'data',
|
|
32
|
-
},
|
|
33
|
-
});
|
|
34
|
-
});
|
|
35
|
-
it('should save storage', () => {
|
|
36
|
-
expect(europa.saveNamespace).toHaveBeenCalledWith('user_info', {
|
|
37
|
-
some: 'data',
|
|
38
|
-
});
|
|
39
|
-
});
|
|
40
|
-
});
|
|
41
|
-
|
|
42
|
-
describe('when updating storage', () => {
|
|
43
|
-
beforeEach(() => {
|
|
44
|
-
updateStorage({
|
|
45
|
-
user_info: {
|
|
46
|
-
some: 'data',
|
|
47
|
-
},
|
|
48
|
-
});
|
|
49
|
-
});
|
|
50
|
-
it('should update storage', () => {
|
|
51
|
-
expect(europa.updateNamespace).toHaveBeenCalledWith('user_info', {
|
|
52
|
-
some: 'data',
|
|
53
|
-
});
|
|
54
|
-
});
|
|
55
|
-
});
|
|
56
|
-
|
|
57
|
-
describe('when getting storage namespaces', () => {
|
|
58
|
-
let onUpdate: any;
|
|
59
|
-
beforeEach(() => {
|
|
60
|
-
store.set('storage', {
|
|
61
|
-
one: { key1: 'value1' },
|
|
62
|
-
two: { key2: 'value2' },
|
|
63
|
-
three: { key3: 'value3' },
|
|
64
|
-
});
|
|
65
|
-
|
|
66
|
-
onUpdate = jest.fn();
|
|
67
|
-
new UserDataRequest().withStorage(['one', 'three']).subscribe(onUpdate);
|
|
68
|
-
});
|
|
69
|
-
|
|
70
|
-
it('should only return requested', () => {
|
|
71
|
-
expect(onUpdate).toHaveBeenCalledWith({
|
|
72
|
-
storage: {
|
|
73
|
-
one: {
|
|
74
|
-
key1: 'value1',
|
|
75
|
-
},
|
|
76
|
-
three: {
|
|
77
|
-
key3: 'value3',
|
|
78
|
-
},
|
|
79
|
-
},
|
|
80
|
-
state: {
|
|
81
|
-
isLoggedIn: true,
|
|
82
|
-
},
|
|
83
|
-
});
|
|
84
|
-
});
|
|
85
|
-
});
|
|
86
|
-
});
|
|
87
|
-
|
|
88
|
-
describe('when not logged in', () => {
|
|
89
|
-
beforeEach(() => {
|
|
90
|
-
store.set('state', { isLoggedIn: false });
|
|
91
|
-
});
|
|
92
|
-
|
|
93
|
-
describe('when saving storage', () => {
|
|
94
|
-
beforeEach(() => {
|
|
95
|
-
saveStorage({
|
|
96
|
-
user_info: {
|
|
97
|
-
some: 'data',
|
|
98
|
-
},
|
|
99
|
-
});
|
|
100
|
-
});
|
|
101
|
-
it('should not attempt storage save', () => {
|
|
102
|
-
expect(europa.saveNamespace).not.toHaveBeenCalled();
|
|
103
|
-
});
|
|
104
|
-
});
|
|
105
|
-
|
|
106
|
-
describe('when updating storage', () => {
|
|
107
|
-
beforeEach(() => {
|
|
108
|
-
updateStorage({
|
|
109
|
-
user_info: {
|
|
110
|
-
some: 'data',
|
|
111
|
-
},
|
|
112
|
-
});
|
|
113
|
-
});
|
|
114
|
-
it('should not attempt storage update', () => {
|
|
115
|
-
expect(europa.updateNamespace).not.toHaveBeenCalled();
|
|
116
|
-
});
|
|
117
|
-
});
|
|
118
|
-
|
|
119
|
-
describe('when getting storage namespaces', () => {
|
|
120
|
-
let onUpdate: any;
|
|
121
|
-
beforeEach(() => {
|
|
122
|
-
store.set('storage', {
|
|
123
|
-
one: { key1: 'value1' },
|
|
124
|
-
two: { key2: 'value2' },
|
|
125
|
-
three: { key3: 'value3' },
|
|
126
|
-
});
|
|
127
|
-
|
|
128
|
-
onUpdate = jest.fn();
|
|
129
|
-
new UserDataRequest().withStorage(['one', 'three']).subscribe(onUpdate);
|
|
130
|
-
});
|
|
131
|
-
|
|
132
|
-
it('should have been called once', () => {
|
|
133
|
-
expect(onUpdate).toHaveBeenCalledTimes(1);
|
|
134
|
-
});
|
|
135
|
-
|
|
136
|
-
it('should never return namespaces', () => {
|
|
137
|
-
expect(onUpdate).toHaveBeenCalledWith({
|
|
138
|
-
state: { isLoggedIn: false },
|
|
139
|
-
storage: {},
|
|
140
|
-
});
|
|
141
|
-
});
|
|
142
|
-
});
|
|
143
|
-
});
|
|
144
|
-
});
|