@ts-core/angular 13.0.15 → 13.0.18

package/login/LoginGuard.d.ts

@@ -1,13 +1,13 @@
-import { CanActivate, UrlTree } from '@angular/router';
-import { RouterBaseService } from '../public-api';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { LoginBaseService } from './LoginBaseService';
 import { LoginRequireResolver } from './LoginRequireResolver';
+import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
-export declare class LoginGuard extends LoginRequireResolver implements CanActivate {
-    protected router: RouterBaseService;
-    redirectUrl: string;
-    constructor(login: LoginBaseService, router: RouterBaseService);
-    canActivate(): boolean | UrlTree;
-    static ɵfac: i0.ɵɵFactoryDeclaration<LoginGuard, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<LoginGuard>;
+export declare class LoginGuard<T extends LoginBaseService = LoginBaseService> extends LoginRequireResolver<T> implements CanActivate {
+    protected router: Router;
+    static redirectUrl: string;
+    constructor(login: T, router: Router);
+    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoginGuard<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LoginGuard<any>>;
 }

package/login/LoginNotGuard.d.ts

@@ -1,13 +1,13 @@
-import { CanActivate, UrlTree } from '@angular/router';
-import { RouterBaseService } from '../public-api';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { LoginBaseService } from './LoginBaseService';
 import { LoginRequireResolver } from './LoginRequireResolver';
+import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
-export declare class LoginNotGuard extends LoginRequireResolver implements CanActivate {
-    protected router: RouterBaseService;
-    redirectUrl: string;
-    constructor(login: LoginBaseService, router: RouterBaseService);
-    canActivate(): boolean | UrlTree;
-    static ɵfac: i0.ɵɵFactoryDeclaration<LoginNotGuard, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<LoginNotGuard>;
+export declare class LoginNotGuard<T extends LoginBaseService = LoginBaseService> extends LoginRequireResolver<T> implements CanActivate {
+    protected router: Router;
+    static redirectUrl: string;
+    constructor(login: T, router: Router);
+    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoginNotGuard<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LoginNotGuard<any>>;
 }

package/login/LoginRequireResolver.d.ts

@@ -1,8 +1,8 @@
 import { Resolve } from '@angular/router';
 import { LoginBaseService } from './LoginBaseService';
-export declare class LoginRequireResolver<E = any, U = any, V = any> implements Resolve<V> {
-    protected login: LoginBaseService<E, U, V>;
-    constructor(login: LoginBaseService<E, U, V>);
-    resolve(): Promise<V>;
+export declare class LoginRequireResolver<T extends LoginBaseService = LoginBaseService> implements Resolve<void> {
+    protected login: T;
+    constructor(login: T);
+    resolve(): Promise<void>;
     isLoggedIn(): boolean;
 }

package/login/LoginResolver.d.ts

@@ -1,11 +1,8 @@
 import { LoginBaseService } from './LoginBaseService';
 import { LoginRequireResolver } from './LoginRequireResolver';
 import * as i0 from "@angular/core";
-export declare class LoginResolver extends LoginRequireResolver {
-    static logoutUrl: string;
-    static loggedInUrl: string;
-    static notLoggedInUrl: string;
-    constructor(login: LoginBaseService);
-    static ɵfac: i0.ɵɵFactoryDeclaration<LoginResolver, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<LoginResolver>;
+export declare class LoginResolver<T extends LoginBaseService> extends LoginRequireResolver<T> {
+    constructor(login: T);
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoginResolver<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LoginResolver<any>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-core/angular",
-  "version": "13.0.15",
+  "version": "13.0.18",
   "description": "Modules for frontend based on angular",
   "main": "public-api.js",
   "author": {

package/public-api.d.ts

@@ -62,10 +62,9 @@ export * from './language/LanguageDirective';
 export * from './language/LanguageHasDirective';
 export * from './login/LoginGuard';
 export * from './login/LoginNotGuard';
+export * from './login/LoginResolver';
 export * from './login/LoginBaseService';
-export * from './login/LoginRedirectResolver';
 export * from './login/LoginRequireResolver';
-export * from './login/LoginResolver';
 export * from './manager/FocusManager';
 export * from './manager/ResizeManager';
 export * from './menu/MenuItem';

package/esm2020/login/LoginRedirectResolver.mjs

@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { LoginResolver } from './LoginResolver';
-import * as i0 from "@angular/core";
-export class LoginRedirectResolver {
-    // --------------------------------------------------------------------------
-    //
-    // 	Public Methods
-    //`
-    // --------------------------------------------------------------------------
-    canActivate(route, state) {
-        LoginResolver.loggedInUrl = state.url;
-        return true;
-    }
-}
-LoginRedirectResolver.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginRedirectResolver, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-LoginRedirectResolver.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginRedirectResolver, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginRedirectResolver, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }] });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naW5SZWRpcmVjdFJlc29sdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xvZ2luL0xvZ2luUmVkaXJlY3RSZXNvbHZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQzs7QUFHaEQsTUFBTSxPQUFPLHFCQUFxQjtJQUM5Qiw2RUFBNkU7SUFDN0UsRUFBRTtJQUNGLGtCQUFrQjtJQUNsQixHQUFHO0lBQ0gsNkVBQTZFO0lBRXRFLFdBQVcsQ0FBQyxLQUE2QixFQUFFLEtBQTBCO1FBQ3hFLGFBQWEsQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQztRQUN0QyxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDOztrSEFWUSxxQkFBcUI7c0hBQXJCLHFCQUFxQixjQURSLE1BQU07MkZBQ25CLHFCQUFxQjtrQkFEakMsVUFBVTttQkFBQyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBDYW5BY3RpdmF0ZSwgUm91dGVyU3RhdGVTbmFwc2hvdCB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBMb2dpblJlc29sdmVyIH0gZnJvbSAnLi9Mb2dpblJlc29sdmVyJztcblxuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBMb2dpblJlZGlyZWN0UmVzb2x2ZXIgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgICAvL1xuICAgIC8vIFx0UHVibGljIE1ldGhvZHNcbiAgICAvL2BcbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuXG4gICAgcHVibGljIGNhbkFjdGl2YXRlKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdCk6IGJvb2xlYW4ge1xuICAgICAgICBMb2dpblJlc29sdmVyLmxvZ2dlZEluVXJsID0gc3RhdGUudXJsO1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG59XG4iXX0=

package/login/LoginRedirectResolver.d.ts

@@ -1,7 +0,0 @@
-import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
-import * as i0 from "@angular/core";
-export declare class LoginRedirectResolver implements CanActivate {
-    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean;
-    static ɵfac: i0.ɵɵFactoryDeclaration<LoginRedirectResolver, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<LoginRedirectResolver>;
-}