@trudb/tru-common-lib 0.0.701 → 0.0.703

package/fesm2020/trudb-tru-common-lib.mjs

@@ -70,11 +70,9 @@ import * as signalR from '@microsoft/signalr';
 import moment$1 from 'moment';
 import * as i8 from 'ag-grid-angular';
 import { AgGridModule } from 'ag-grid-angular';
-import { tap, map, catchError } from 'rxjs/operators';
+import { tap, switchMap, catchError } from 'rxjs/operators';
 import * as i1$6 from '@angular/router';
 import { RouterModule } from '@angular/router';
-import * as i6$1 from '@auth0/angular-jwt';
-import { JwtHelperService } from '@auth0/angular-jwt';
 import * as i1$7 from '@angular/platform-browser';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -3680,6 +3678,9 @@ const TRU_AUTH_CONFIG = {
 };
 const TRU_AUTH_STRATEGY = new InjectionToken("AuthStrategy");
 
+class TruAuthUserRequest {
+}
+
 class TruAuthCache {
     constructor() {
         this.prunables = [];
@@ -3701,41 +3702,42 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
         }] });
 
 class TruAuth {
-    constructor(router, http, cache, user, appEnvironment, jwtHelperService, auth) {
+    constructor(router, http, cache, user, appEnvironment, auth) {
         this.router = router;
         this.http = http;
         this.cache = cache;
         this.user = user;
         this.appEnvironment = appEnvironment;
-        this.jwtHelperService = jwtHelperService;
         this.auth = auth;
         this.loggedIn = new BehaviorSubject(false);
         this.baseUrl = '';
+        this.createUserRequest = (username) => {
+            let truUser = new TruAuthUserRequest();
+            truUser.username = username;
+            return truUser;
+        };
         this.baseUrl = this.appEnvironment.appUri;
     }
     login(loginRequest) {
         return this.http
             .post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
-            .pipe(tap((data) => {
+            .pipe(tap(switchMap(data => this.http
+            .post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/user`, this.createUserRequest(loginRequest.username))
+            .pipe(tap((user) => {
             this.auth.doLoginUser(data);
+            this.user.create(user);
             this.loggedIn.next(true);
-        }));
+        })))));
     }
     logout() {
         this.doLogoutUser();
     }
-    isLoggedIn$() {
-        return this.auth.getCurrentUser().pipe(map(() => true), catchError(() => of(false)));
-    }
     get isLoggedIn() {
         if (!this.loggedIn.value) {
             this.loggedIn.next(this.auth.isLoggedIn());
         }
         return this.loggedIn.asObservable();
     }
-    getCurrentUser$() {
-        return this.auth.getCurrentUser();
-    }
     doLogoutAndRedirectToLogin() {
         this.doLogoutUser();
         this.loggedIn.next(false);
@@ -3747,14 +3749,14 @@ class TruAuth {
         this.auth.doLogoutUser();
     }
 }
-TruAuth.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, deps: [{ token: i1$6.Router }, { token: i1$3.HttpClient }, { token: TruAuthCache }, { token: TruUser }, { token: TruAppEnvironment }, { token: i6$1.JwtHelperService }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
+TruAuth.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, deps: [{ token: i1$6.Router }, { token: i1$3.HttpClient }, { token: TruAuthCache }, { token: TruUser }, { token: TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
 TruAuth.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, providedIn: "root" });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: "root",
                 }]
-        }], ctorParameters: function () { return [{ type: i1$6.Router }, { type: i1$3.HttpClient }, { type: TruAuthCache }, { type: TruUser }, { type: TruAppEnvironment }, { type: i6$1.JwtHelperService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1$6.Router }, { type: i1$3.HttpClient }, { type: TruAuthCache }, { type: TruUser }, { type: TruAppEnvironment }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [TRU_AUTH_STRATEGY]
                 }] }]; } });
@@ -5970,29 +5972,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
             args: [{ selector: 'tru-login', template: "<div class=\"login-wrapper\">\r\n  <form [formGroup]=\"loginForm\" (ngSubmit)=\"onSubmit()\">\r\n    <mat-card class=\"animate-login\">\r\n      <mat-card-header>\r\n        <mat-card-title> loginFormTitle </mat-card-title>\r\n      </mat-card-header>\r\n      <mat-card-content>\r\n        <mat-form-field>\r\n          <mat-label>Username</mat-label>\r\n          <input matInput formControlName=\"username\" placeholder=\"Username\">\r\n        </mat-form-field>\r\n        <mat-form-field>\r\n          <mat-label>Password</mat-label>\r\n          <input matInput type=\"password\" formControlName=\"password\" placeholder=\"Password\">\r\n        </mat-form-field>\r\n        <div *ngIf=\"loginError\" class=\"animate-login-error animated rubberBand\">\r\n          <p style=\"color: red; font-weight: bold;\"> {{ loginError }}</p>\r\n        </div>\r\n      </mat-card-content>\r\n      <mat-card-actions>\r\n        <button mat-raised-button color=\"primary\" type=\"submit\" [disabled]=\"isDisabled()\">Login</button>\r\n      </mat-card-actions>\r\n    </mat-card>\r\n  </form>\r\n</div>\r\n", styles: [".login-container{display:flex;justify-content:center;align-items:center;height:100vh;margin:0;padding:0}.login-input{margin-bottom:20px}.animate-login{display:flex;flex-direction:column;justify-content:center;align-items:center;height:100%;margin-top:50px}.wrapper{display:flex;justify-content:center;align-items:center;height:100vh}mat-card{max-width:300px;width:100%;max-height:300px;padding:20px}.form-group{width:100%;max-width:400px;margin-bottom:20px}.login-wrapper{display:flex;justify-content:center;align-items:center;height:100vh}::ng-deep .login-wrapper .mat-mdc-text-field-wrapper{padding:0 16px!important}\n"] }]
         }], ctorParameters: function () { return [{ type: TruAuth }]; } });
 
-const helper = new JwtHelperService();
 class TruAuthJwtStrategy {
     constructor() {
         this.JWT_ACCESS_TOKEN = "ACCESS_TOKEN";
         this.JWT_REFRESH_TOKEN = "REFRESH_TOKEN";
-        this.USER_CLAIMS = "USER_CLAIMS";
     }
     doLoginUser(token) {
         localStorage.setItem(this.JWT_ACCESS_TOKEN, JSON.stringify(token.accessToken));
         localStorage.setItem(this.JWT_REFRESH_TOKEN, JSON.stringify(token.refreshToken));
-        localStorage.setItem(this.USER_CLAIMS, JSON.stringify(token.userClaims));
     }
     doLogoutUser() {
         localStorage.removeItem(this.JWT_ACCESS_TOKEN);
     }
-    getCurrentUser() {
-        let token = helper.decodeToken(localStorage.getItem(this.JWT_ACCESS_TOKEN));
-        return of(JSON.parse(helper.decodeToken(localStorage.getItem(this.JWT_ACCESS_TOKEN))));
-    }
-    getUserRoles() {
-        let token = helper.decodeToken(localStorage.getItem(this.JWT_ACCESS_TOKEN));
-        return of(token);
-    }
     isLoggedIn() {
         return !!this.getJwtToken();
     }