@lenne.tech/ng-base 14.33.0 → 14.35.0

package/fesm2020/lenne.tech-ng-base-shared.mjs

@@ -1,16 +1,16 @@
 import { GraphQLInputObjectType, GraphQLScalarType, GraphQLEnumType, GraphQLNonNull, GraphQLList, buildClientSchema, getIntrospectionQuery } from 'graphql';
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject } from '@angular/core';
-import { BehaviorSubject, of, throwError, Observable, map as map$1, filter } from 'rxjs';
+import { of, throwError, Observable, BehaviorSubject, map as map$1, filter } from 'rxjs';
 import * as i1 from 'apollo-angular';
 import { gql } from 'apollo-angular';
 import { sha256 } from 'js-sha256';
 import { map } from 'rxjs/operators';
+import * as i1$1 from '@angular/router';
+import { NavigationEnd } from '@angular/router';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import * as i2 from '@angular/common';
 import { DOCUMENT } from '@angular/common';
-import * as i1$1 from '@angular/router';
-import { NavigationEnd } from '@angular/router';
 import Compressor from 'compressorjs';
 import * as i2$1 from '@angular/common/http';
 import { HttpHeaders } from '@angular/common/http';
@@ -781,6 +781,7 @@ class GraphQLMeta {
 class Auth extends Standard {
     constructor() {
         super(...arguments);
+        this.refreshToken = undefined;
         this.token = undefined;
         this.user = undefined;
     }
@@ -843,238 +844,6 @@ function debounce(delay = 300) {
     };
 }
 
-const BASE_MODULE_CONFIG = new InjectionToken('BASE_MODULE_CONFIG');
-
-/**
- * Storage service for local data storage
- */
-class StorageService {
-    /**
-     * Initializations
-     */
-    constructor(moduleConfig) {
-        this.moduleConfig = moduleConfig;
-        /**
-         * Storage
-         */
-        this.storage = null;
-        /**
-         * Prefix for storage keys
-         */
-        this.prefix = '';
-        // Set storage
-        const type = moduleConfig.storageType ? moduleConfig.storageType : 'local';
-        if (type === 'session') {
-            this.storage = sessionStorage;
-        }
-        else {
-            if (localStorage) {
-                this.storage = localStorage;
-            }
-            else {
-                this.storage = null;
-            }
-        }
-        // Set prefix
-        this.prefix = '';
-        if (moduleConfig.prefix) {
-            this.prefix += moduleConfig.prefix + '_';
-        }
-        if (moduleConfig.version) {
-            this.prefix += moduleConfig.version + '_';
-        }
-    }
-    /**
-     * Save itemKeys
-     *
-     * If you want to save one item, use itemKeys and value parameters like these:
-     * save('KEY_OF_THE_ITEM', ITEM)
-     *
-     * If you want to save multiple items, use itemKeys only (value parameter will be ignored):
-     * save({'KEY_OF_ITEM_1': ITEM_1, 'KEY_OF_ITEM_2': ITEM_2, ...})
-     */
-    save(itemKeys, value) {
-        // Check local storage
-        if (!this.storage) {
-            return false;
-        }
-        // Check item keys and value
-        if (!itemKeys ||
-            (typeof itemKeys === 'object' && !Object.keys(itemKeys).length) ||
-            (typeof itemKeys === 'string' && value === undefined)) {
-            return false;
-        }
-        if (typeof itemKeys === 'object') {
-            for (const [itemKey, itemValue] of Object.entries(itemKeys)) {
-                this.storage.setItem(this.prefix + itemKey, JSON.stringify(itemValue));
-            }
-            return true;
-        }
-        this.storage.setItem(this.prefix + itemKeys, JSON.stringify(value));
-        return true;
-    }
-    /**
-     * Load items via key(s)
-     */
-    load(itemKeys) {
-        // Check local storage
-        if (!this.storage) {
-            return;
-        }
-        // Check item keys
-        if (!itemKeys || (Array.isArray(itemKeys) && !itemKeys.length)) {
-            return null;
-        }
-        if (Array.isArray(itemKeys)) {
-            const back = {};
-            itemKeys.forEach((itemKey) => {
-                const loadedItem = this.storage.getItem(this.prefix + itemKey);
-                if (loadedItem) {
-                    back[itemKey] = JSON.parse(loadedItem);
-                }
-                else {
-                    back[itemKey] = null;
-                }
-            });
-            return back;
-        }
-        let value = this.storage.getItem(this.prefix + itemKeys);
-        if (value) {
-            value = JSON.parse(value);
-        }
-        return value;
-    }
-    /**
-     * Remove item from storage
-     *
-     * @param itemKeys keys or key to remove
-     */
-    remove(itemKeys) {
-        // Check local storage
-        if (!this.storage) {
-            return false;
-        }
-        if (Array.isArray(itemKeys)) {
-            itemKeys.forEach((key) => {
-                this.storage.removeItem(this.prefix + key);
-            });
-            return true;
-        }
-        this.storage.removeItem(this.prefix + itemKeys);
-        return true;
-    }
-    /**
-     * Clear local storage
-     */
-    reset() {
-        this.storage.clear();
-    }
-}
-StorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: StorageService, deps: [{ token: BASE_MODULE_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
-StorageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: StorageService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: StorageService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [BASE_MODULE_CONFIG]
-                }] }]; } });
-
-class WsService {
-    reconnect() {
-        this.client?.restart();
-    }
-}
-WsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-WsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WsService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
-/**
- * Authentication service
- */
-class AuthService {
-    /**
-     * Constructor
-     */
-    constructor(moduleConfig, storageService, wsService) {
-        this.moduleConfig = moduleConfig;
-        this.storageService = storageService;
-        this.wsService = wsService;
-        // Subjects
-        this._currentUser = new BehaviorSubject(null);
-        this._token = new BehaviorSubject(null);
-        this.loadFromStorage();
-    }
-    loadFromStorage() {
-        if (localStorage) {
-            this.token = this.storageService.load('token');
-            this.currentUser = this.storageService.load('currentUser');
-        }
-    }
-    /**
-     * Logout
-     */
-    logout() {
-        this.storageService.remove(['token', 'currentUser']);
-        this.currentUser = null;
-        this.token = null;
-    }
-    // #################################################################
-    // Current User
-    // #################################################################
-    get currentUser() {
-        if (!localStorage) {
-            return undefined;
-        }
-        return this._currentUser.value;
-    }
-    set currentUser(user) {
-        this._currentUser.next(user);
-        this.storageService.save('currentUser', user);
-    }
-    get currentUserObservable() {
-        return this._currentUser.asObservable();
-    }
-    // #################################################################
-    // Token
-    // #################################################################
-    get token() {
-        if (!localStorage) {
-            return undefined;
-        }
-        return this._token.value;
-    }
-    set token(token) {
-        this._token.next(token);
-        this.storageService.save('token', token);
-        this.wsService.reconnect();
-    }
-    get tokenObservable() {
-        if (!this._token.value) {
-            this.loadFromStorage();
-        }
-        return this._token.asObservable();
-    }
-}
-AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AuthService, deps: [{ token: BASE_MODULE_CONFIG }, { token: StorageService }, { token: WsService }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AuthService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AuthService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [BASE_MODULE_CONFIG]
-                }] }, { type: StorageService }, { type: WsService }]; } });
-
 /**
  * GraphQL request type enum
  */
