@trudb/tru-common-lib 0.0.357 → 0.0.360

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

@@ -11,7 +11,7 @@ import moment from 'moment/moment';
 import * as i1 from '@angular/material/dialog';
 import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 import * as i1$2 from '@angular/common/http';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
 import * as i3 from '@angular/material/checkbox';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import * as i1$1 from 'ngx-toastr';
@@ -33,6 +33,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { tap, map, catchError } from 'rxjs/operators';
 import * as i1$5 from '@angular/router';
+import { RouterModule } from '@angular/router';
 import * as i4 from '@angular/material/card';
 import { MatCardModule } from '@angular/material/card';
 import { A11yModule } from '@angular/cdk/a11y';
@@ -4508,17 +4509,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
         }] });
 
 class TruAuth {
-    constructor(router, http, cache, auth) {
+    constructor(router, http, cache, environment, auth) {
         this.router = router;
         this.http = http;
         this.cache = cache;
+        this.environment = environment;
         this.auth = auth;
         this.loggedIn = new BehaviorSubject(false);
-        this.baseUrl = "https://localhost:44303"; //this.environmentService.getValue('apiUrl');
+        this.baseUrl = '';
+        if (location.hostname === 'localhost' || location.hostname === '127.0.0.1' || location.hostname === '')
+            this.baseUrl = 'https://localhost:44303';
+        else
+            this.baseUrl = '';
     }
     login(loginRequest) {
         return this.http
-            //.post<any>(this.baseUrl + "/auth/Login", loginRequest)
             .post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
             .pipe(tap((data) => {
             this.auth.doLoginUser(data);
@@ -4529,9 +4534,7 @@ class TruAuth {
         this.doLogoutUser();
     }
     isLoggedIn$() {
-        return this.auth.getCurrentUser().pipe(map(() => true), 
-        //map((user) => !!user),
-        catchError(() => of(false)));
+        return this.auth.getCurrentUser().pipe(map(() => true), catchError(() => of(false)));
     }
     get isLoggedIn() {
         if (!this.loggedIn.value) {
@@ -4551,14 +4554,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$5.Router }, { token: i1$2.HttpClient }, { token: TruAuthCache }, { 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$5.Router }, { token: i1$2.HttpClient }, { token: TruAuthCache }, { 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$5.Router }, { type: i1$2.HttpClient }, { type: TruAuthCache }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1$5.Router }, { type: i1$2.HttpClient }, { type: TruAuthCache }, { type: TruAppEnvironment }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [TRU_AUTH_STRATEGY]
                 }] }]; } });
@@ -4576,7 +4579,6 @@ class TruLogin {
         return this.loginForm.controls;
     }
     onSubmit() {
-        //create a new login request
         const loginRequest = {
             username: this.f.username.value,
             password: this.f.password.value
@@ -4586,9 +4588,7 @@ class TruLogin {
                 .login(loginRequest)
                 .subscribe((user) => [
             //this.router.navigate(...) where to?
-            ]
-            //if there is a login error
-            , (error) => {
+            ], (error) => {
                 if (error.status === 401) {
                     this.loginError = "Incorrect username and/or password";
                 }
@@ -4753,20 +4753,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
                 }]
         }] });
 
-class TruLoginModule {
-}
-TruLoginModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruLoginModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-TruLoginModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.1", ngImport: i0, type: TruLoginModule, declarations: [TruLogin], imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule], exports: [TruLogin] });
-TruLoginModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruLoginModule, imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruLoginModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    declarations: [TruLogin],
-                    imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule,],
-                    exports: [TruLogin]
-                }]
-        }] });
-
 class TruAuthJwtStrategy {
     constructor() {
         this.JWT_TOKEN = "JWT_TOKEN";
@@ -4837,6 +4823,81 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
                     args: [TRU_AUTH_STRATEGY]
                 }] }]; } });
 
