@lenne.tech/ng-base 0.3.13 → 12.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/lenne.tech-ng-base-src-lib-base.umd.js +2 -2
- package/bundles/lenne.tech-ng-base-src-lib-base.umd.js.map +1 -1
- package/bundles/lenne.tech-ng-base.umd.js +2 -2
- package/bundles/lenne.tech-ng-base.umd.js.map +1 -1
- package/esm2015/lib/base/base.module.js +3 -3
- package/esm2015/src/lib/base/base.module.js +3 -3
- package/fesm2015/lenne.tech-ng-base-src-lib-base.js +2 -2
- package/fesm2015/lenne.tech-ng-base-src-lib-base.js.map +1 -1
- package/fesm2015/lenne.tech-ng-base.js +2 -2
- package/fesm2015/lenne.tech-ng-base.js.map +1 -1
- package/lib/base/base.module.d.ts +1 -1
- package/package.json +1 -1
- package/src/lib/base/base.module.d.ts +1 -1
|
@@ -29,7 +29,7 @@ export class BaseModule {
|
|
|
29
29
|
/**
|
|
30
30
|
* Set configuration of base module in root module of the app
|
|
31
31
|
*/
|
|
32
|
-
static forRoot(baseModuleConfig = {}) {
|
|
32
|
+
static forRoot(baseModuleConfig = {}, AppAuthService) {
|
|
33
33
|
// Default config
|
|
34
34
|
const config = Object.assign({ apiUrl: 'localhost:3000', authGuardRedirectUrl: '/auth', logging: false, version: null, prefix: null, scrollDetectionOffset: 200, scrollOffset: 100, storageType: 'local' }, baseModuleConfig);
|
|
35
35
|
// Prepare providers
|
|
@@ -44,7 +44,7 @@ export class BaseModule {
|
|
|
44
44
|
providers.push({
|
|
45
45
|
provide: APOLLO_OPTIONS,
|
|
46
46
|
useFactory: apolloOptionsFactory,
|
|
47
|
-
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService, WsService],
|
|
47
|
+
deps: [BASE_MODULE_CONFIG, HttpLink, AppAuthService ? AppAuthService : AuthService, WsService],
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
else if (config.logging) {
|
|
@@ -63,4 +63,4 @@ BaseModule.decorators = [
|
|
|
63
63
|
exports: elements,
|
|
64
64
|
},] }
|
|
65
65
|
];
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZy1iYXNlL3NyYy9saWIvYmFzZS9iYXNlLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQy9DLE9BQU8sRUFBdUIsUUFBUSxFQUFZLE1BQU0sZUFBZSxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsa0JBQWtCLEVBQW9CLE1BQU0sMkNBQTJDLENBQUM7QUFDakcsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDMUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDckUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEQsaUNBQWlDO0FBQ2pDLE1BQU0sUUFBUSxHQUFHO0lBQ2YsYUFBYTtJQUNiLG9CQUFvQjtJQUNwQixpQkFBaUI7SUFDakIsb0JBQW9CO0lBQ3BCLGtCQUFrQjtJQUVsQixRQUFRO0lBQ1IsWUFBWTtJQUNaLFlBQVk7Q0FDYixDQUFDO0FBRUY7O0dBRUc7QUFLSCxNQUFNLE9BQU8sVUFBVTtJQUNyQjs7T0FFRztJQUNILE1BQU0sQ0FBQyxPQUFPLENBQUMsbUJBQXFDLEVBQUUsRUFBRSxjQUFlO1FBQ3JFLGlCQUFpQjtRQUNqQixNQUFNLE1BQU0sbUJBQ1YsTUFBTSxFQUFFLGdCQUFnQixFQUN4QixvQkFBb0IsRUFBRSxPQUFPLEVBQzdCLE9BQU8sRUFBRSxLQUFLLEVBQ2QsT0FBTyxFQUFFLElBQUksRUFDYixNQUFNLEVBQUUsSUFBSSxFQUNaLHFCQUFxQixFQUFFLEdBQUcsRUFDMUIsWUFBWSxFQUFFLEdBQUcsRUFDakIsV0FBVyxFQUFFLE9BQU8sSUFDakIsZ0JBQWdCLENBQ3BCLENBQUM7UUFFRixvQkFBb0I7UUFDcEIsTUFBTSxTQUFTLEdBQWU7WUFDNUI7Z0JBQ0UsT0FBTyxFQUFFLGtCQUFrQjtnQkFDM0IsUUFBUSxFQUFFLGdCQUFnQjthQUMzQjtTQUNGLENBQUM7UUFFRix3Q0FBd0M7UUFDeEMsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUU7WUFDM0IsU0FBUyxDQUFDLElBQUksQ0FBQztnQkFDYixPQUFPLEVBQUUsY0FBYztnQkFDdkIsVUFBVSxFQUFFLG9CQUFvQjtnQkFDaEMsSUFBSSxFQUFFLENBQUMsa0JBQWtCLEVBQUUsUUFBUSxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsU0FBUyxDQUFDO2FBQy9GLENBQUMsQ0FBQztTQUNKO2FBQU0sSUFBSSxNQUFNLENBQUMsT0FBTyxFQUFFO1lBQ3pCLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0RBQWtELENBQUMsQ0FBQztTQUNqRTtRQUVELHFCQUFxQjtRQUNyQixPQUFPO1lBQ0wsUUFBUSxFQUFFLFVBQVU7WUFDcEIsU0FBUztTQUNWLENBQUM7SUFDSixDQUFDOzs7WUE5Q0YsUUFBUSxTQUFDO2dCQUNSLFlBQVksRUFBRSxRQUFRO2dCQUN0QixPQUFPLEVBQUUsUUFBUTthQUNsQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFQT0xMT19PUFRJT05TIH0gZnJvbSAnYXBvbGxvLWFuZ3VsYXInO1xuaW1wb3J0IHsgSHR0cExpbmsgfSBmcm9tICdhcG9sbG8tYW5ndWxhci9odHRwJztcbmltcG9ydCB7IE1vZHVsZVdpdGhQcm92aWRlcnMsIE5nTW9kdWxlLCBQcm92aWRlciB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuL3NlcnZpY2VzL2F1dGguc2VydmljZSc7XG5pbXBvcnQgeyBCQVNFX01PRFVMRV9DT05GSUcsIEJhc2VNb2R1bGVDb25maWcgfSBmcm9tICcuL2ludGVyZmFjZXMvYmFzZS1tb2R1bGUtY29uZmlnLmludGVyZmFjZSc7XG5pbXBvcnQgeyBhcG9sbG9PcHRpb25zRmFjdG9yeSB9IGZyb20gJy4vZmFjdG9yaWVzL2Fwb2xsby1vcHRpb25zLmZhY3RvcnknO1xuaW1wb3J0IHsgQ29udGV4dE1lbnVEaXJlY3RpdmUgfSBmcm9tICcuL2RpcmVjdGl2ZXMvY29udGV4dC1tZW51LmRpcmVjdGl2ZSc7XG5pbXBvcnQgeyBMYXp5TG9hZERpcmVjdGl2ZSB9IGZyb20gJy4vZGlyZWN0aXZlcy9sYXp5LWxvYWQuZGlyZWN0aXZlJztcbmltcG9ydCB7IE1hdGNoSGVpZ2h0RGlyZWN0aXZlIH0gZnJvbSAnLi9kaXJlY3RpdmVzL21hdGNoLWhlaWdodC5kaXJlY3RpdmUnO1xuaW1wb3J0IHsgUmVzaXphYmxlRGlyZWN0aXZlIH0gZnJvbSAnLi9kaXJlY3RpdmVzL3Jlc2l6YWJsZS5kaXJlY3RpdmUnO1xuaW1wb3J0IHsgRWxsaXBzZXNQaXBlIH0gZnJvbSAnLi9waXBlcy9lbGxpcHNlcy5waXBlJztcbmltcG9ydCB7IFNhZmVIdG1sUGlwZSB9IGZyb20gJy4vcGlwZXMvc2FmZS1odG1sLnBpcGUnO1xuaW1wb3J0IHsgV3NTZXJ2aWNlIH0gZnJvbSAnLi9zZXJ2aWNlcy93cy5zZXJ2aWNlJztcblxuLy8gSW1wb3J0ZWQgYW5kIGV4cG9ydGVkIGVsZW1lbnRzXG5jb25zdCBlbGVtZW50cyA9IFtcbiAgLy8gRGlyZWN0aXZlc1xuICBDb250ZXh0TWVudURpcmVjdGl2ZSxcbiAgTGF6eUxvYWREaXJlY3RpdmUsXG4gIE1hdGNoSGVpZ2h0RGlyZWN0aXZlLFxuICBSZXNpemFibGVEaXJlY3RpdmUsXG5cbiAgLy8gUGlwZXNcbiAgRWxsaXBzZXNQaXBlLFxuICBTYWZlSHRtbFBpcGUsXG5dO1xuXG4vKipcbiAqIEJhc2UgbW9kdWxlXG4gKi9cbkBOZ01vZHVsZSh7XG4gIGRlY2xhcmF0aW9uczogZWxlbWVudHMsXG4gIGV4cG9ydHM6IGVsZW1lbnRzLFxufSlcbmV4cG9ydCBjbGFzcyBCYXNlTW9kdWxlIHtcbiAgLyoqXG4gICAqIFNldCBjb25maWd1cmF0aW9uIG9mIGJhc2UgbW9kdWxlIGluIHJvb3QgbW9kdWxlIG9mIHRoZSBhcHBcbiAgICovXG4gIHN0YXRpYyBmb3JSb290KGJhc2VNb2R1bGVDb25maWc6IEJhc2VNb2R1bGVDb25maWcgPSB7fSwgQXBwQXV0aFNlcnZpY2U/KTogTW9kdWxlV2l0aFByb3ZpZGVyczxCYXNlTW9kdWxlPiB7XG4gICAgLy8gRGVmYXVsdCBjb25maWdcbiAgICBjb25zdCBjb25maWcgPSB7XG4gICAgICBhcGlVcmw6ICdsb2NhbGhvc3Q6MzAwMCcsXG4gICAgICBhdXRoR3VhcmRSZWRpcmVjdFVybDogJy9hdXRoJyxcbiAgICAgIGxvZ2dpbmc6IGZhbHNlLFxuICAgICAgdmVyc2lvbjogbnVsbCxcbiAgICAgIHByZWZpeDogbnVsbCxcbiAgICAgIHNjcm9sbERldGVjdGlvbk9mZnNldDogMjAwLFxuICAgICAgc2Nyb2xsT2Zmc2V0OiAxMDAsXG4gICAgICBzdG9yYWdlVHlwZTogJ2xvY2FsJyxcbiAgICAgIC4uLmJhc2VNb2R1bGVDb25maWcsXG4gICAgfTtcblxuICAgIC8vIFByZXBhcmUgcHJvdmlkZXJzXG4gICAgY29uc3QgcHJvdmlkZXJzOiBQcm92aWRlcltdID0gW1xuICAgICAge1xuICAgICAgICBwcm92aWRlOiBCQVNFX01PRFVMRV9DT05GSUcsXG4gICAgICAgIHVzZVZhbHVlOiBiYXNlTW9kdWxlQ29uZmlnLFxuICAgICAgfSxcbiAgICBdO1xuXG4gICAgLy8gQWRkIGFwb2xsbyBmZWF0dXJlcyBpZiBBUEkgVVJMIGlzIHNldFxuICAgIGlmIChiYXNlTW9kdWxlQ29uZmlnLmFwaVVybCkge1xuICAgICAgcHJvdmlkZXJzLnB1c2goe1xuICAgICAgICBwcm92aWRlOiBBUE9MTE9fT1BUSU9OUyxcbiAgICAgICAgdXNlRmFjdG9yeTogYXBvbGxvT3B0aW9uc0ZhY3RvcnksXG4gICAgICAgIGRlcHM6IFtCQVNFX01PRFVMRV9DT05GSUcsIEh0dHBMaW5rLCBBcHBBdXRoU2VydmljZSA/IEFwcEF1dGhTZXJ2aWNlIDogQXV0aFNlcnZpY2UsIFdzU2VydmljZV0sXG4gICAgICB9KTtcbiAgICB9IGVsc2UgaWYgKGNvbmZpZy5sb2dnaW5nKSB7XG4gICAgICBjb25zb2xlLmxvZygnYXBpVXJsIGlzIG1pc3NpbmcsIEFwb2xsb0xpbmsgaXMgbm90IGluaXRpYWxpemVkJyk7XG4gICAgfVxuXG4gICAgLy8gUmV0dXJuIHJvb3QgbW9kdWxlXG4gICAgcmV0dXJuIHtcbiAgICAgIG5nTW9kdWxlOiBCYXNlTW9kdWxlLFxuICAgICAgcHJvdmlkZXJzLFxuICAgIH07XG4gIH1cbn1cbiJdfQ==
|
|
@@ -29,7 +29,7 @@ export class BaseModule {
|
|
|
29
29
|
/**
|
|
30
30
|
* Set configuration of base module in root module of the app
|
|
31
31
|
*/
|
|
32
|
-
static forRoot(baseModuleConfig = {}) {
|
|
32
|
+
static forRoot(baseModuleConfig = {}, AppAuthService) {
|
|
33
33
|
// Default config
|
|
34
34
|
const config = Object.assign({ apiUrl: 'localhost:3000', authGuardRedirectUrl: '/auth', logging: false, version: null, prefix: null, scrollDetectionOffset: 200, scrollOffset: 100, storageType: 'local' }, baseModuleConfig);
|
|
35
35
|
// Prepare providers
|
|
@@ -44,7 +44,7 @@ export class BaseModule {
|
|
|
44
44
|
providers.push({
|
|
45
45
|
provide: APOLLO_OPTIONS,
|
|
46
46
|
useFactory: apolloOptionsFactory,
|
|
47
|
-
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService, WsService],
|
|
47
|
+
deps: [BASE_MODULE_CONFIG, HttpLink, AppAuthService ? AppAuthService : AuthService, WsService],
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
else if (config.logging) {
|
|
@@ -63,4 +63,4 @@ BaseModule.decorators = [
|
|
|
63
63
|
exports: elements,
|
|
64
64
|
},] }
|
|
65
65
|
];
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZy1iYXNlL3NyYy9saWIvYmFzZS9iYXNlLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQy9DLE9BQU8sRUFBdUIsUUFBUSxFQUFZLE1BQU0sZUFBZSxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsa0JBQWtCLEVBQW9CLE1BQU0sMkNBQTJDLENBQUM7QUFDakcsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDMUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDckUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEQsaUNBQWlDO0FBQ2pDLE1BQU0sUUFBUSxHQUFHO0lBQ2YsYUFBYTtJQUNiLG9CQUFvQjtJQUNwQixpQkFBaUI7SUFDakIsb0JBQW9CO0lBQ3BCLGtCQUFrQjtJQUVsQixRQUFRO0lBQ1IsWUFBWTtJQUNaLFlBQVk7Q0FDYixDQUFDO0FBRUY7O0dBRUc7QUFLSCxNQUFNLE9BQU8sVUFBVTtJQUNyQjs7T0FFRztJQUNILE1BQU0sQ0FBQyxPQUFPLENBQUMsbUJBQXFDLEVBQUUsRUFBRSxjQUFlO1FBQ3JFLGlCQUFpQjtRQUNqQixNQUFNLE1BQU0sbUJBQ1YsTUFBTSxFQUFFLGdCQUFnQixFQUN4QixvQkFBb0IsRUFBRSxPQUFPLEVBQzdCLE9BQU8sRUFBRSxLQUFLLEVBQ2QsT0FBTyxFQUFFLElBQUksRUFDYixNQUFNLEVBQUUsSUFBSSxFQUNaLHFCQUFxQixFQUFFLEdBQUcsRUFDMUIsWUFBWSxFQUFFLEdBQUcsRUFDakIsV0FBVyxFQUFFLE9BQU8sSUFDakIsZ0JBQWdCLENBQ3BCLENBQUM7UUFFRixvQkFBb0I7UUFDcEIsTUFBTSxTQUFTLEdBQWU7WUFDNUI7Z0JBQ0UsT0FBTyxFQUFFLGtCQUFrQjtnQkFDM0IsUUFBUSxFQUFFLGdCQUFnQjthQUMzQjtTQUNGLENBQUM7UUFFRix3Q0FBd0M7UUFDeEMsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUU7WUFDM0IsU0FBUyxDQUFDLElBQUksQ0FBQztnQkFDYixPQUFPLEVBQUUsY0FBYztnQkFDdkIsVUFBVSxFQUFFLG9CQUFvQjtnQkFDaEMsSUFBSSxFQUFFLENBQUMsa0JBQWtCLEVBQUUsUUFBUSxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsU0FBUyxDQUFDO2FBQy9GLENBQUMsQ0FBQztTQUNKO2FBQU0sSUFBSSxNQUFNLENBQUMsT0FBTyxFQUFFO1lBQ3pCLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0RBQWtELENBQUMsQ0FBQztTQUNqRTtRQUVELHFCQUFxQjtRQUNyQixPQUFPO1lBQ0wsUUFBUSxFQUFFLFVBQVU7WUFDcEIsU0FBUztTQUNWLENBQUM7SUFDSixDQUFDOzs7WUE5Q0YsUUFBUSxTQUFDO2dCQUNSLFlBQVksRUFBRSxRQUFRO2dCQUN0QixPQUFPLEVBQUUsUUFBUTthQUNsQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFQT0xMT19PUFRJT05TIH0gZnJvbSAnYXBvbGxvLWFuZ3VsYXInO1xuaW1wb3J0IHsgSHR0cExpbmsgfSBmcm9tICdhcG9sbG8tYW5ndWxhci9odHRwJztcbmltcG9ydCB7IE1vZHVsZVdpdGhQcm92aWRlcnMsIE5nTW9kdWxlLCBQcm92aWRlciB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuL3NlcnZpY2VzL2F1dGguc2VydmljZSc7XG5pbXBvcnQgeyBCQVNFX01PRFVMRV9DT05GSUcsIEJhc2VNb2R1bGVDb25maWcgfSBmcm9tICcuL2ludGVyZmFjZXMvYmFzZS1tb2R1bGUtY29uZmlnLmludGVyZmFjZSc7XG5pbXBvcnQgeyBhcG9sbG9PcHRpb25zRmFjdG9yeSB9IGZyb20gJy4vZmFjdG9yaWVzL2Fwb2xsby1vcHRpb25zLmZhY3RvcnknO1xuaW1wb3J0IHsgQ29udGV4dE1lbnVEaXJlY3RpdmUgfSBmcm9tICcuL2RpcmVjdGl2ZXMvY29udGV4dC1tZW51LmRpcmVjdGl2ZSc7XG5pbXBvcnQgeyBMYXp5TG9hZERpcmVjdGl2ZSB9IGZyb20gJy4vZGlyZWN0aXZlcy9sYXp5LWxvYWQuZGlyZWN0aXZlJztcbmltcG9ydCB7IE1hdGNoSGVpZ2h0RGlyZWN0aXZlIH0gZnJvbSAnLi9kaXJlY3RpdmVzL21hdGNoLWhlaWdodC5kaXJlY3RpdmUnO1xuaW1wb3J0IHsgUmVzaXphYmxlRGlyZWN0aXZlIH0gZnJvbSAnLi9kaXJlY3RpdmVzL3Jlc2l6YWJsZS5kaXJlY3RpdmUnO1xuaW1wb3J0IHsgRWxsaXBzZXNQaXBlIH0gZnJvbSAnLi9waXBlcy9lbGxpcHNlcy5waXBlJztcbmltcG9ydCB7IFNhZmVIdG1sUGlwZSB9IGZyb20gJy4vcGlwZXMvc2FmZS1odG1sLnBpcGUnO1xuaW1wb3J0IHsgV3NTZXJ2aWNlIH0gZnJvbSAnLi9zZXJ2aWNlcy93cy5zZXJ2aWNlJztcblxuLy8gSW1wb3J0ZWQgYW5kIGV4cG9ydGVkIGVsZW1lbnRzXG5jb25zdCBlbGVtZW50cyA9IFtcbiAgLy8gRGlyZWN0aXZlc1xuICBDb250ZXh0TWVudURpcmVjdGl2ZSxcbiAgTGF6eUxvYWREaXJlY3RpdmUsXG4gIE1hdGNoSGVpZ2h0RGlyZWN0aXZlLFxuICBSZXNpemFibGVEaXJlY3RpdmUsXG5cbiAgLy8gUGlwZXNcbiAgRWxsaXBzZXNQaXBlLFxuICBTYWZlSHRtbFBpcGUsXG5dO1xuXG4vKipcbiAqIEJhc2UgbW9kdWxlXG4gKi9cbkBOZ01vZHVsZSh7XG4gIGRlY2xhcmF0aW9uczogZWxlbWVudHMsXG4gIGV4cG9ydHM6IGVsZW1lbnRzLFxufSlcbmV4cG9ydCBjbGFzcyBCYXNlTW9kdWxlIHtcbiAgLyoqXG4gICAqIFNldCBjb25maWd1cmF0aW9uIG9mIGJhc2UgbW9kdWxlIGluIHJvb3QgbW9kdWxlIG9mIHRoZSBhcHBcbiAgICovXG4gIHN0YXRpYyBmb3JSb290KGJhc2VNb2R1bGVDb25maWc6IEJhc2VNb2R1bGVDb25maWcgPSB7fSwgQXBwQXV0aFNlcnZpY2U/KTogTW9kdWxlV2l0aFByb3ZpZGVyczxCYXNlTW9kdWxlPiB7XG4gICAgLy8gRGVmYXVsdCBjb25maWdcbiAgICBjb25zdCBjb25maWcgPSB7XG4gICAgICBhcGlVcmw6ICdsb2NhbGhvc3Q6MzAwMCcsXG4gICAgICBhdXRoR3VhcmRSZWRpcmVjdFVybDogJy9hdXRoJyxcbiAgICAgIGxvZ2dpbmc6IGZhbHNlLFxuICAgICAgdmVyc2lvbjogbnVsbCxcbiAgICAgIHByZWZpeDogbnVsbCxcbiAgICAgIHNjcm9sbERldGVjdGlvbk9mZnNldDogMjAwLFxuICAgICAgc2Nyb2xsT2Zmc2V0OiAxMDAsXG4gICAgICBzdG9yYWdlVHlwZTogJ2xvY2FsJyxcbiAgICAgIC4uLmJhc2VNb2R1bGVDb25maWcsXG4gICAgfTtcblxuICAgIC8vIFByZXBhcmUgcHJvdmlkZXJzXG4gICAgY29uc3QgcHJvdmlkZXJzOiBQcm92aWRlcltdID0gW1xuICAgICAge1xuICAgICAgICBwcm92aWRlOiBCQVNFX01PRFVMRV9DT05GSUcsXG4gICAgICAgIHVzZVZhbHVlOiBiYXNlTW9kdWxlQ29uZmlnLFxuICAgICAgfSxcbiAgICBdO1xuXG4gICAgLy8gQWRkIGFwb2xsbyBmZWF0dXJlcyBpZiBBUEkgVVJMIGlzIHNldFxuICAgIGlmIChiYXNlTW9kdWxlQ29uZmlnLmFwaVVybCkge1xuICAgICAgcHJvdmlkZXJzLnB1c2goe1xuICAgICAgICBwcm92aWRlOiBBUE9MTE9fT1BUSU9OUyxcbiAgICAgICAgdXNlRmFjdG9yeTogYXBvbGxvT3B0aW9uc0ZhY3RvcnksXG4gICAgICAgIGRlcHM6IFtCQVNFX01PRFVMRV9DT05GSUcsIEh0dHBMaW5rLCBBcHBBdXRoU2VydmljZSA/IEFwcEF1dGhTZXJ2aWNlIDogQXV0aFNlcnZpY2UsIFdzU2VydmljZV0sXG4gICAgICB9KTtcbiAgICB9IGVsc2UgaWYgKGNvbmZpZy5sb2dnaW5nKSB7XG4gICAgICBjb25zb2xlLmxvZygnYXBpVXJsIGlzIG1pc3NpbmcsIEFwb2xsb0xpbmsgaXMgbm90IGluaXRpYWxpemVkJyk7XG4gICAgfVxuXG4gICAgLy8gUmV0dXJuIHJvb3QgbW9kdWxlXG4gICAgcmV0dXJuIHtcbiAgICAgIG5nTW9kdWxlOiBCYXNlTW9kdWxlLFxuICAgICAgcHJvdmlkZXJzLFxuICAgIH07XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1027,7 +1027,7 @@ class BaseModule {
|
|
|
1027
1027
|
/**
|
|
1028
1028
|
* Set configuration of base module in root module of the app
|
|
1029
1029
|
*/
|
|
1030
|
-
static forRoot(baseModuleConfig = {}) {
|
|
1030
|
+
static forRoot(baseModuleConfig = {}, AppAuthService) {
|
|
1031
1031
|
// Default config
|
|
1032
1032
|
const config = Object.assign({ apiUrl: 'localhost:3000', authGuardRedirectUrl: '/auth', logging: false, version: null, prefix: null, scrollDetectionOffset: 200, scrollOffset: 100, storageType: 'local' }, baseModuleConfig);
|
|
1033
1033
|
// Prepare providers
|
|
@@ -1042,7 +1042,7 @@ class BaseModule {
|
|
|
1042
1042
|
providers.push({
|
|
1043
1043
|
provide: APOLLO_OPTIONS,
|
|
1044
1044
|
useFactory: apolloOptionsFactory,
|
|
1045
|
-
deps: [BASE_MODULE_CONFIG, HttpLink, AuthService, WsService],
|
|
1045
|
+
deps: [BASE_MODULE_CONFIG, HttpLink, AppAuthService ? AppAuthService : AuthService, WsService],
|
|
1046
1046
|
});
|
|
1047
1047
|
}
|
|
1048
1048
|
else if (config.logging) {
|