@@ -1085,6 +854,8 @@ var GraphQLRequestType;
     GraphQLRequestType["SUBSCRIPTION"] = "subscription";
 })(GraphQLRequestType || (GraphQLRequestType = {}));
 
+const BASE_MODULE_CONFIG = new InjectionToken('BASE_MODULE_CONFIG');
+
 /**
  * GraphQL meta service
  *
@@ -1695,6 +1466,298 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
                     args: [BASE_MODULE_CONFIG]
                 }] }]; } });
 
+/**
+ * Storage service for local data storage
+ */
+class StorageService {
+    /**
+     * Initializations
+     */
+    constructor(moduleConfig) {
+        this.moduleConfig = moduleConfig;
+        /**
+         * Storage
+         */
+        this.storage = null;
+        /**
+         * Prefix for storage keys
+         */
+        this.prefix = '';
+        // Set storage
+        const type = moduleConfig.storageType ? moduleConfig.storageType : 'local';
+        if (type === 'session') {
+            this.storage = sessionStorage;
+        }
+        else {
+            if (localStorage) {
+                this.storage = localStorage;
+            }
+            else {
+                this.storage = null;
+            }
+        }
+        // Set prefix
+        this.prefix = '';
+        if (moduleConfig.prefix) {
+            this.prefix += moduleConfig.prefix + '_';
+        }
+        if (moduleConfig.version) {
+            this.prefix += moduleConfig.version + '_';
+        }
+    }
+    /**
+     * Save itemKeys
+     *
+     * If you want to save one item, use itemKeys and value parameters like these:
+     * save('KEY_OF_THE_ITEM', ITEM)
+     *
+     * If you want to save multiple items, use itemKeys only (value parameter will be ignored):
+     * save({'KEY_OF_ITEM_1': ITEM_1, 'KEY_OF_ITEM_2': ITEM_2, ...})
+     */
+    save(itemKeys, value) {
+        // Check local storage
+        if (!this.storage) {
+            return false;
+        }
+        // Check item keys and value
+        if (!itemKeys ||
+            (typeof itemKeys === 'object' && !Object.keys(itemKeys).length) ||
+            (typeof itemKeys === 'string' && value === undefined)) {
+            return false;
+        }
+        if (typeof itemKeys === 'object') {
+            for (const [itemKey, itemValue] of Object.entries(itemKeys)) {
+                this.storage.setItem(this.prefix + itemKey, JSON.stringify(itemValue));
+            }
+            return true;
+        }
+        this.storage.setItem(this.prefix + itemKeys, JSON.stringify(value));
+        return true;
+    }
+    /**
+     * Load items via key(s)
+     */
+    load(itemKeys) {
+        // Check local storage
+        if (!this.storage) {
+            return;
+        }
+        // Check item keys
+        if (!itemKeys || (Array.isArray(itemKeys) && !itemKeys.length)) {
+            return null;
+        }
+        if (Array.isArray(itemKeys)) {
+            const back = {};
+            itemKeys.forEach((itemKey) => {
+                const loadedItem = this.storage.getItem(this.prefix + itemKey);
+                if (loadedItem) {
+                    back[itemKey] = JSON.parse(loadedItem);
+                }
+                else {
+                    back[itemKey] = null;
+                }
+            });
+            return back;
+        }
+        let value = this.storage.getItem(this.prefix + itemKeys);
+        if (value) {
+            value = JSON.parse(value);
+        }
+        return value;
+    }
+    /**
+     * Remove item from storage
+     *
+     * @param itemKeys keys or key to remove
+     */
+    remove(itemKeys) {
+        // Check local storage
+        if (!this.storage) {
+            return false;
+        }
+        if (Array.isArray(itemKeys)) {
+            itemKeys.forEach((key) => {
+                this.storage.removeItem(this.prefix + key);
+            });
+            return true;
+        }
+        this.storage.removeItem(this.prefix + itemKeys);
+        return true;
+    }
+    /**
+     * Clear local storage
+     */
+    reset() {
+        this.storage.clear();
+    }
+}
+StorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: StorageService, deps: [{ token: BASE_MODULE_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
+StorageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: StorageService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: StorageService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [BASE_MODULE_CONFIG]
+                }] }]; } });
+
+class WsService {
+    reconnect() {
+        this.client?.restart();
+    }
+}
+WsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+WsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: WsService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
+/**
+ * Authentication service
+ */
+class AuthService {
+    /**
+     * Constructor
+     */
+    constructor(storageService, wsService, injector, router) {
+        this.storageService = storageService;
+        this.wsService = wsService;
+        this.injector = injector;
+        this.router = router;
+        // Subjects
+        this._currentUser = new BehaviorSubject(null);
+        this._token = new BehaviorSubject(null);
+        this._refreshToken = new BehaviorSubject(null);
+        this.loadFromStorage();
+    }
+    requestNewToken() {
+        return new Observable((subscriber) => {
+            this.injector
+                .get(GraphQLService)
+                .graphQl('refreshToken', {
+                fields: ['token', 'refreshToken'],
+            })
+                .subscribe({
+                next: (response) => {
+                    this.token = response.token;
+                    this.refreshToken = response.refreshToken;
+                    subscriber.next(response);
+                    subscriber.complete();
+                },
+                error: (err) => {
+                    subscriber.error(err);
+                },
+            });
+        });
+    }
+    loadFromStorage() {
+        if (localStorage) {
+            this.token = this.storageService.load('token');
+            this.refreshToken = this.storageService.load('refreshToken');
+            this.currentUser = this.storageService.load('currentUser');
+        }
+    }
+    /**
+     * Logout
+     */
+    logout(redirect = true) {
+        return new Observable((subscriber) => {
+            this.injector
+                .get(GraphQLService)
+                .graphQl('logout', {
+                fields: [],
+            })
+                .subscribe({
+                next: () => {
+                    this.clearSession(redirect);
+                    subscriber.next(true);
+                    subscriber.complete();
+                },
+                error: (err) => {
+                    subscriber.error(err);
+                },
+            });
+        });
+    }
+    clearSession(redirect = true) {
+        this.storageService.remove(['token', 'refreshToken', 'currentUser']);
+        this.currentUser = null;
+        this.token = null;
+        this.refreshToken = null;
+        if (redirect) {
+            this.router.navigate(['/auth']);
+        }
+    }
+    // #################################################################
+    // Current User
+    // #################################################################
+    get currentUser() {
+        if (!localStorage) {
+            return undefined;
+        }
+        return this._currentUser.value;
+    }
+    set currentUser(user) {
+        this._currentUser.next(user);
+        this.storageService.save('currentUser', user);
+    }
+    get currentUserObservable() {
+        return this._currentUser.asObservable();
+    }
+    // #################################################################
+    // Token
+    // #################################################################
+    get token() {
+        if (!localStorage) {
+            return undefined;
+        }
+        return this._token.value;
+    }
+    set token(token) {
+        this._token.next(token);
+        this.storageService.save('token', token);
+        this.wsService.reconnect();
+    }
+    get tokenObservable() {
+        if (!this._token.value) {
+            this.loadFromStorage();
+        }
+        return this._token.asObservable();
+    }
+    // #################################################################
+    // refreshToken
+    // #################################################################
+    get refreshToken() {
+        if (!localStorage) {
+            return undefined;
+        }
+        return this._refreshToken.value;
+    }
+    set refreshToken(refreshToken) {
+        this._refreshToken.next(refreshToken);
+        this.storageService.save('refreshToken', refreshToken);
+    }
+    get refreshTokenObservable() {
+        if (!this._refreshToken.value) {
+            this.loadFromStorage();
+        }
+        return this._refreshToken.asObservable();
+    }
+}
+AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AuthService, deps: [{ token: StorageService }, { token: WsService }, { token: i0.Injector }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AuthService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AuthService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: StorageService }, { type: WsService }, { type: i0.Injector }, { type: i1$1.Router }]; } });
+
 /**
  * Loader service for loading indication
  */