+class TruAuthSessionStrategy {
+    constructor(http) {
+        this.http = http;
+    }
+    doLoginUser(user) {
+        this.loggedUser = user;
+    }
+    doLogoutUser() {
+        this.loggedUser = undefined;
+    }
+    getCurrentUser() {
+        if (this.loggedUser) {
+            return of(this.loggedUser);
+        }
+        else {
+            return this.http
+                .get(`${TRU_AUTH_CONFIG.authUrl}/user`)
+                .pipe(tap((user) => (this.loggedUser = user)));
+        }
+    }
+    isLoggedIn() {
+        return false; //todo, implement this
+    }
+}
+
+const TruAuthStrategyProvider = {
+    provide: TRU_AUTH_STRATEGY,
+    deps: [HttpClient],
+    useFactory: (http) => {
+        switch (TRU_AUTH_CONFIG.auth) {
+            case "session":
+                return new TruAuthSessionStrategy(http);
+            case "token":
+                return new TruAuthJwtStrategy();
+            default:
+                throw new Error("Invalid auth strategy");
+        }
+    },
+};
+
+const routes = [
+    {
+        path: 'login',
+        component: TruLogin
+    }
+];
+class TruLoginModule {
+}
+TruLoginModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruLoginModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+TruLoginModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.1", ngImport: i0, type: TruLoginModule, declarations: [TruLogin], imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, i1$5.RouterModule], exports: [TruLogin] });
+TruLoginModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruLoginModule, providers: [
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: TruAuthInterceptor,
+            multi: true,
+        },
+        TruAuthStrategyProvider
+    ], imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, RouterModule.forChild(routes)] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruLoginModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    declarations: [TruLogin],
+                    imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, RouterModule.forChild(routes)],
+                    exports: [TruLogin],
+                    providers: [
+                        {
+                            provide: HTTP_INTERCEPTORS,
+                            useClass: TruAuthInterceptor,
+                            multi: true,
+                        },
+                        TruAuthStrategyProvider
+                    ],
+                }]
+        }] });
+
 class TruValidationDialog {
     constructor(renderer, elementRef, util) {
         this.renderer = renderer;
@@ -5623,5 +5684,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { DetailViewModule, TruAppEnvironment, TruAuthInterceptor, TruBreezeContext, TruBreezeContextFactory, TruBreezeMetadataProvider, TruBreezeValidator, TruBreezeValidatorModule, TruChoice, TruColumn, TruColumnModule, TruCommonModule, TruComponentConfigBase, TruComponentLookup, TruConfirmDialog, TruConfirmDialogConfig, TruConfirmDialogModule, TruContextFilter, TruContextFilterChoice, TruContextFilters, TruControlComponentConfigBase, TruDataContext, TruDataGrid, TruDataGridModule, TruDataGridTypes, TruDesktop, TruDesktopManager, TruDesktopModule, TruDetailViewBase, TruEditControlBase, TruEditControlConfigBase, TruEntityAccessor, TruEntityBase, TruExportDialog, TruExportDialogConfig, TruExportDialogModule, TruForm, TruFormModule, TruFormulaEval, TruGroupBox, TruGroupBoxModule, TruIconModule, TruLogin, TruLoginModule, TruPredicate, TruPredicateMap, TruPropertyConfigBase, TruPropertyConfigCloudFile, TruPropertyConfigDate, TruPropertyConfigDecimal, TruPropertyConfigFile, TruPropertyConfigForeignKey, TruPropertyConfigInteger, TruPropertyConfigPassword, TruPropertyConfigPercentage, TruPropertyConfigScientific, TruPropertyConfigText, TruPropertyConfigTextChoices, TruPropertyConfigUsaAddress, TruPropertyConfigZipCode, TruQueryPredicateManager, TruRow, TruRowModule, TruSearchConfigBase, TruSearchControlBase, TruSearchControlConfigBase, TruSearchControlRangeBase, TruSearchIconModule, TruSearchPanelPositionManager, TruSearchPanelPositionManagerModule, TruSearchViewBase, TruSearchViewBaseModule, TruSearchViewControlEventHandler, TruSearchViewEventHandler, TruSort, TruTableConfigBase, TruTableRegistry, TruTextManager, TruToolbar, TruToolbarButton, TruToolbarButtonModule, TruToolbarContextFilter, TruToolbarContextFilterModule, TruToolbarDropdown, TruToolbarDropdownModule, TruToolbarMenu, TruToolbarMenuModule, TruToolbarModule, TruToolbarSeparator, TruToolbarSeparatorModule, TruToolbarText, TruToolbarTextModule, TruUiNotification, TruUser, TruUtil, TruValidationDialog, TruValidationDialogModule, TruWindowActionEventHandler, TruWindowAddViewEventArgs, TruWindowEventArgs, TruWindowEventHandler };
+export { DetailViewModule, TruAppEnvironment, TruAuth, TruAuthInterceptor, TruBreezeContext, TruBreezeContextFactory, TruBreezeMetadataProvider, TruBreezeValidator, TruBreezeValidatorModule, TruChoice, TruColumn, TruColumnModule, TruCommonModule, TruComponentConfigBase, TruComponentLookup, TruConfirmDialog, TruConfirmDialogConfig, TruConfirmDialogModule, TruContextFilter, TruContextFilterChoice, TruContextFilters, TruControlComponentConfigBase, TruDataContext, TruDataGrid, TruDataGridModule, TruDataGridTypes, TruDesktop, TruDesktopManager, TruDesktopModule, TruDetailViewBase, TruEditControlBase, TruEditControlConfigBase, TruEntityAccessor, TruEntityBase, TruExportDialog, TruExportDialogConfig, TruExportDialogModule, TruForm, TruFormModule, TruFormulaEval, TruGroupBox, TruGroupBoxModule, TruIconModule, TruLogin, TruLoginModule, TruPredicate, TruPredicateMap, TruPropertyConfigBase, TruPropertyConfigCloudFile, TruPropertyConfigDate, TruPropertyConfigDecimal, TruPropertyConfigFile, TruPropertyConfigForeignKey, TruPropertyConfigInteger, TruPropertyConfigPassword, TruPropertyConfigPercentage, TruPropertyConfigScientific, TruPropertyConfigText, TruPropertyConfigTextChoices, TruPropertyConfigUsaAddress, TruPropertyConfigZipCode, TruQueryPredicateManager, TruRow, TruRowModule, TruSearchConfigBase, TruSearchControlBase, TruSearchControlConfigBase, TruSearchControlRangeBase, TruSearchIconModule, TruSearchPanelPositionManager, TruSearchPanelPositionManagerModule, TruSearchViewBase, TruSearchViewBaseModule, TruSearchViewControlEventHandler, TruSearchViewEventHandler, TruSort, TruTableConfigBase, TruTableRegistry, TruTextManager, TruToolbar, TruToolbarButton, TruToolbarButtonModule, TruToolbarContextFilter, TruToolbarContextFilterModule, TruToolbarDropdown, TruToolbarDropdownModule, TruToolbarMenu, TruToolbarMenuModule, TruToolbarModule, TruToolbarSeparator, TruToolbarSeparatorModule, TruToolbarText, TruToolbarTextModule, TruUiNotification, TruUser, TruUtil, TruValidationDialog, TruValidationDialogModule, TruWindowActionEventHandler, TruWindowAddViewEventArgs, TruWindowEventArgs, TruWindowEventHandler };
 //# sourceMappingURL=trudb-tru-common-lib.mjs.map