@lenne.tech/ng-base 0.3.9 → 0.3.12
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/bundles/lenne.tech-ng-base-src-lib-base.umd.js +38 -27
- package/bundles/lenne.tech-ng-base-src-lib-base.umd.js.map +1 -1
- package/bundles/lenne.tech-ng-base.umd.js +37 -27
- package/bundles/lenne.tech-ng-base.umd.js.map +1 -1
- package/esm2015/lib/base/base.module.js +3 -2
- package/esm2015/lib/base/factories/apollo-options.factory.js +14 -24
- package/esm2015/lib/base/services/auth.service.js +9 -4
- package/esm2015/lib/base/services/ws.service.js +16 -0
- package/esm2015/src/lib/base/base.module.js +3 -2
- package/esm2015/src/lib/base/factories/apollo-options.factory.js +14 -24
- package/esm2015/src/lib/base/lenne.tech-ng-base-src-lib-base.js +2 -1
- package/esm2015/src/lib/base/services/auth.service.js +9 -4
- package/esm2015/src/lib/base/services/ws.service.js +16 -0
- package/fesm2015/lenne.tech-ng-base-src-lib-base.js +35 -28
- package/fesm2015/lenne.tech-ng-base-src-lib-base.js.map +1 -1
- package/fesm2015/lenne.tech-ng-base.js +34 -27
- package/fesm2015/lenne.tech-ng-base.js.map +1 -1
- package/lib/base/factories/apollo-options.factory.d.ts +2 -1
- package/lib/base/services/auth.service.d.ts +3 -1
- package/lib/base/services/ws.service.d.ts +5 -0
- package/package.json +1 -1
- package/src/lib/base/factories/apollo-options.factory.d.ts +2 -1
- package/src/lib/base/lenne.tech-ng-base-src-lib-base.d.ts +1 -0
- package/src/lib/base/lenne.tech-ng-base-src-lib-base.metadata.json +1 -1
- package/src/lib/base/services/auth.service.d.ts +3 -1
- package/src/lib/base/services/ws.service.d.ts +5 -0
|
@@ -10,6 +10,7 @@ import { MatchHeightDirective } from './directives/match-height.directive';
|
|
|
10
10
|
import { ResizableDirective } from './directives/resizable.directive';
|
|
11
11
|
import { EllipsesPipe } from './pipes/ellipses.pipe';
|
|
12
12
|
import { SafeHtmlPipe } from './pipes/safe-html.pipe';
|
|
13
|
+
import { WsService } from './services/ws.service';
|
|
13
14
|
// Imported and exported elements
|
|
14
15
|
const elements = [
|
|
15
16
|
// Directives
|
|
@@ -43,7 +44,7 @@ export class BaseModule {
|
|
|
43
44
|
providers.push({
|
|
44
45
|
provide: APOLLO_OPTIONS,
|
|
45
46
|
useFactory: apolloOptionsFactory,
|
|
46
|
-
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService],
|
|
47
|
+
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService, WsService],
|
|
47
48
|
});
|
|
48
49
|
}
|
|
49
50
|
else if (config.logging) {
|
|
@@ -62,4 +63,4 @@ BaseModule.decorators = [
|
|
|
62
63
|
exports: elements,
|
|
63
64
|
},] }
|
|
64
65
|
];
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZy1iYXNlL3NyYy9saWIvYmFzZS9iYXNlLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQy9DLE9BQU8sRUFBdUIsUUFBUSxFQUFZLE1BQU0sZUFBZSxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsa0JBQWtCLEVBQW9CLE1BQU0sMkNBQTJDLENBQUM7QUFDakcsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDMUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDckUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEQsaUNBQWlDO0FBQ2pDLE1BQU0sUUFBUSxHQUFHO0lBQ2YsYUFBYTtJQUNiLG9CQUFvQjtJQUNwQixpQkFBaUI7SUFDakIsb0JBQW9CO0lBQ3BCLGtCQUFrQjtJQUVsQixRQUFRO0lBQ1IsWUFBWTtJQUNaLFlBQVk7Q0FDYixDQUFDO0FBRUY7O0dBRUc7QUFLSCxNQUFNLE9BQU8sVUFBVTtJQUNyQjs7T0FFRztJQUNILE1BQU0sQ0FBQyxPQUFPLENBQUMsbUJBQXFDLEVBQUU7UUFDcEQsaUJBQWlCO1FBQ2pCLE1BQU0sTUFBTSxtQkFDVixNQUFNLEVBQUUsZ0JBQWdCLEVBQ3hCLG9CQUFvQixFQUFFLE9BQU8sRUFDN0IsT0FBTyxFQUFFLEtBQUssRUFDZCxPQUFPLEVBQUUsSUFBSSxFQUNiLE1BQU0sRUFBRSxJQUFJLEVBQ1oscUJBQXFCLEVBQUUsR0FBRyxFQUMxQixZQUFZLEVBQUUsR0FBRyxFQUNqQixXQUFXLEVBQUUsT0FBTyxJQUNqQixnQkFBZ0IsQ0FDcEIsQ0FBQztRQUVGLG9CQUFvQjtRQUNwQixNQUFNLFNBQVMsR0FBZTtZQUM1QjtnQkFDRSxPQUFPLEVBQUUsa0JBQWtCO2dCQUMzQixRQUFRLEVBQUUsZ0JBQWdCO2FBQzNCO1NBQ0YsQ0FBQztRQUVGLHdDQUF3QztRQUN4QyxJQUFJLGdCQUFnQixDQUFDLE1BQU0sRUFBRTtZQUMzQixTQUFTLENBQUMsSUFBSSxDQUFDO2dCQUNiLE9BQU8sRUFBRSxjQUFjO2dCQUN2QixVQUFVLEVBQUUsb0JBQW9CO2dCQUNoQyxJQUFJLEVBQUUsQ0FBQyxrQkFBa0IsRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQzthQUM3RCxDQUFDLENBQUM7U0FDSjthQUFNLElBQUksTUFBTSxDQUFDLE9BQU8sRUFBRTtZQUN6QixPQUFPLENBQUMsR0FBRyxDQUFDLGtEQUFrRCxDQUFDLENBQUM7U0FDakU7UUFFRCxxQkFBcUI7UUFDckIsT0FBTztZQUNMLFFBQVEsRUFBRSxVQUFVO1lBQ3BCLFNBQVM7U0FDVixDQUFDO0lBQ0osQ0FBQzs7O1lBOUNGLFFBQVEsU0FBQztnQkFDUixZQUFZLEVBQUUsUUFBUTtnQkFDdEIsT0FBTyxFQUFFLFFBQVE7YUFDbEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBUE9MTE9fT1BUSU9OUyB9IGZyb20gJ2Fwb2xsby1hbmd1bGFyJztcbmltcG9ydCB7IEh0dHBMaW5rIH0gZnJvbSAnYXBvbGxvLWFuZ3VsYXIvaHR0cCc7XG5pbXBvcnQgeyBNb2R1bGVXaXRoUHJvdmlkZXJzLCBOZ01vZHVsZSwgUHJvdmlkZXIgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEF1dGhTZXJ2aWNlIH0gZnJvbSAnLi9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgQkFTRV9NT0RVTEVfQ09ORklHLCBCYXNlTW9kdWxlQ29uZmlnIH0gZnJvbSAnLi9pbnRlcmZhY2VzL2Jhc2UtbW9kdWxlLWNvbmZpZy5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgYXBvbGxvT3B0aW9uc0ZhY3RvcnkgfSBmcm9tICcuL2ZhY3Rvcmllcy9hcG9sbG8tb3B0aW9ucy5mYWN0b3J5JztcbmltcG9ydCB7IENvbnRleHRNZW51RGlyZWN0aXZlIH0gZnJvbSAnLi9kaXJlY3RpdmVzL2NvbnRleHQtbWVudS5kaXJlY3RpdmUnO1xuaW1wb3J0IHsgTGF6eUxvYWREaXJlY3RpdmUgfSBmcm9tICcuL2RpcmVjdGl2ZXMvbGF6eS1sb2FkLmRpcmVjdGl2ZSc7XG5pbXBvcnQgeyBNYXRjaEhlaWdodERpcmVjdGl2ZSB9IGZyb20gJy4vZGlyZWN0aXZlcy9tYXRjaC1oZWlnaHQuZGlyZWN0aXZlJztcbmltcG9ydCB7IFJlc2l6YWJsZURpcmVjdGl2ZSB9IGZyb20gJy4vZGlyZWN0aXZlcy9yZXNpemFibGUuZGlyZWN0aXZlJztcbmltcG9ydCB7IEVsbGlwc2VzUGlwZSB9IGZyb20gJy4vcGlwZXMvZWxsaXBzZXMucGlwZSc7XG5pbXBvcnQgeyBTYWZlSHRtbFBpcGUgfSBmcm9tICcuL3BpcGVzL3NhZmUtaHRtbC5waXBlJztcbmltcG9ydCB7IFdzU2VydmljZSB9IGZyb20gJy4vc2VydmljZXMvd3Muc2VydmljZSc7XG5cbi8vIEltcG9ydGVkIGFuZCBleHBvcnRlZCBlbGVtZW50c1xuY29uc3QgZWxlbWVudHMgPSBbXG4gIC8vIERpcmVjdGl2ZXNcbiAgQ29udGV4dE1lbnVEaXJlY3RpdmUsXG4gIExhenlMb2FkRGlyZWN0aXZlLFxuICBNYXRjaEhlaWdodERpcmVjdGl2ZSxcbiAgUmVzaXphYmxlRGlyZWN0aXZlLFxuXG4gIC8vIFBpcGVzXG4gIEVsbGlwc2VzUGlwZSxcbiAgU2FmZUh0bWxQaXBlLFxuXTtcblxuLyoqXG4gKiBCYXNlIG1vZHVsZVxuICovXG5ATmdNb2R1bGUoe1xuICBkZWNsYXJhdGlvbnM6IGVsZW1lbnRzLFxuICBleHBvcnRzOiBlbGVtZW50cyxcbn0pXG5leHBvcnQgY2xhc3MgQmFzZU1vZHVsZSB7XG4gIC8qKlxuICAgKiBTZXQgY29uZmlndXJhdGlvbiBvZiBiYXNlIG1vZHVsZSBpbiByb290IG1vZHVsZSBvZiB0aGUgYXBwXG4gICAqL1xuICBzdGF0aWMgZm9yUm9vdChiYXNlTW9kdWxlQ29uZmlnOiBCYXNlTW9kdWxlQ29uZmlnID0ge30pOiBNb2R1bGVXaXRoUHJvdmlkZXJzPEJhc2VNb2R1bGU+IHtcbiAgICAvLyBEZWZhdWx0IGNvbmZpZ1xuICAgIGNvbnN0IGNvbmZpZyA9IHtcbiAgICAgIGFwaVVybDogJ2xvY2FsaG9zdDozMDAwJyxcbiAgICAgIGF1dGhHdWFyZFJlZGlyZWN0VXJsOiAnL2F1dGgnLFxuICAgICAgbG9nZ2luZzogZmFsc2UsXG4gICAgICB2ZXJzaW9uOiBudWxsLFxuICAgICAgcHJlZml4OiBudWxsLFxuICAgICAgc2Nyb2xsRGV0ZWN0aW9uT2Zmc2V0OiAyMDAsXG4gICAgICBzY3JvbGxPZmZzZXQ6IDEwMCxcbiAgICAgIHN0b3JhZ2VUeXBlOiAnbG9jYWwnLFxuICAgICAgLi4uYmFzZU1vZHVsZUNvbmZpZyxcbiAgICB9O1xuXG4gICAgLy8gUHJlcGFyZSBwcm92aWRlcnNcbiAgICBjb25zdCBwcm92aWRlcnM6IFByb3ZpZGVyW10gPSBbXG4gICAgICB7XG4gICAgICAgIHByb3ZpZGU6IEJBU0VfTU9EVUxFX0NPTkZJRyxcbiAgICAgICAgdXNlVmFsdWU6IGJhc2VNb2R1bGVDb25maWcsXG4gICAgICB9LFxuICAgIF07XG5cbiAgICAvLyBBZGQgYXBvbGxvIGZlYXR1cmVzIGlmIEFQSSBVUkwgaXMgc2V0XG4gICAgaWYgKGJhc2VNb2R1bGVDb25maWcuYXBpVXJsKSB7XG4gICAgICBwcm92aWRlcnMucHVzaCh7XG4gICAgICAgIHByb3ZpZGU6IEFQT0xMT19PUFRJT05TLFxuICAgICAgICB1c2VGYWN0b3J5OiBhcG9sbG9PcHRpb25zRmFjdG9yeSxcbiAgICAgICAgZGVwczogW0JBU0VfTU9EVUxFX0NPTkZJRywgSHR0cExpbmssIEF1dGhTZXJ2aWNlLCBXc1NlcnZpY2VdLFxuICAgICAgfSk7XG4gICAgfSBlbHNlIGlmIChjb25maWcubG9nZ2luZykge1xuICAgICAgY29uc29sZS5sb2coJ2FwaVVybCBpcyBtaXNzaW5nLCBBcG9sbG9MaW5rIGlzIG5vdCBpbml0aWFsaXplZCcpO1xuICAgIH1cblxuICAgIC8vIFJldHVybiByb290IG1vZHVsZVxuICAgIHJldHVybiB7XG4gICAgICBuZ01vZHVsZTogQmFzZU1vZHVsZSxcbiAgICAgIHByb3ZpZGVycyxcbiAgICB9O1xuICB9XG59XG4iXX0=
|
|
@@ -5,7 +5,7 @@ import { getMainDefinition } from '@apollo/client/utilities';
|
|
|
5
5
|
/**
|
|
6
6
|
* Factory for apollo-angular options
|
|
7
7
|
*/
|
|
8
|
-
export function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
8
|
+
export function apolloOptionsFactory(baseModuleConfig, httpLink, authService, wsService) {
|
|
9
9
|
const links = [];
|
|
10
10
|
const defaultUrl = 'api.' + window.location.href + '/graphql';
|
|
11
11
|
const http = httpLink.create({
|
|
@@ -23,27 +23,17 @@ export function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
|
23
23
|
return forward(operation);
|
|
24
24
|
});
|
|
25
25
|
if (baseModuleConfig.wsUrl) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
wsClient = new WebSocketLink({
|
|
41
|
-
uri: baseModuleConfig.wsUrl,
|
|
42
|
-
options: {
|
|
43
|
-
reconnect: true,
|
|
44
|
-
},
|
|
45
|
-
});
|
|
46
|
-
}
|
|
26
|
+
const wsLink = new WebSocketLink({
|
|
27
|
+
uri: baseModuleConfig.wsUrl,
|
|
28
|
+
options: {
|
|
29
|
+
reconnect: true,
|
|
30
|
+
connectionParams: () => ({
|
|
31
|
+
Authorization: authService.token ? 'Bearer ' + authService.token : undefined,
|
|
32
|
+
}),
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
// Set client for reconnection on logout/login
|
|
36
|
+
wsService.client = wsLink.subscriptionClient;
|
|
47
37
|
// using the ability to split links, you can send data to each link
|
|
48
38
|
// depending on what kind of operation is being sent
|
|
49
39
|
links.push(split(
|
|
@@ -52,7 +42,7 @@ export function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
|
52
42
|
// @ts-ignore
|
|
53
43
|
const { kind, operation } = getMainDefinition(query);
|
|
54
44
|
return kind === 'OperationDefinition' && operation === 'subscription';
|
|
55
|
-
},
|
|
45
|
+
}, wsLink, concat(authMiddleware, http)));
|
|
56
46
|
}
|
|
57
47
|
else {
|
|
58
48
|
links.push(http);
|
|
@@ -68,4 +58,4 @@ export function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
|
68
58
|
},
|
|
69
59
|
};
|
|
70
60
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBvbGxvLW9wdGlvbnMuZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25nLWJhc2Uvc3JjL2xpYi9iYXNlL2ZhY3Rvcmllcy9hcG9sbG8tb3B0aW9ucy5mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHN0Q7O0dBRUc7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLGdCQUFrQyxFQUNsQyxRQUFrQixFQUNsQixXQUF3QixFQUN4QixTQUFvQjtJQUVwQixNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7SUFDakIsTUFBTSxVQUFVLEdBQUcsTUFBTSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQztJQUU5RCxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDO1FBQzNCLEdBQUcsRUFBRSxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsVUFBVSxHQUFHLFVBQVU7S0FDakYsQ0FBQyxDQUFDO0lBRUgsTUFBTSxjQUFjLEdBQUcsSUFBSSxVQUFVLENBQUMsQ0FBQyxTQUFTLEVBQUUsT0FBTyxFQUFFLEVBQUU7UUFDM0QsTUFBTSxPQUFPLEdBQVEsRUFBRSxDQUFDO1FBQ3hCLElBQUksWUFBWSxFQUFFO1lBQ2hCLE1BQU0sS0FBSyxHQUFHLFdBQVcsQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDO1lBQ3hDLElBQUksS0FBSyxFQUFFO2dCQUNULE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxHQUFHLEtBQUssQ0FBQzthQUMzQztZQUNELFNBQVMsQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQztTQUMzQztRQUNELE9BQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzVCLENBQUMsQ0FBQyxDQUFDO0lBRUgsSUFBSSxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUU7UUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSxhQUFhLENBQUM7WUFDL0IsR0FBRyxFQUFFLGdCQUFnQixDQUFDLEtBQUs7WUFDM0IsT0FBTyxFQUFFO2dCQUNQLFNBQVMsRUFBRSxJQUFJO2dCQUNmLGdCQUFnQixFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUM7b0JBQ3ZCLGFBQWEsRUFBRSxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsU0FBUztpQkFDN0UsQ0FBQzthQUNIO1NBQ0YsQ0FBQyxDQUFDO1FBRUgsOENBQThDO1FBQzlDLFNBQVMsQ0FBQyxNQUFNLEdBQUksTUFBYyxDQUFDLGtCQUFrQixDQUFDO1FBRXRELG1FQUFtRTtRQUNuRSxvREFBb0Q7UUFDcEQsS0FBSyxDQUFDLElBQUksQ0FDUixLQUFLO1FBQ0gsZ0NBQWdDO1FBQ2hDLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ1osYUFBYTtZQUNiLE1BQU0sRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLEdBQUcsaUJBQWlCLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDckQsT0FBTyxJQUFJLEtBQUsscUJBQXFCLElBQUksU0FBUyxLQUFLLGNBQWMsQ0FBQztRQUN4RSxDQUFDLEVBQ0QsTUFBTSxFQUNOLE1BQU0sQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUFDLENBQzdCLENBQ0YsQ0FBQztLQUNIO1NBQU07UUFDTCxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pCLEtBQUssQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7S0FDNUI7SUFFRCxPQUFPO1FBQ0wsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBQzVCLEtBQUssRUFBRSxJQUFJLGFBQWEsRUFBRTtRQUMxQixjQUFjLEVBQUU7WUFDZCxLQUFLLEVBQUU7Z0JBQ0wsV0FBVyxFQUFFLGNBQWM7YUFDNUI7U0FDRjtLQUNGLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cExpbmsgfSBmcm9tICdhcG9sbG8tYW5ndWxhci9odHRwJztcbmltcG9ydCB7IEJhc2VNb2R1bGVDb25maWcgfSBmcm9tICcuLi9pbnRlcmZhY2VzL2Jhc2UtbW9kdWxlLWNvbmZpZy5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgQXBvbGxvTGluaywgY29uY2F0LCBzcGxpdCB9IGZyb20gJ0BhcG9sbG8vY2xpZW50L2NvcmUnO1xuaW1wb3J0IHsgSW5NZW1vcnlDYWNoZSB9IGZyb20gJ0BhcG9sbG8vY2xpZW50L2NhY2hlJztcbmltcG9ydCB7IFdlYlNvY2tldExpbmsgfSBmcm9tICdAYXBvbGxvL2NsaWVudC9saW5rL3dzJztcbmltcG9ydCB7IGdldE1haW5EZWZpbml0aW9uIH0gZnJvbSAnQGFwb2xsby9jbGllbnQvdXRpbGl0aWVzJztcbmltcG9ydCB7IFdzU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL3dzLnNlcnZpY2UnO1xuXG4vKipcbiAqIEZhY3RvcnkgZm9yIGFwb2xsby1hbmd1bGFyIG9wdGlvbnNcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGFwb2xsb09wdGlvbnNGYWN0b3J5KFxuICBiYXNlTW9kdWxlQ29uZmlnOiBCYXNlTW9kdWxlQ29uZmlnLFxuICBodHRwTGluazogSHR0cExpbmssXG4gIGF1dGhTZXJ2aWNlOiBBdXRoU2VydmljZSxcbiAgd3NTZXJ2aWNlOiBXc1NlcnZpY2Vcbikge1xuICBjb25zdCBsaW5rcyA9IFtdO1xuICBjb25zdCBkZWZhdWx0VXJsID0gJ2FwaS4nICsgd2luZG93LmxvY2F0aW9uLmhyZWYgKyAnL2dyYXBocWwnO1xuXG4gIGNvbnN0IGh0dHAgPSBodHRwTGluay5jcmVhdGUoe1xuICAgIHVyaTogYmFzZU1vZHVsZUNvbmZpZy5hcGlVcmwgPyBiYXNlTW9kdWxlQ29uZmlnLmFwaVVybCA6ICdodHRwczovLycgKyBkZWZhdWx0VXJsLFxuICB9KTtcblxuICBjb25zdCBhdXRoTWlkZGxld2FyZSA9IG5ldyBBcG9sbG9MaW5rKChvcGVyYXRpb24sIGZvcndhcmQpID0+IHtcbiAgICBjb25zdCBoZWFkZXJzOiBhbnkgPSB7fTtcbiAgICBpZiAobG9jYWxTdG9yYWdlKSB7XG4gICAgICBjb25zdCB0b2tlbiA9IGF1dGhTZXJ2aWNlLnRva2VuIHx8IG51bGw7XG4gICAgICBpZiAodG9rZW4pIHtcbiAgICAgICAgaGVhZGVycy5BdXRob3JpemF0aW9uID0gJ0JlYXJlciAnICsgdG9rZW47XG4gICAgICB9XG4gICAgICBvcGVyYXRpb24uc2V0Q29udGV4dCgoKSA9PiAoeyBoZWFkZXJzIH0pKTtcbiAgICB9XG4gICAgcmV0dXJuIGZvcndhcmQob3BlcmF0aW9uKTtcbiAgfSk7XG5cbiAgaWYgKGJhc2VNb2R1bGVDb25maWcud3NVcmwpIHtcbiAgICBjb25zdCB3c0xpbmsgPSBuZXcgV2ViU29ja2V0TGluayh7XG4gICAgICB1cmk6IGJhc2VNb2R1bGVDb25maWcud3NVcmwsXG4gICAgICBvcHRpb25zOiB7XG4gICAgICAgIHJlY29ubmVjdDogdHJ1ZSxcbiAgICAgICAgY29ubmVjdGlvblBhcmFtczogKCkgPT4gKHtcbiAgICAgICAgICBBdXRob3JpemF0aW9uOiBhdXRoU2VydmljZS50b2tlbiA/ICdCZWFyZXIgJyArIGF1dGhTZXJ2aWNlLnRva2VuIDogdW5kZWZpbmVkLFxuICAgICAgICB9KSxcbiAgICAgIH0sXG4gICAgfSk7XG5cbiAgICAvLyBTZXQgY2xpZW50IGZvciByZWNvbm5lY3Rpb24gb24gbG9nb3V0L2xvZ2luXG4gICAgd3NTZXJ2aWNlLmNsaWVudCA9ICh3c0xpbmsgYXMgYW55KS5zdWJzY3JpcHRpb25DbGllbnQ7XG5cbiAgICAvLyB1c2luZyB0aGUgYWJpbGl0eSB0byBzcGxpdCBsaW5rcywgeW91IGNhbiBzZW5kIGRhdGEgdG8gZWFjaCBsaW5rXG4gICAgLy8gZGVwZW5kaW5nIG9uIHdoYXQga2luZCBvZiBvcGVyYXRpb24gaXMgYmVpbmcgc2VudFxuICAgIGxpbmtzLnB1c2goXG4gICAgICBzcGxpdChcbiAgICAgICAgLy8gc3BsaXQgYmFzZWQgb24gb3BlcmF0aW9uIHR5cGVcbiAgICAgICAgKHsgcXVlcnkgfSkgPT4ge1xuICAgICAgICAgIC8vIEB0cy1pZ25vcmVcbiAgICAgICAgICBjb25zdCB7IGtpbmQsIG9wZXJhdGlvbiB9ID0gZ2V0TWFpbkRlZmluaXRpb24ocXVlcnkpO1xuICAgICAgICAgIHJldHVybiBraW5kID09PSAnT3BlcmF0aW9uRGVmaW5pdGlvbicgJiYgb3BlcmF0aW9uID09PSAnc3Vic2NyaXB0aW9uJztcbiAgICAgICAgfSxcbiAgICAgICAgd3NMaW5rLFxuICAgICAgICBjb25jYXQoYXV0aE1pZGRsZXdhcmUsIGh0dHApXG4gICAgICApXG4gICAgKTtcbiAgfSBlbHNlIHtcbiAgICBsaW5rcy5wdXNoKGh0dHApO1xuICAgIGxpbmtzLnB1c2goYXV0aE1pZGRsZXdhcmUpO1xuICB9XG5cbiAgcmV0dXJuIHtcbiAgICBsaW5rOiBBcG9sbG9MaW5rLmZyb20obGlua3MpLFxuICAgIGNhY2hlOiBuZXcgSW5NZW1vcnlDYWNoZSgpLFxuICAgIGRlZmF1bHRPcHRpb25zOiB7XG4gICAgICBxdWVyeToge1xuICAgICAgICBmZXRjaFBvbGljeTogJ25ldHdvcmstb25seScsXG4gICAgICB9LFxuICAgIH0sXG4gIH07XG59XG4iXX0=
|
|
@@ -2,9 +2,11 @@ import { Inject, Injectable } from '@angular/core';
|
|
|
2
2
|
import { BehaviorSubject } from 'rxjs';
|
|
3
3
|
import { BASE_MODULE_CONFIG } from '../interfaces/base-module-config.interface';
|
|
4
4
|
import { StorageService } from './storage.service';
|
|
5
|
+
import { WsService } from './ws.service';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
import * as i1 from "../interfaces/base-module-config.interface";
|
|
7
8
|
import * as i2 from "./storage.service";
|
|
9
|
+
import * as i3 from "./ws.service";
|
|
8
10
|
/**
|
|
9
11
|
* Authentication service
|
|
10
12
|
*/
|
|
@@ -12,9 +14,10 @@ export class AuthService {
|
|
|
12
14
|
/**
|
|
13
15
|
* Constructor
|
|
14
16
|
*/
|
|
15
|
-
constructor(moduleConfig, storageService) {
|
|
17
|
+
constructor(moduleConfig, storageService, wsService) {
|
|
16
18
|
this.moduleConfig = moduleConfig;
|
|
17
19
|
this.storageService = storageService;
|
|
20
|
+
this.wsService = wsService;
|
|
18
21
|
// Subjects
|
|
19
22
|
this._currentUser = new BehaviorSubject(null);
|
|
20
23
|
this._token = new BehaviorSubject(null);
|
|
@@ -51,12 +54,13 @@ export class AuthService {
|
|
|
51
54
|
set token(token) {
|
|
52
55
|
this._token.next(token);
|
|
53
56
|
this.storageService.save('token', token);
|
|
57
|
+
this.wsService.reconnect();
|
|
54
58
|
}
|
|
55
59
|
get tokenObservable() {
|
|
56
60
|
return this._token.asObservable();
|
|
57
61
|
}
|
|
58
62
|
}
|
|
59
|
-
AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0.ɵɵinject(i1.BASE_MODULE_CONFIG), i0.ɵɵinject(i2.StorageService)); }, token: AuthService, providedIn: "root" });
|
|
63
|
+
AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0.ɵɵinject(i1.BASE_MODULE_CONFIG), i0.ɵɵinject(i2.StorageService), i0.ɵɵinject(i3.WsService)); }, token: AuthService, providedIn: "root" });
|
|
60
64
|
AuthService.decorators = [
|
|
61
65
|
{ type: Injectable, args: [{
|
|
62
66
|
providedIn: 'root',
|
|
@@ -64,6 +68,7 @@ AuthService.decorators = [
|
|
|
64
68
|
];
|
|
65
69
|
AuthService.ctorParameters = () => [
|
|
66
70
|
{ type: undefined, decorators: [{ type: Inject, args: [BASE_MODULE_CONFIG,] }] },
|
|
67
|
-
{ type: StorageService }
|
|
71
|
+
{ type: StorageService },
|
|
72
|
+
{ type: WsService }
|
|
68
73
|
];
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmctYmFzZS9zcmMvbGliL2Jhc2Uvc2VydmljZXMvYXV0aC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBRSxlQUFlLEVBQWMsTUFBTSxNQUFNLENBQUM7QUFDbkQsT0FBTyxFQUFFLGtCQUFrQixFQUFvQixNQUFNLDRDQUE0QyxDQUFDO0FBRWxHLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFDOzs7OztBQUV6Qzs7R0FFRztBQUlILE1BQU0sT0FBTyxXQUFXO0lBS3RCOztPQUVHO0lBQ0gsWUFDc0MsWUFBOEIsRUFDMUQsY0FBOEIsRUFDOUIsU0FBb0I7UUFGUSxpQkFBWSxHQUFaLFlBQVksQ0FBa0I7UUFDMUQsbUJBQWMsR0FBZCxjQUFjLENBQWdCO1FBQzlCLGNBQVMsR0FBVCxTQUFTLENBQVc7UUFWOUIsV0FBVztRQUNILGlCQUFZLEdBQStCLElBQUksZUFBZSxDQUFZLElBQUksQ0FBQyxDQUFDO1FBQ2hGLFdBQU0sR0FBNEIsSUFBSSxlQUFlLENBQVMsSUFBSSxDQUFDLENBQUM7UUFVMUUsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQVcsQ0FBQztRQUN6RCxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBYyxDQUFDO0lBQzFFLENBQUM7SUFFRDs7T0FFRztJQUNJLE1BQU07UUFDWCxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ3JELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO0lBQ3BCLENBQUM7SUFFRCxvRUFBb0U7SUFDcEUsZUFBZTtJQUNmLG9FQUFvRTtJQUVwRSxJQUFJLFdBQVc7UUFDYixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDO0lBQ2pDLENBQUM7SUFFRCxJQUFJLFdBQVcsQ0FBQyxJQUFlO1FBQzdCLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdCLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQsSUFBSSxxQkFBcUI7UUFDdkIsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQzFDLENBQUM7SUFFRCxvRUFBb0U7SUFDcEUsUUFBUTtJQUNSLG9FQUFvRTtJQUVwRSxJQUFJLEtBQUs7UUFDUCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO0lBQzNCLENBQUM7SUFFRCxJQUFJLEtBQUssQ0FBQyxLQUFhO1FBQ3JCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRCxJQUFJLGVBQWU7UUFDakIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3BDLENBQUM7Ozs7WUE5REYsVUFBVSxTQUFDO2dCQUNWLFVBQVUsRUFBRSxNQUFNO2FBQ25COzs7NENBVUksTUFBTSxTQUFDLGtCQUFrQjtZQWxCckIsY0FBYztZQUNkLFNBQVMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgQkFTRV9NT0RVTEVfQ09ORklHLCBCYXNlTW9kdWxlQ29uZmlnIH0gZnJvbSAnLi4vaW50ZXJmYWNlcy9iYXNlLW1vZHVsZS1jb25maWcuaW50ZXJmYWNlJztcbmltcG9ydCB7IEJhc2ljVXNlciB9IGZyb20gJy4uL2NsYXNzZXMvYmFzaWMtdXNlci5jbGFzcyc7XG5pbXBvcnQgeyBTdG9yYWdlU2VydmljZSB9IGZyb20gJy4vc3RvcmFnZS5zZXJ2aWNlJztcbmltcG9ydCB7IFdzU2VydmljZSB9IGZyb20gJy4vd3Muc2VydmljZSc7XG5cbi8qKlxuICogQXV0aGVudGljYXRpb24gc2VydmljZVxuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290Jyxcbn0pXG5leHBvcnQgY2xhc3MgQXV0aFNlcnZpY2Uge1xuICAvLyBTdWJqZWN0c1xuICBwcml2YXRlIF9jdXJyZW50VXNlcjogQmVoYXZpb3JTdWJqZWN0PEJhc2ljVXNlcj4gPSBuZXcgQmVoYXZpb3JTdWJqZWN0PEJhc2ljVXNlcj4obnVsbCk7XG4gIHByaXZhdGUgX3Rva2VuOiBCZWhhdmlvclN1YmplY3Q8c3RyaW5nPiA9IG5ldyBCZWhhdmlvclN1YmplY3Q8c3RyaW5nPihudWxsKTtcblxuICAvKipcbiAgICogQ29uc3RydWN0b3JcbiAgICovXG4gIGNvbnN0cnVjdG9yKFxuICAgIEBJbmplY3QoQkFTRV9NT0RVTEVfQ09ORklHKSBwcml2YXRlIG1vZHVsZUNvbmZpZzogQmFzZU1vZHVsZUNvbmZpZyxcbiAgICBwcml2YXRlIHN0b3JhZ2VTZXJ2aWNlOiBTdG9yYWdlU2VydmljZSxcbiAgICBwcml2YXRlIHdzU2VydmljZTogV3NTZXJ2aWNlXG4gICkge1xuICAgIHRoaXMudG9rZW4gPSB0aGlzLnN0b3JhZ2VTZXJ2aWNlLmxvYWQoJ3Rva2VuJykgYXMgc3RyaW5nO1xuICAgIHRoaXMuY3VycmVudFVzZXIgPSB0aGlzLnN0b3JhZ2VTZXJ2aWNlLmxvYWQoJ2N1cnJlbnRVc2VyJykgYXMgQmFzaWNVc2VyO1xuICB9XG5cbiAgLyoqXG4gICAqIExvZ291dFxuICAgKi9cbiAgcHVibGljIGxvZ291dCgpIHtcbiAgICB0aGlzLnN0b3JhZ2VTZXJ2aWNlLnJlbW92ZShbJ3Rva2VuJywgJ2N1cnJlbnRVc2VyJ10pO1xuICAgIHRoaXMuY3VycmVudFVzZXIgPSBudWxsO1xuICAgIHRoaXMudG9rZW4gPSBudWxsO1xuICB9XG5cbiAgLy8gIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyNcbiAgLy8gQ3VycmVudCBVc2VyXG4gIC8vICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjXG5cbiAgZ2V0IGN1cnJlbnRVc2VyKCk6IEJhc2ljVXNlciB7XG4gICAgcmV0dXJuIHRoaXMuX2N1cnJlbnRVc2VyLnZhbHVlO1xuICB9XG5cbiAgc2V0IGN1cnJlbnRVc2VyKHVzZXI6IEJhc2ljVXNlcikge1xuICAgIHRoaXMuX2N1cnJlbnRVc2VyLm5leHQodXNlcik7XG4gICAgdGhpcy5zdG9yYWdlU2VydmljZS5zYXZlKCdjdXJyZW50VXNlcicsIHVzZXIpO1xuICB9XG5cbiAgZ2V0IGN1cnJlbnRVc2VyT2JzZXJ2YWJsZSgpOiBPYnNlcnZhYmxlPEJhc2ljVXNlcj4ge1xuICAgIHJldHVybiB0aGlzLl9jdXJyZW50VXNlci5hc09ic2VydmFibGUoKTtcbiAgfVxuXG4gIC8vICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjXG4gIC8vIFRva2VuXG4gIC8vICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjXG5cbiAgZ2V0IHRva2VuKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuX3Rva2VuLnZhbHVlO1xuICB9XG5cbiAgc2V0IHRva2VuKHRva2VuOiBzdHJpbmcpIHtcbiAgICB0aGlzLl90b2tlbi5uZXh0KHRva2VuKTtcbiAgICB0aGlzLnN0b3JhZ2VTZXJ2aWNlLnNhdmUoJ3Rva2VuJywgdG9rZW4pO1xuICAgIHRoaXMud3NTZXJ2aWNlLnJlY29ubmVjdCgpO1xuICB9XG5cbiAgZ2V0IHRva2VuT2JzZXJ2YWJsZSgpOiBPYnNlcnZhYmxlPHN0cmluZz4ge1xuICAgIHJldHVybiB0aGlzLl90b2tlbi5hc09ic2VydmFibGUoKTtcbiAgfVxufVxuIl19
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import * as i0 from "@angular/core";
|
|
3
|
+
export class WsService {
|
|
4
|
+
reconnect() {
|
|
5
|
+
var _a, _b;
|
|
6
|
+
(_a = this.client) === null || _a === void 0 ? void 0 : _a.close();
|
|
7
|
+
(_b = this.client) === null || _b === void 0 ? void 0 : _b.connect();
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
WsService.ɵprov = i0.ɵɵdefineInjectable({ factory: function WsService_Factory() { return new WsService(); }, token: WsService, providedIn: "root" });
|
|
11
|
+
WsService.decorators = [
|
|
12
|
+
{ type: Injectable, args: [{
|
|
13
|
+
providedIn: 'root',
|
|
14
|
+
},] }
|
|
15
|
+
];
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3Muc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25nLWJhc2Uvc3JjL2xpYi9iYXNlL3NlcnZpY2VzL3dzLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFNM0MsTUFBTSxPQUFPLFNBQVM7SUFHcEIsU0FBUzs7UUFDUCxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3JCLE1BQUMsSUFBSSxDQUFDLE1BQWMsMENBQUUsT0FBTyxFQUFFLENBQUM7SUFDbEMsQ0FBQzs7OztZQVRGLFVBQVUsU0FBQztnQkFDVixVQUFVLEVBQUUsTUFBTTthQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFN1YnNjcmlwdGlvbkNsaWVudCB9IGZyb20gJ3N1YnNjcmlwdGlvbnMtdHJhbnNwb3J0LXdzJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCcsXG59KVxuZXhwb3J0IGNsYXNzIFdzU2VydmljZSB7XG4gIGNsaWVudDogU3Vic2NyaXB0aW9uQ2xpZW50O1xuXG4gIHJlY29ubmVjdCgpIHtcbiAgICB0aGlzLmNsaWVudD8uY2xvc2UoKTtcbiAgICAodGhpcy5jbGllbnQgYXMgYW55KT8uY29ubmVjdCgpO1xuICB9XG59XG4iXX0=
|
|
@@ -10,6 +10,7 @@ import { MatchHeightDirective } from './directives/match-height.directive';
|
|
|
10
10
|
import { ResizableDirective } from './directives/resizable.directive';
|
|
11
11
|
import { EllipsesPipe } from './pipes/ellipses.pipe';
|
|
12
12
|
import { SafeHtmlPipe } from './pipes/safe-html.pipe';
|
|
13
|
+
import { WsService } from './services/ws.service';
|
|
13
14
|
// Imported and exported elements
|
|
14
15
|
const elements = [
|
|
15
16
|
// Directives
|
|
@@ -43,7 +44,7 @@ export class BaseModule {
|
|
|
43
44
|
providers.push({
|
|
44
45
|
provide: APOLLO_OPTIONS,
|
|
45
46
|
useFactory: apolloOptionsFactory,
|
|
46
|
-
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService],
|
|
47
|
+
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService, WsService],
|
|
47
48
|
});
|
|
48
49
|
}
|
|
49
50
|
else if (config.logging) {
|
|
@@ -62,4 +63,4 @@ BaseModule.decorators = [
|
|
|
62
63
|
exports: elements,
|
|
63
64
|
},] }
|
|
64
65
|
];
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZy1iYXNlL3NyYy9saWIvYmFzZS9iYXNlLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQy9DLE9BQU8sRUFBdUIsUUFBUSxFQUFZLE1BQU0sZUFBZSxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsa0JBQWtCLEVBQW9CLE1BQU0sMkNBQTJDLENBQUM7QUFDakcsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDMUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDckUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEQsaUNBQWlDO0FBQ2pDLE1BQU0sUUFBUSxHQUFHO0lBQ2YsYUFBYTtJQUNiLG9CQUFvQjtJQUNwQixpQkFBaUI7SUFDakIsb0JBQW9CO0lBQ3BCLGtCQUFrQjtJQUVsQixRQUFRO0lBQ1IsWUFBWTtJQUNaLFlBQVk7Q0FDYixDQUFDO0FBRUY7O0dBRUc7QUFLSCxNQUFNLE9BQU8sVUFBVTtJQUNyQjs7T0FFRztJQUNILE1BQU0sQ0FBQyxPQUFPLENBQUMsbUJBQXFDLEVBQUU7UUFDcEQsaUJBQWlCO1FBQ2pCLE1BQU0sTUFBTSxtQkFDVixNQUFNLEVBQUUsZ0JBQWdCLEVBQ3hCLG9CQUFvQixFQUFFLE9BQU8sRUFDN0IsT0FBTyxFQUFFLEtBQUssRUFDZCxPQUFPLEVBQUUsSUFBSSxFQUNiLE1BQU0sRUFBRSxJQUFJLEVBQ1oscUJBQXFCLEVBQUUsR0FBRyxFQUMxQixZQUFZLEVBQUUsR0FBRyxFQUNqQixXQUFXLEVBQUUsT0FBTyxJQUNqQixnQkFBZ0IsQ0FDcEIsQ0FBQztRQUVGLG9CQUFvQjtRQUNwQixNQUFNLFNBQVMsR0FBZTtZQUM1QjtnQkFDRSxPQUFPLEVBQUUsa0JBQWtCO2dCQUMzQixRQUFRLEVBQUUsZ0JBQWdCO2FBQzNCO1NBQ0YsQ0FBQztRQUVGLHdDQUF3QztRQUN4QyxJQUFJLGdCQUFnQixDQUFDLE1BQU0sRUFBRTtZQUMzQixTQUFTLENBQUMsSUFBSSxDQUFDO2dCQUNiLE9BQU8sRUFBRSxjQUFjO2dCQUN2QixVQUFVLEVBQUUsb0JBQW9CO2dCQUNoQyxJQUFJLEVBQUUsQ0FBQyxrQkFBa0IsRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQzthQUM3RCxDQUFDLENBQUM7U0FDSjthQUFNLElBQUksTUFBTSxDQUFDLE9BQU8sRUFBRTtZQUN6QixPQUFPLENBQUMsR0FBRyxDQUFDLGtEQUFrRCxDQUFDLENBQUM7U0FDakU7UUFFRCxxQkFBcUI7UUFDckIsT0FBTztZQUNMLFFBQVEsRUFBRSxVQUFVO1lBQ3BCLFNBQVM7U0FDVixDQUFDO0lBQ0osQ0FBQzs7O1lBOUNGLFFBQVEsU0FBQztnQkFDUixZQUFZLEVBQUUsUUFBUTtnQkFDdEIsT0FBTyxFQUFFLFFBQVE7YUFDbEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBUE9MTE9fT1BUSU9OUyB9IGZyb20gJ2Fwb2xsby1hbmd1bGFyJztcbmltcG9ydCB7IEh0dHBMaW5rIH0gZnJvbSAnYXBvbGxvLWFuZ3VsYXIvaHR0cCc7XG5pbXBvcnQgeyBNb2R1bGVXaXRoUHJvdmlkZXJzLCBOZ01vZHVsZSwgUHJvdmlkZXIgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEF1dGhTZXJ2aWNlIH0gZnJvbSAnLi9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgQkFTRV9NT0RVTEVfQ09ORklHLCBCYXNlTW9kdWxlQ29uZmlnIH0gZnJvbSAnLi9pbnRlcmZhY2VzL2Jhc2UtbW9kdWxlLWNvbmZpZy5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgYXBvbGxvT3B0aW9uc0ZhY3RvcnkgfSBmcm9tICcuL2ZhY3Rvcmllcy9hcG9sbG8tb3B0aW9ucy5mYWN0b3J5JztcbmltcG9ydCB7IENvbnRleHRNZW51RGlyZWN0aXZlIH0gZnJvbSAnLi9kaXJlY3RpdmVzL2NvbnRleHQtbWVudS5kaXJlY3RpdmUnO1xuaW1wb3J0IHsgTGF6eUxvYWREaXJlY3RpdmUgfSBmcm9tICcuL2RpcmVjdGl2ZXMvbGF6eS1sb2FkLmRpcmVjdGl2ZSc7XG5pbXBvcnQgeyBNYXRjaEhlaWdodERpcmVjdGl2ZSB9IGZyb20gJy4vZGlyZWN0aXZlcy9tYXRjaC1oZWlnaHQuZGlyZWN0aXZlJztcbmltcG9ydCB7IFJlc2l6YWJsZURpcmVjdGl2ZSB9IGZyb20gJy4vZGlyZWN0aXZlcy9yZXNpemFibGUuZGlyZWN0aXZlJztcbmltcG9ydCB7IEVsbGlwc2VzUGlwZSB9IGZyb20gJy4vcGlwZXMvZWxsaXBzZXMucGlwZSc7XG5pbXBvcnQgeyBTYWZlSHRtbFBpcGUgfSBmcm9tICcuL3BpcGVzL3NhZmUtaHRtbC5waXBlJztcbmltcG9ydCB7IFdzU2VydmljZSB9IGZyb20gJy4vc2VydmljZXMvd3Muc2VydmljZSc7XG5cbi8vIEltcG9ydGVkIGFuZCBleHBvcnRlZCBlbGVtZW50c1xuY29uc3QgZWxlbWVudHMgPSBbXG4gIC8vIERpcmVjdGl2ZXNcbiAgQ29udGV4dE1lbnVEaXJlY3RpdmUsXG4gIExhenlMb2FkRGlyZWN0aXZlLFxuICBNYXRjaEhlaWdodERpcmVjdGl2ZSxcbiAgUmVzaXphYmxlRGlyZWN0aXZlLFxuXG4gIC8vIFBpcGVzXG4gIEVsbGlwc2VzUGlwZSxcbiAgU2FmZUh0bWxQaXBlLFxuXTtcblxuLyoqXG4gKiBCYXNlIG1vZHVsZVxuICovXG5ATmdNb2R1bGUoe1xuICBkZWNsYXJhdGlvbnM6IGVsZW1lbnRzLFxuICBleHBvcnRzOiBlbGVtZW50cyxcbn0pXG5leHBvcnQgY2xhc3MgQmFzZU1vZHVsZSB7XG4gIC8qKlxuICAgKiBTZXQgY29uZmlndXJhdGlvbiBvZiBiYXNlIG1vZHVsZSBpbiByb290IG1vZHVsZSBvZiB0aGUgYXBwXG4gICAqL1xuICBzdGF0aWMgZm9yUm9vdChiYXNlTW9kdWxlQ29uZmlnOiBCYXNlTW9kdWxlQ29uZmlnID0ge30pOiBNb2R1bGVXaXRoUHJvdmlkZXJzPEJhc2VNb2R1bGU+IHtcbiAgICAvLyBEZWZhdWx0IGNvbmZpZ1xuICAgIGNvbnN0IGNvbmZpZyA9IHtcbiAgICAgIGFwaVVybDogJ2xvY2FsaG9zdDozMDAwJyxcbiAgICAgIGF1dGhHdWFyZFJlZGlyZWN0VXJsOiAnL2F1dGgnLFxuICAgICAgbG9nZ2luZzogZmFsc2UsXG4gICAgICB2ZXJzaW9uOiBudWxsLFxuICAgICAgcHJlZml4OiBudWxsLFxuICAgICAgc2Nyb2xsRGV0ZWN0aW9uT2Zmc2V0OiAyMDAsXG4gICAgICBzY3JvbGxPZmZzZXQ6IDEwMCxcbiAgICAgIHN0b3JhZ2VUeXBlOiAnbG9jYWwnLFxuICAgICAgLi4uYmFzZU1vZHVsZUNvbmZpZyxcbiAgICB9O1xuXG4gICAgLy8gUHJlcGFyZSBwcm92aWRlcnNcbiAgICBjb25zdCBwcm92aWRlcnM6IFByb3ZpZGVyW10gPSBbXG4gICAgICB7XG4gICAgICAgIHByb3ZpZGU6IEJBU0VfTU9EVUxFX0NPTkZJRyxcbiAgICAgICAgdXNlVmFsdWU6IGJhc2VNb2R1bGVDb25maWcsXG4gICAgICB9LFxuICAgIF07XG5cbiAgICAvLyBBZGQgYXBvbGxvIGZlYXR1cmVzIGlmIEFQSSBVUkwgaXMgc2V0XG4gICAgaWYgKGJhc2VNb2R1bGVDb25maWcuYXBpVXJsKSB7XG4gICAgICBwcm92aWRlcnMucHVzaCh7XG4gICAgICAgIHByb3ZpZGU6IEFQT0xMT19PUFRJT05TLFxuICAgICAgICB1c2VGYWN0b3J5OiBhcG9sbG9PcHRpb25zRmFjdG9yeSxcbiAgICAgICAgZGVwczogW0JBU0VfTU9EVUxFX0NPTkZJRywgSHR0cExpbmssIEF1dGhTZXJ2aWNlLCBXc1NlcnZpY2VdLFxuICAgICAgfSk7XG4gICAgfSBlbHNlIGlmIChjb25maWcubG9nZ2luZykge1xuICAgICAgY29uc29sZS5sb2coJ2FwaVVybCBpcyBtaXNzaW5nLCBBcG9sbG9MaW5rIGlzIG5vdCBpbml0aWFsaXplZCcpO1xuICAgIH1cblxuICAgIC8vIFJldHVybiByb290IG1vZHVsZVxuICAgIHJldHVybiB7XG4gICAgICBuZ01vZHVsZTogQmFzZU1vZHVsZSxcbiAgICAgIHByb3ZpZGVycyxcbiAgICB9O1xuICB9XG59XG4iXX0=
|
|
@@ -5,7 +5,7 @@ import { getMainDefinition } from '@apollo/client/utilities';
|
|
|
5
5
|
/**
|
|
6
6
|
* Factory for apollo-angular options
|
|
7
7
|
*/
|
|
8
|
-
export function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
8
|
+
export function apolloOptionsFactory(baseModuleConfig, httpLink, authService, wsService) {
|
|
9
9
|
const links = [];
|
|
10
10
|
const defaultUrl = 'api.' + window.location.href + '/graphql';
|
|
11
11
|
const http = httpLink.create({
|
|
@@ -23,27 +23,17 @@ export function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
|
23
23
|
return forward(operation);
|
|
24
24
|
});
|
|
25
25
|
if (baseModuleConfig.wsUrl) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
wsClient = new WebSocketLink({
|
|
41
|
-
uri: baseModuleConfig.wsUrl,
|
|
42
|
-
options: {
|
|
43
|
-
reconnect: true,
|
|
44
|
-
},
|
|
45
|
-
});
|
|
46
|
-
}
|
|
26
|
+
const wsLink = new WebSocketLink({
|
|
27
|
+
uri: baseModuleConfig.wsUrl,
|
|
28
|
+
options: {
|
|
29
|
+
reconnect: true,
|
|
30
|
+
connectionParams: () => ({
|
|
31
|
+
Authorization: authService.token ? 'Bearer ' + authService.token : undefined,
|
|
32
|
+
}),
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
// Set client for reconnection on logout/login
|
|
36
|
+
wsService.client = wsLink.subscriptionClient;
|
|
47
37
|
// using the ability to split links, you can send data to each link
|
|
48
38
|
// depending on what kind of operation is being sent
|
|
49
39
|
links.push(split(
|
|
@@ -52,7 +42,7 @@ export function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
|
52
42
|
// @ts-ignore
|
|
53
43
|
const { kind, operation } = getMainDefinition(query);
|
|
54
44
|
return kind === 'OperationDefinition' && operation === 'subscription';
|
|
55
|
-
},
|
|
45
|
+
}, wsLink, concat(authMiddleware, http)));
|
|
56
46
|
}
|
|
57
47
|
else {
|
|
58
48
|
links.push(http);
|
|
@@ -68,4 +58,4 @@ export function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
|
68
58
|
},
|
|
69
59
|
};
|
|
70
60
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBvbGxvLW9wdGlvbnMuZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25nLWJhc2Uvc3JjL2xpYi9iYXNlL2ZhY3Rvcmllcy9hcG9sbG8tb3B0aW9ucy5mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHN0Q7O0dBRUc7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLGdCQUFrQyxFQUNsQyxRQUFrQixFQUNsQixXQUF3QixFQUN4QixTQUFvQjtJQUVwQixNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7SUFDakIsTUFBTSxVQUFVLEdBQUcsTUFBTSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQztJQUU5RCxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDO1FBQzNCLEdBQUcsRUFBRSxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsVUFBVSxHQUFHLFVBQVU7S0FDakYsQ0FBQyxDQUFDO0lBRUgsTUFBTSxjQUFjLEdBQUcsSUFBSSxVQUFVLENBQUMsQ0FBQyxTQUFTLEVBQUUsT0FBTyxFQUFFLEVBQUU7UUFDM0QsTUFBTSxPQUFPLEdBQVEsRUFBRSxDQUFDO1FBQ3hCLElBQUksWUFBWSxFQUFFO1lBQ2hCLE1BQU0sS0FBSyxHQUFHLFdBQVcsQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDO1lBQ3hDLElBQUksS0FBSyxFQUFFO2dCQUNULE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxHQUFHLEtBQUssQ0FBQzthQUMzQztZQUNELFNBQVMsQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQztTQUMzQztRQUNELE9BQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzVCLENBQUMsQ0FBQyxDQUFDO0lBRUgsSUFBSSxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUU7UUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSxhQUFhLENBQUM7WUFDL0IsR0FBRyxFQUFFLGdCQUFnQixDQUFDLEtBQUs7WUFDM0IsT0FBTyxFQUFFO2dCQUNQLFNBQVMsRUFBRSxJQUFJO2dCQUNmLGdCQUFnQixFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUM7b0JBQ3ZCLGFBQWEsRUFBRSxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsU0FBUztpQkFDN0UsQ0FBQzthQUNIO1NBQ0YsQ0FBQyxDQUFDO1FBRUgsOENBQThDO1FBQzlDLFNBQVMsQ0FBQyxNQUFNLEdBQUksTUFBYyxDQUFDLGtCQUFrQixDQUFDO1FBRXRELG1FQUFtRTtRQUNuRSxvREFBb0Q7UUFDcEQsS0FBSyxDQUFDLElBQUksQ0FDUixLQUFLO1FBQ0gsZ0NBQWdDO1FBQ2hDLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ1osYUFBYTtZQUNiLE1BQU0sRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLEdBQUcsaUJBQWlCLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDckQsT0FBTyxJQUFJLEtBQUsscUJBQXFCLElBQUksU0FBUyxLQUFLLGNBQWMsQ0FBQztRQUN4RSxDQUFDLEVBQ0QsTUFBTSxFQUNOLE1BQU0sQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUFDLENBQzdCLENBQ0YsQ0FBQztLQUNIO1NBQU07UUFDTCxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pCLEtBQUssQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7S0FDNUI7SUFFRCxPQUFPO1FBQ0wsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBQzVCLEtBQUssRUFBRSxJQUFJLGFBQWEsRUFBRTtRQUMxQixjQUFjLEVBQUU7WUFDZCxLQUFLLEVBQUU7Z0JBQ0wsV0FBVyxFQUFFLGNBQWM7YUFDNUI7U0FDRjtLQUNGLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cExpbmsgfSBmcm9tICdhcG9sbG8tYW5ndWxhci9odHRwJztcbmltcG9ydCB7IEJhc2VNb2R1bGVDb25maWcgfSBmcm9tICcuLi9pbnRlcmZhY2VzL2Jhc2UtbW9kdWxlLWNvbmZpZy5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgQXBvbGxvTGluaywgY29uY2F0LCBzcGxpdCB9IGZyb20gJ0BhcG9sbG8vY2xpZW50L2NvcmUnO1xuaW1wb3J0IHsgSW5NZW1vcnlDYWNoZSB9IGZyb20gJ0BhcG9sbG8vY2xpZW50L2NhY2hlJztcbmltcG9ydCB7IFdlYlNvY2tldExpbmsgfSBmcm9tICdAYXBvbGxvL2NsaWVudC9saW5rL3dzJztcbmltcG9ydCB7IGdldE1haW5EZWZpbml0aW9uIH0gZnJvbSAnQGFwb2xsby9jbGllbnQvdXRpbGl0aWVzJztcbmltcG9ydCB7IFdzU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL3dzLnNlcnZpY2UnO1xuXG4vKipcbiAqIEZhY3RvcnkgZm9yIGFwb2xsby1hbmd1bGFyIG9wdGlvbnNcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGFwb2xsb09wdGlvbnNGYWN0b3J5KFxuICBiYXNlTW9kdWxlQ29uZmlnOiBCYXNlTW9kdWxlQ29uZmlnLFxuICBodHRwTGluazogSHR0cExpbmssXG4gIGF1dGhTZXJ2aWNlOiBBdXRoU2VydmljZSxcbiAgd3NTZXJ2aWNlOiBXc1NlcnZpY2Vcbikge1xuICBjb25zdCBsaW5rcyA9IFtdO1xuICBjb25zdCBkZWZhdWx0VXJsID0gJ2FwaS4nICsgd2luZG93LmxvY2F0aW9uLmhyZWYgKyAnL2dyYXBocWwnO1xuXG4gIGNvbnN0IGh0dHAgPSBodHRwTGluay5jcmVhdGUoe1xuICAgIHVyaTogYmFzZU1vZHVsZUNvbmZpZy5hcGlVcmwgPyBiYXNlTW9kdWxlQ29uZmlnLmFwaVVybCA6ICdodHRwczovLycgKyBkZWZhdWx0VXJsLFxuICB9KTtcblxuICBjb25zdCBhdXRoTWlkZGxld2FyZSA9IG5ldyBBcG9sbG9MaW5rKChvcGVyYXRpb24sIGZvcndhcmQpID0+IHtcbiAgICBjb25zdCBoZWFkZXJzOiBhbnkgPSB7fTtcbiAgICBpZiAobG9jYWxTdG9yYWdlKSB7XG4gICAgICBjb25zdCB0b2tlbiA9IGF1dGhTZXJ2aWNlLnRva2VuIHx8IG51bGw7XG4gICAgICBpZiAodG9rZW4pIHtcbiAgICAgICAgaGVhZGVycy5BdXRob3JpemF0aW9uID0gJ0JlYXJlciAnICsgdG9rZW47XG4gICAgICB9XG4gICAgICBvcGVyYXRpb24uc2V0Q29udGV4dCgoKSA9PiAoeyBoZWFkZXJzIH0pKTtcbiAgICB9XG4gICAgcmV0dXJuIGZvcndhcmQob3BlcmF0aW9uKTtcbiAgfSk7XG5cbiAgaWYgKGJhc2VNb2R1bGVDb25maWcud3NVcmwpIHtcbiAgICBjb25zdCB3c0xpbmsgPSBuZXcgV2ViU29ja2V0TGluayh7XG4gICAgICB1cmk6IGJhc2VNb2R1bGVDb25maWcud3NVcmwsXG4gICAgICBvcHRpb25zOiB7XG4gICAgICAgIHJlY29ubmVjdDogdHJ1ZSxcbiAgICAgICAgY29ubmVjdGlvblBhcmFtczogKCkgPT4gKHtcbiAgICAgICAgICBBdXRob3JpemF0aW9uOiBhdXRoU2VydmljZS50b2tlbiA/ICdCZWFyZXIgJyArIGF1dGhTZXJ2aWNlLnRva2VuIDogdW5kZWZpbmVkLFxuICAgICAgICB9KSxcbiAgICAgIH0sXG4gICAgfSk7XG5cbiAgICAvLyBTZXQgY2xpZW50IGZvciByZWNvbm5lY3Rpb24gb24gbG9nb3V0L2xvZ2luXG4gICAgd3NTZXJ2aWNlLmNsaWVudCA9ICh3c0xpbmsgYXMgYW55KS5zdWJzY3JpcHRpb25DbGllbnQ7XG5cbiAgICAvLyB1c2luZyB0aGUgYWJpbGl0eSB0byBzcGxpdCBsaW5rcywgeW91IGNhbiBzZW5kIGRhdGEgdG8gZWFjaCBsaW5rXG4gICAgLy8gZGVwZW5kaW5nIG9uIHdoYXQga2luZCBvZiBvcGVyYXRpb24gaXMgYmVpbmcgc2VudFxuICAgIGxpbmtzLnB1c2goXG4gICAgICBzcGxpdChcbiAgICAgICAgLy8gc3BsaXQgYmFzZWQgb24gb3BlcmF0aW9uIHR5cGVcbiAgICAgICAgKHsgcXVlcnkgfSkgPT4ge1xuICAgICAgICAgIC8vIEB0cy1pZ25vcmVcbiAgICAgICAgICBjb25zdCB7IGtpbmQsIG9wZXJhdGlvbiB9ID0gZ2V0TWFpbkRlZmluaXRpb24ocXVlcnkpO1xuICAgICAgICAgIHJldHVybiBraW5kID09PSAnT3BlcmF0aW9uRGVmaW5pdGlvbicgJiYgb3BlcmF0aW9uID09PSAnc3Vic2NyaXB0aW9uJztcbiAgICAgICAgfSxcbiAgICAgICAgd3NMaW5rLFxuICAgICAgICBjb25jYXQoYXV0aE1pZGRsZXdhcmUsIGh0dHApXG4gICAgICApXG4gICAgKTtcbiAgfSBlbHNlIHtcbiAgICBsaW5rcy5wdXNoKGh0dHApO1xuICAgIGxpbmtzLnB1c2goYXV0aE1pZGRsZXdhcmUpO1xuICB9XG5cbiAgcmV0dXJuIHtcbiAgICBsaW5rOiBBcG9sbG9MaW5rLmZyb20obGlua3MpLFxuICAgIGNhY2hlOiBuZXcgSW5NZW1vcnlDYWNoZSgpLFxuICAgIGRlZmF1bHRPcHRpb25zOiB7XG4gICAgICBxdWVyeToge1xuICAgICAgICBmZXRjaFBvbGljeTogJ25ldHdvcmstb25seScsXG4gICAgICB9LFxuICAgIH0sXG4gIH07XG59XG4iXX0=
|
|
@@ -2,4 +2,5 @@
|
|
|
2
2
|
* Generated bundle index. Do not edit.
|
|
3
3
|
*/
|
|
4
4
|
export * from './public-api';
|
|
5
|
-
|
|
5
|
+
export { WsService as ɵa } from './services/ws.service';
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGVubmUudGVjaC1uZy1iYXNlLXNyYy1saWItYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25nLWJhc2Uvc3JjL2xpYi9iYXNlL2xlbm5lLnRlY2gtbmctYmFzZS1zcmMtbGliLWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFFSCxjQUFjLGNBQWMsQ0FBQztBQUU3QixPQUFPLEVBQUMsU0FBUyxJQUFJLEVBQUUsRUFBQyxNQUFNLHVCQUF1QixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBHZW5lcmF0ZWQgYnVuZGxlIGluZGV4LiBEbyBub3QgZWRpdC5cbiAqL1xuXG5leHBvcnQgKiBmcm9tICcuL3B1YmxpYy1hcGknO1xuXG5leHBvcnQge1dzU2VydmljZSBhcyDJtWF9IGZyb20gJy4vc2VydmljZXMvd3Muc2VydmljZSc7Il19
|
|
@@ -2,9 +2,11 @@ import { Inject, Injectable } from '@angular/core';
|
|
|
2
2
|
import { BehaviorSubject } from 'rxjs';
|
|
3
3
|
import { BASE_MODULE_CONFIG } from '../interfaces/base-module-config.interface';
|
|
4
4
|
import { StorageService } from './storage.service';
|
|
5
|
+
import { WsService } from './ws.service';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
import * as i1 from "../interfaces/base-module-config.interface";
|
|
7
8
|
import * as i2 from "./storage.service";
|
|
9
|
+
import * as i3 from "./ws.service";
|
|
8
10
|
/**
|
|
9
11
|
* Authentication service
|
|
10
12
|
*/
|
|
@@ -12,9 +14,10 @@ export class AuthService {
|
|
|
12
14
|
/**
|
|
13
15
|
* Constructor
|
|
14
16
|
*/
|
|
15
|
-
constructor(moduleConfig, storageService) {
|
|
17
|
+
constructor(moduleConfig, storageService, wsService) {
|
|
16
18
|
this.moduleConfig = moduleConfig;
|
|
17
19
|
this.storageService = storageService;
|
|
20
|
+
this.wsService = wsService;
|
|
18
21
|
// Subjects
|
|
19
22
|
this._currentUser = new BehaviorSubject(null);
|
|
20
23
|
this._token = new BehaviorSubject(null);
|
|
@@ -51,12 +54,13 @@ export class AuthService {
|
|
|
51
54
|
set token(token) {
|
|
52
55
|
this._token.next(token);
|
|
53
56
|
this.storageService.save('token', token);
|
|
57
|
+
this.wsService.reconnect();
|
|
54
58
|
}
|
|
55
59
|
get tokenObservable() {
|
|
56
60
|
return this._token.asObservable();
|
|
57
61
|
}
|
|
58
62
|
}
|
|
59
|
-
AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0.ɵɵinject(i1.BASE_MODULE_CONFIG), i0.ɵɵinject(i2.StorageService)); }, token: AuthService, providedIn: "root" });
|
|
63
|
+
AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0.ɵɵinject(i1.BASE_MODULE_CONFIG), i0.ɵɵinject(i2.StorageService), i0.ɵɵinject(i3.WsService)); }, token: AuthService, providedIn: "root" });
|
|
60
64
|
AuthService.decorators = [
|
|
61
65
|
{ type: Injectable, args: [{
|
|
62
66
|
providedIn: 'root',
|
|
@@ -64,6 +68,7 @@ AuthService.decorators = [
|
|
|
64
68
|
];
|
|
65
69
|
AuthService.ctorParameters = () => [
|
|
66
70
|
{ type: undefined, decorators: [{ type: Inject, args: [BASE_MODULE_CONFIG,] }] },
|
|
67
|
-
{ type: StorageService }
|
|
71
|
+
{ type: StorageService },
|
|
72
|
+
{ type: WsService }
|
|
68
73
|
];
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmctYmFzZS9zcmMvbGliL2Jhc2Uvc2VydmljZXMvYXV0aC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBRSxlQUFlLEVBQWMsTUFBTSxNQUFNLENBQUM7QUFDbkQsT0FBTyxFQUFFLGtCQUFrQixFQUFvQixNQUFNLDRDQUE0QyxDQUFDO0FBRWxHLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFDOzs7OztBQUV6Qzs7R0FFRztBQUlILE1BQU0sT0FBTyxXQUFXO0lBS3RCOztPQUVHO0lBQ0gsWUFDc0MsWUFBOEIsRUFDMUQsY0FBOEIsRUFDOUIsU0FBb0I7UUFGUSxpQkFBWSxHQUFaLFlBQVksQ0FBa0I7UUFDMUQsbUJBQWMsR0FBZCxjQUFjLENBQWdCO1FBQzlCLGNBQVMsR0FBVCxTQUFTLENBQVc7UUFWOUIsV0FBVztRQUNILGlCQUFZLEdBQStCLElBQUksZUFBZSxDQUFZLElBQUksQ0FBQyxDQUFDO1FBQ2hGLFdBQU0sR0FBNEIsSUFBSSxlQUFlLENBQVMsSUFBSSxDQUFDLENBQUM7UUFVMUUsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQVcsQ0FBQztRQUN6RCxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBYyxDQUFDO0lBQzFFLENBQUM7SUFFRDs7T0FFRztJQUNJLE1BQU07UUFDWCxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ3JELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO0lBQ3BCLENBQUM7SUFFRCxvRUFBb0U7SUFDcEUsZUFBZTtJQUNmLG9FQUFvRTtJQUVwRSxJQUFJLFdBQVc7UUFDYixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDO0lBQ2pDLENBQUM7SUFFRCxJQUFJLFdBQVcsQ0FBQyxJQUFlO1FBQzdCLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdCLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQsSUFBSSxxQkFBcUI7UUFDdkIsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQzFDLENBQUM7SUFFRCxvRUFBb0U7SUFDcEUsUUFBUTtJQUNSLG9FQUFvRTtJQUVwRSxJQUFJLEtBQUs7UUFDUCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO0lBQzNCLENBQUM7SUFFRCxJQUFJLEtBQUssQ0FBQyxLQUFhO1FBQ3JCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRCxJQUFJLGVBQWU7UUFDakIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3BDLENBQUM7Ozs7WUE5REYsVUFBVSxTQUFDO2dCQUNWLFVBQVUsRUFBRSxNQUFNO2FBQ25COzs7NENBVUksTUFBTSxTQUFDLGtCQUFrQjtZQWxCckIsY0FBYztZQUNkLFNBQVMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgQkFTRV9NT0RVTEVfQ09ORklHLCBCYXNlTW9kdWxlQ29uZmlnIH0gZnJvbSAnLi4vaW50ZXJmYWNlcy9iYXNlLW1vZHVsZS1jb25maWcuaW50ZXJmYWNlJztcbmltcG9ydCB7IEJhc2ljVXNlciB9IGZyb20gJy4uL2NsYXNzZXMvYmFzaWMtdXNlci5jbGFzcyc7XG5pbXBvcnQgeyBTdG9yYWdlU2VydmljZSB9IGZyb20gJy4vc3RvcmFnZS5zZXJ2aWNlJztcbmltcG9ydCB7IFdzU2VydmljZSB9IGZyb20gJy4vd3Muc2VydmljZSc7XG5cbi8qKlxuICogQXV0aGVudGljYXRpb24gc2VydmljZVxuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290Jyxcbn0pXG5leHBvcnQgY2xhc3MgQXV0aFNlcnZpY2Uge1xuICAvLyBTdWJqZWN0c1xuICBwcml2YXRlIF9jdXJyZW50VXNlcjogQmVoYXZpb3JTdWJqZWN0PEJhc2ljVXNlcj4gPSBuZXcgQmVoYXZpb3JTdWJqZWN0PEJhc2ljVXNlcj4obnVsbCk7XG4gIHByaXZhdGUgX3Rva2VuOiBCZWhhdmlvclN1YmplY3Q8c3RyaW5nPiA9IG5ldyBCZWhhdmlvclN1YmplY3Q8c3RyaW5nPihudWxsKTtcblxuICAvKipcbiAgICogQ29uc3RydWN0b3JcbiAgICovXG4gIGNvbnN0cnVjdG9yKFxuICAgIEBJbmplY3QoQkFTRV9NT0RVTEVfQ09ORklHKSBwcml2YXRlIG1vZHVsZUNvbmZpZzogQmFzZU1vZHVsZUNvbmZpZyxcbiAgICBwcml2YXRlIHN0b3JhZ2VTZXJ2aWNlOiBTdG9yYWdlU2VydmljZSxcbiAgICBwcml2YXRlIHdzU2VydmljZTogV3NTZXJ2aWNlXG4gICkge1xuICAgIHRoaXMudG9rZW4gPSB0aGlzLnN0b3JhZ2VTZXJ2aWNlLmxvYWQoJ3Rva2VuJykgYXMgc3RyaW5nO1xuICAgIHRoaXMuY3VycmVudFVzZXIgPSB0aGlzLnN0b3JhZ2VTZXJ2aWNlLmxvYWQoJ2N1cnJlbnRVc2VyJykgYXMgQmFzaWNVc2VyO1xuICB9XG5cbiAgLyoqXG4gICAqIExvZ291dFxuICAgKi9cbiAgcHVibGljIGxvZ291dCgpIHtcbiAgICB0aGlzLnN0b3JhZ2VTZXJ2aWNlLnJlbW92ZShbJ3Rva2VuJywgJ2N1cnJlbnRVc2VyJ10pO1xuICAgIHRoaXMuY3VycmVudFVzZXIgPSBudWxsO1xuICAgIHRoaXMudG9rZW4gPSBudWxsO1xuICB9XG5cbiAgLy8gIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyNcbiAgLy8gQ3VycmVudCBVc2VyXG4gIC8vICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjXG5cbiAgZ2V0IGN1cnJlbnRVc2VyKCk6IEJhc2ljVXNlciB7XG4gICAgcmV0dXJuIHRoaXMuX2N1cnJlbnRVc2VyLnZhbHVlO1xuICB9XG5cbiAgc2V0IGN1cnJlbnRVc2VyKHVzZXI6IEJhc2ljVXNlcikge1xuICAgIHRoaXMuX2N1cnJlbnRVc2VyLm5leHQodXNlcik7XG4gICAgdGhpcy5zdG9yYWdlU2VydmljZS5zYXZlKCdjdXJyZW50VXNlcicsIHVzZXIpO1xuICB9XG5cbiAgZ2V0IGN1cnJlbnRVc2VyT2JzZXJ2YWJsZSgpOiBPYnNlcnZhYmxlPEJhc2ljVXNlcj4ge1xuICAgIHJldHVybiB0aGlzLl9jdXJyZW50VXNlci5hc09ic2VydmFibGUoKTtcbiAgfVxuXG4gIC8vICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjXG4gIC8vIFRva2VuXG4gIC8vICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjXG5cbiAgZ2V0IHRva2VuKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuX3Rva2VuLnZhbHVlO1xuICB9XG5cbiAgc2V0IHRva2VuKHRva2VuOiBzdHJpbmcpIHtcbiAgICB0aGlzLl90b2tlbi5uZXh0KHRva2VuKTtcbiAgICB0aGlzLnN0b3JhZ2VTZXJ2aWNlLnNhdmUoJ3Rva2VuJywgdG9rZW4pO1xuICAgIHRoaXMud3NTZXJ2aWNlLnJlY29ubmVjdCgpO1xuICB9XG5cbiAgZ2V0IHRva2VuT2JzZXJ2YWJsZSgpOiBPYnNlcnZhYmxlPHN0cmluZz4ge1xuICAgIHJldHVybiB0aGlzLl90b2tlbi5hc09ic2VydmFibGUoKTtcbiAgfVxufVxuIl19
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import * as i0 from "@angular/core";
|
|
3
|
+
export class WsService {
|
|
4
|
+
reconnect() {
|
|
5
|
+
var _a, _b;
|
|
6
|
+
(_a = this.client) === null || _a === void 0 ? void 0 : _a.close();
|
|
7
|
+
(_b = this.client) === null || _b === void 0 ? void 0 : _b.connect();
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
WsService.ɵprov = i0.ɵɵdefineInjectable({ factory: function WsService_Factory() { return new WsService(); }, token: WsService, providedIn: "root" });
|
|
11
|
+
WsService.decorators = [
|
|
12
|
+
{ type: Injectable, args: [{
|
|
13
|
+
providedIn: 'root',
|
|
14
|
+
},] }
|
|
15
|
+
];
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3Muc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25nLWJhc2Uvc3JjL2xpYi9iYXNlL3NlcnZpY2VzL3dzLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFNM0MsTUFBTSxPQUFPLFNBQVM7SUFHcEIsU0FBUzs7UUFDUCxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3JCLE1BQUMsSUFBSSxDQUFDLE1BQWMsMENBQUUsT0FBTyxFQUFFLENBQUM7SUFDbEMsQ0FBQzs7OztZQVRGLFVBQVUsU0FBQztnQkFDVixVQUFVLEVBQUUsTUFBTTthQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFN1YnNjcmlwdGlvbkNsaWVudCB9IGZyb20gJ3N1YnNjcmlwdGlvbnMtdHJhbnNwb3J0LXdzJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCcsXG59KVxuZXhwb3J0IGNsYXNzIFdzU2VydmljZSB7XG4gIGNsaWVudDogU3Vic2NyaXB0aW9uQ2xpZW50O1xuXG4gIHJlY29ubmVjdCgpIHtcbiAgICB0aGlzLmNsaWVudD8uY2xvc2UoKTtcbiAgICAodGhpcy5jbGllbnQgYXMgYW55KT8uY29ubmVjdCgpO1xuICB9XG59XG4iXX0=
|
|
@@ -146,6 +146,20 @@ StorageService.ctorParameters = () => [
|
|
|
146
146
|
{ type: undefined, decorators: [{ type: Inject, args: [BASE_MODULE_CONFIG,] }] }
|
|
147
147
|
];
|
|
148
148
|
|
|
149
|
+
class WsService {
|
|
150
|
+
reconnect() {
|
|
151
|
+
var _a, _b;
|
|
152
|
+
(_a = this.client) === null || _a === void 0 ? void 0 : _a.close();
|
|
153
|
+
(_b = this.client) === null || _b === void 0 ? void 0 : _b.connect();
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
WsService.ɵprov = i0.ɵɵdefineInjectable({ factory: function WsService_Factory() { return new WsService(); }, token: WsService, providedIn: "root" });
|
|
157
|
+
WsService.decorators = [
|
|
158
|
+
{ type: Injectable, args: [{
|
|
159
|
+
providedIn: 'root',
|
|
160
|
+
},] }
|
|
161
|
+
];
|
|
162
|
+
|
|
149
163
|
/**
|
|
150
164
|
* Authentication service
|
|
151
165
|
*/
|
|
@@ -153,9 +167,10 @@ class AuthService {
|
|
|
153
167
|
/**
|
|
154
168
|
* Constructor
|
|
155
169
|
*/
|
|
156
|
-
constructor(moduleConfig, storageService) {
|
|
170
|
+
constructor(moduleConfig, storageService, wsService) {
|
|
157
171
|
this.moduleConfig = moduleConfig;
|
|
158
172
|
this.storageService = storageService;
|
|
173
|
+
this.wsService = wsService;
|
|
159
174
|
// Subjects
|
|
160
175
|
this._currentUser = new BehaviorSubject(null);
|
|
161
176
|
this._token = new BehaviorSubject(null);
|
|
@@ -192,12 +207,13 @@ class AuthService {
|
|
|
192
207
|
set token(token) {
|
|
193
208
|
this._token.next(token);
|
|
194
209
|
this.storageService.save('token', token);
|
|
210
|
+
this.wsService.reconnect();
|
|
195
211
|
}
|
|
196
212
|
get tokenObservable() {
|
|
197
213
|
return this._token.asObservable();
|
|
198
214
|
}
|
|
199
215
|
}
|
|
200
|
-
AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0.ɵɵinject(BASE_MODULE_CONFIG), i0.ɵɵinject(StorageService)); }, token: AuthService, providedIn: "root" });
|
|
216
|
+
AuthService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AuthService_Factory() { return new AuthService(i0.ɵɵinject(BASE_MODULE_CONFIG), i0.ɵɵinject(StorageService), i0.ɵɵinject(WsService)); }, token: AuthService, providedIn: "root" });
|
|
201
217
|
AuthService.decorators = [
|
|
202
218
|
{ type: Injectable, args: [{
|
|
203
219
|
providedIn: 'root',
|
|
@@ -205,13 +221,14 @@ AuthService.decorators = [
|
|
|
205
221
|
];
|
|
206
222
|
AuthService.ctorParameters = () => [
|
|
207
223
|
{ type: undefined, decorators: [{ type: Inject, args: [BASE_MODULE_CONFIG,] }] },
|
|
208
|
-
{ type: StorageService }
|
|
224
|
+
{ type: StorageService },
|
|
225
|
+
{ type: WsService }
|
|
209
226
|
];
|
|
210
227
|
|
|
211
228
|
/**
|
|
212
229
|
* Factory for apollo-angular options
|
|
213
230
|
*/
|
|
214
|
-
function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
231
|
+
function apolloOptionsFactory(baseModuleConfig, httpLink, authService, wsService) {
|
|
215
232
|
const links = [];
|
|
216
233
|
const defaultUrl = 'api.' + window.location.href + '/graphql';
|
|
217
234
|
const http = httpLink.create({
|
|
@@ -229,27 +246,17 @@ function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
|
229
246
|
return forward(operation);
|
|
230
247
|
});
|
|
231
248
|
if (baseModuleConfig.wsUrl) {
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
});
|
|
244
|
-
}
|
|
245
|
-
else {
|
|
246
|
-
wsClient = new WebSocketLink({
|
|
247
|
-
uri: baseModuleConfig.wsUrl,
|
|
248
|
-
options: {
|
|
249
|
-
reconnect: true,
|
|
250
|
-
},
|
|
251
|
-
});
|
|
252
|
-
}
|
|
249
|
+
const wsLink = new WebSocketLink({
|
|
250
|
+
uri: baseModuleConfig.wsUrl,
|
|
251
|
+
options: {
|
|
252
|
+
reconnect: true,
|
|
253
|
+
connectionParams: () => ({
|
|
254
|
+
Authorization: authService.token ? 'Bearer ' + authService.token : undefined,
|
|
255
|
+
}),
|
|
256
|
+
},
|
|
257
|
+
});
|
|
258
|
+
// Set client for reconnection on logout/login
|
|
259
|
+
wsService.client = wsLink.subscriptionClient;
|
|
253
260
|
// using the ability to split links, you can send data to each link
|
|
254
261
|
// depending on what kind of operation is being sent
|
|
255
262
|
links.push(split(
|
|
@@ -258,7 +265,7 @@ function apolloOptionsFactory(baseModuleConfig, httpLink, authService) {
|
|
|
258
265
|
// @ts-ignore
|
|
259
266
|
const { kind, operation } = getMainDefinition(query);
|
|
260
267
|
return kind === 'OperationDefinition' && operation === 'subscription';
|
|
261
|
-
},
|
|
268
|
+
}, wsLink, concat(authMiddleware, http)));
|
|
262
269
|
}
|
|
263
270
|
else {
|
|
264
271
|
links.push(http);
|
|
@@ -1035,7 +1042,7 @@ class BaseModule {
|
|
|
1035
1042
|
providers.push({
|
|
1036
1043
|
provide: APOLLO_OPTIONS,
|
|
1037
1044
|
useFactory: apolloOptionsFactory,
|
|
1038
|
-
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService],
|
|
1045
|
+
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService, WsService],
|
|
1039
1046
|
});
|
|
1040
1047
|
}
|
|
1041
1048
|
else if (config.logging) {
|
|
@@ -2416,5 +2423,5 @@ function MustMatch(controlName, matchingControlName) {
|
|
|
2416
2423
|
* Generated bundle index. Do not edit.
|
|
2417
2424
|
*/
|
|
2418
2425
|
|
|
2419
|
-
export { AuthGuard, AuthService, BASE_MODULE_CONFIG, BaseModule, BasicUser, CanDeactivateGuard, ComparisonOperatorEnum, ContextMenuDirective, EllipsesPipe, FullscreenService, GraphQLEnum, GraphQLMeta, GraphQLMetaService, GraphQLPlusService, GraphQLRequestType, GraphQLService, GraphQLType, Helper, ImageService, LazyLoadDirective, LoaderService, LogicalOperatorEnum, LogoutGuard, MatchHeightDirective, MustMatch, ResizableDirective, SEOService, SafeHtmlPipe, ScrollService, SortOrderEnum, Standard, StorageService, apolloOptionsFactory };
|
|
2426
|
+
export { AuthGuard, AuthService, BASE_MODULE_CONFIG, BaseModule, BasicUser, CanDeactivateGuard, ComparisonOperatorEnum, ContextMenuDirective, EllipsesPipe, FullscreenService, GraphQLEnum, GraphQLMeta, GraphQLMetaService, GraphQLPlusService, GraphQLRequestType, GraphQLService, GraphQLType, Helper, ImageService, LazyLoadDirective, LoaderService, LogicalOperatorEnum, LogoutGuard, MatchHeightDirective, MustMatch, ResizableDirective, SEOService, SafeHtmlPipe, ScrollService, SortOrderEnum, Standard, StorageService, apolloOptionsFactory, WsService as ɵa };
|
|
2420
2427
|
//# sourceMappingURL=lenne.tech-ng-base-src-lib-base.js.map
|