@@ -2194,15 +2257,16 @@ class UserService extends GraphQLPlusService {
      */
     login(input) {
         return this.graphQl('signIn', {
-            arguments: { input },
-            fields: ['token', { user: ['id', 'firstName', 'lastName', 'email', 'roles', 'avatar'] }],
-            type: GraphQLRequestType.QUERY,
+            arguments: { input: { ...input, deviceDescription: navigator?.userAgent } },
+            fields: ['refreshToken', 'token', { user: ['id', 'firstName', 'lastName', 'email', 'roles', 'avatar'] }],
             loading: true,
         }).pipe(map$1((response) => {
             this.authService.token = response.token;
+            this.authService.refreshToken = response.refreshToken;
             this.authService.currentUser = response.user;
             return Auth.map({
                 token: response.token,
+                refreshToken: response.refreshToken,
                 user: BasicUser.map(response.user),
             });
         }));
@@ -2214,15 +2278,16 @@ class UserService extends GraphQLPlusService {
      */
     register(input) {
         return this.graphQl('signUp', {
-            arguments: { input },
-            fields: ['token', { user: ['id', 'firstName', 'lastName', 'email', 'roles', 'avatar'] }],
-            type: GraphQLRequestType.MUTATION,
+            arguments: { input: { ...input, deviceDescription: navigator?.userAgent } },
+            fields: ['refreshToken', 'token', { user: ['id', 'firstName', 'lastName', 'email', 'roles', 'avatar'] }],
             loading: true,
         }).pipe(map$1((response) => {
             this.authService.token = response.token;
+            this.authService.refreshToken = response.refreshToken;
             this.authService.currentUser = response.user;
             return Auth.map({
                 token: response.token,
+                refreshToken: response.refreshToken,
                 user: BasicUser.map(response.user),
             });
         }));