@etsoo/appscript 1.1.3 → 1.1.4

package/lib/cjs/app/CoreApp.d.ts

@@ -43,6 +43,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Country or region, like CN
      */
     readonly region: string;
+    /**
+     * Is current authorized
+     */
+    readonly authorized: boolean;
     /**
      * IP data
      */
@@ -149,6 +153,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Transformed url
      */
     transformUrl(url: string): string;
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data
@@ -213,6 +221,13 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Search input element
      */
     searchInput?: HTMLInputElement;
+    private _authorized;
+    /**
+     * Is current authorized
+     */
+    get authorized(): boolean;
+    private set authorized(value);
+    private _isTryingLogin;
     /**
      * Protected constructor
      * @param settings Settings
@@ -326,9 +341,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     transformUrl(url: string): string;
     /**
-     * Try login
+     * Try login, returning false means is loading
      */
-    abstract tryLogin(): void;
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data

package/lib/cjs/app/CoreApp.js

@@ -19,6 +19,8 @@ class CoreApp {
          * Response token header field name
          */
         this.headerTokenField = 'SmartERPRefreshToken';
+        this._authorized = false;
+        this._isTryingLogin = false;
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -79,6 +81,15 @@ class CoreApp {
     get labelDelegate() {
         return this.get.bind(this);
     }
+    /**
+     * Is current authorized
+     */
+    get authorized() {
+        return this._authorized;
+    }
+    set authorized(value) {
+        this._authorized = value;
+    }
     /**
      * Alert action result
      * @param result Action result
@@ -93,10 +104,15 @@ class CoreApp {
      * @param keep Keep in local storage or not
      */
     authorize(token, refreshToken, keep = false) {
+        // State, when token is null, means logout
+        this.authorized = token != null;
+        // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
         shared_1.StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
         shared_1.StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        // Reset tryLogin state
+        this._isTryingLogin = false;
     }
     /**
      * Change country or region
@@ -312,6 +328,15 @@ class CoreApp {
         // To /a/b/../ => /a
         return pathname.endsWith('/') ? pathname + url : pathname + '/' + url;
     }
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin() {
+        if (this._isTryingLogin)
+            return false;
+        this._isTryingLogin = true;
+        return true;
+    }
     /**
      * User login
      * @param user User data

package/lib/mjs/app/CoreApp.d.ts

@@ -43,6 +43,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Country or region, like CN
      */
     readonly region: string;
+    /**
+     * Is current authorized
+     */
+    readonly authorized: boolean;
     /**
      * IP data
      */
@@ -149,6 +153,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Transformed url
      */
     transformUrl(url: string): string;
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data
@@ -213,6 +221,13 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Search input element
      */
     searchInput?: HTMLInputElement;
+    private _authorized;
+    /**
+     * Is current authorized
+     */
+    get authorized(): boolean;
+    private set authorized(value);
+    private _isTryingLogin;
     /**
      * Protected constructor
      * @param settings Settings
@@ -326,9 +341,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     transformUrl(url: string): string;
     /**
-     * Try login
+     * Try login, returning false means is loading
      */
-    abstract tryLogin(): void;
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data

package/lib/mjs/app/CoreApp.js

@@ -16,6 +16,8 @@ export class CoreApp {
          * Response token header field name
          */
         this.headerTokenField = 'SmartERPRefreshToken';
+        this._authorized = false;
+        this._isTryingLogin = false;
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -76,6 +78,15 @@ export class CoreApp {
     get labelDelegate() {
         return this.get.bind(this);
     }
+    /**
+     * Is current authorized
+     */
+    get authorized() {
+        return this._authorized;
+    }
+    set authorized(value) {
+        this._authorized = value;
+    }
     /**
      * Alert action result
      * @param result Action result
@@ -90,10 +101,15 @@ export class CoreApp {
      * @param keep Keep in local storage or not
      */
     authorize(token, refreshToken, keep = false) {
+        // State, when token is null, means logout
+        this.authorized = token != null;
+        // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
         StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
         StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        // Reset tryLogin state
+        this._isTryingLogin = false;
     }
     /**
      * Change country or region
@@ -309,6 +325,15 @@ export class CoreApp {
         // To /a/b/../ => /a
         return pathname.endsWith('/') ? pathname + url : pathname + '/' + url;
     }
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin() {
+        if (this._isTryingLogin)
+            return false;
+        this._isTryingLogin = true;
+        return true;
+    }
     /**
      * User login
      * @param user User data

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -65,6 +65,11 @@ export interface ICoreApp<
      */
     readonly region: string;
 
+    /**
+     * Is current authorized
+     */
+    readonly authorized: boolean;
+
     /**
      * IP data
      */
@@ -199,6 +204,11 @@ export interface ICoreApp<
      */
     transformUrl(url: string): string;
 
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin(): boolean;
+
     /**
      * User login
      * @param user User data
@@ -291,6 +301,20 @@ export abstract class CoreApp<
      */
     searchInput?: HTMLInputElement;
 
+    private _authorized: boolean = false;
+    /**
+     * Is current authorized
+     */
+    get authorized() {
+        return this._authorized;
+    }
+
+    private set authorized(value: boolean) {
+        this._authorized = value;
+    }
+
+    private _isTryingLogin = false;
+
     /**
      * Protected constructor
      * @param settings Settings
@@ -355,6 +379,10 @@ export abstract class CoreApp<
      * @param keep Keep in local storage or not
      */
     authorize(token?: string, refreshToken?: string, keep: boolean = false) {
+        // State, when token is null, means logout
+        this.authorized = token != null;
+
+        // Token
         this.api.authorize(this.settings.authScheme, token);
 
         // Cover the current value
@@ -366,6 +394,9 @@ export abstract class CoreApp<
             this.headerTokenField,
             keep ? undefined : refreshToken
         );
+
+        // Reset tryLogin state
+        this._isTryingLogin = false;
     }
 
     /**
@@ -632,9 +663,13 @@ export abstract class CoreApp<
     }
 
     /**
-     * Try login
+     * Try login, returning false means is loading
      */
-    abstract tryLogin(): void;
+    tryLogin() {
+        if (this._isTryingLogin) return false;
+        this._isTryingLogin = true;
+        return true;
+    }
 
     /**
      * User login