@etsoo/appscript 1.1.50 → 1.1.54

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

@@ -12,6 +12,18 @@ import { UserRole } from './UserRole';
 export interface IDetectIPCallback {
     (): void;
 }
+/**
+ * Refresh token result type
+ * true means success, false means failed but no any message
+ * other cases means failed with differnet message
+ */
+export declare type RefreshTokenResult = boolean | string | ApiDataError | IActionResult;
+/**
+ * Refresh token callback
+ */
+export interface RefreshTokenCallback {
+    (result: RefreshTokenResult): void;
+}
 /**
  * Core application interface
  */
@@ -171,8 +183,23 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     pageExit(): void;
     /**
      * Refresh token
+     * @param callback Callback
+     */
+    refreshToken(callback?: RefreshTokenCallback): Promise<boolean>;
+    /**
+     * Signout
+     * @param apiUrl Signout API URL
+     */
+    signout(apiUrl?: string): Promise<void>;
+    /**
+     * Switch organization
+     * @param apiOrOrg API URL or organization id
      */
-    refreshToken(): Promise<boolean>;
+    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    /**
+     * Go to the login page
+     */
+    toLoginPage(): void;
     /**
      * Transform URL
      * @param url URL
@@ -406,12 +433,27 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
      * Refresh token
+     * @param callback Callback
      */
-    refreshToken(): Promise<boolean>;
+    refreshToken(callback?: RefreshTokenCallback): Promise<boolean>;
     /**
      * Setup callback
      */
     setup(): void;
+    /**
+     * Signout
+     * @param apiUrl Signout API URL
+     */
+    signout(apiUrl?: string): Promise<void>;
+    /**
+     * Switch organization
+     * @param apiOrOrg API URL or organization id
+     */
+    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    /**
+     * Go to the login page
+     */
+    toLoginPage(): void;
     /**
      * Transform URL
      * @param url URL
@@ -420,6 +462,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     transformUrl(url: string): string;
     /**
      * Try login, returning false means is loading
+     * UI get involved while refreshToken not intended
      */
     tryLogin(): Promise<boolean>;
     /**

package/lib/cjs/app/CoreApp.js

@@ -399,14 +399,53 @@ class CoreApp {
     }
     /**
      * Refresh token
+     * @param callback Callback
      */
-    async refreshToken() {
+    async refreshToken(callback) {
+        if (callback)
+            callback(true);
         return true;
     }
     /**
      * Setup callback
      */
     setup() { }
+    /**
+     * Signout
+     * @param apiUrl Signout API URL
+     */
+    async signout(apiUrl) {
+        await this.api.put(apiUrl !== null && apiUrl !== void 0 ? apiUrl : 'User/Signout', undefined, {
+            onError: (error) => {
+                console.log(error);
+                // Prevent further processing
+                return false;
+            }
+        });
+        // Clear
+        this.userLogout();
+        // Go to login page
+        this.toLoginPage();
+    }
+    /**
+     * Switch organization
+     * @param apiOrOrg API URL or organization id
+     */
+    async switchOrg(apiOrOrg) {
+        const api = typeof apiOrOrg === 'number'
+            ? `Organization/Switch/${apiOrOrg}`
+            : apiOrOrg;
+        const result = await this.api.put(api);
+        if (result)
+            return await this.refreshToken();
+        return result;
+    }
+    /**
+     * Go to the login page
+     */
+    toLoginPage() {
+        window.location.replace(this.transformUrl('/'));
+    }
     /**
      * Transform URL
      * @param url URL
@@ -431,6 +470,7 @@ class CoreApp {
     }
     /**
      * Try login, returning false means is loading
+     * UI get involved while refreshToken not intended
      */
     async tryLogin() {
         if (this._isTryingLogin)

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

@@ -12,6 +12,18 @@ import { UserRole } from './UserRole';
 export interface IDetectIPCallback {
     (): void;
 }
+/**
+ * Refresh token result type
+ * true means success, false means failed but no any message
+ * other cases means failed with differnet message
+ */
+export declare type RefreshTokenResult = boolean | string | ApiDataError | IActionResult;
+/**
+ * Refresh token callback
+ */
+export interface RefreshTokenCallback {
+    (result: RefreshTokenResult): void;
+}
 /**
  * Core application interface
  */
@@ -171,8 +183,23 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     pageExit(): void;
     /**
      * Refresh token
+     * @param callback Callback
+     */
+    refreshToken(callback?: RefreshTokenCallback): Promise<boolean>;
+    /**
+     * Signout
+     * @param apiUrl Signout API URL
+     */
+    signout(apiUrl?: string): Promise<void>;
+    /**
+     * Switch organization
+     * @param apiOrOrg API URL or organization id
      */
-    refreshToken(): Promise<boolean>;
+    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    /**
+     * Go to the login page
+     */
+    toLoginPage(): void;
     /**
      * Transform URL
      * @param url URL
@@ -406,12 +433,27 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
      * Refresh token
+     * @param callback Callback
      */
-    refreshToken(): Promise<boolean>;
+    refreshToken(callback?: RefreshTokenCallback): Promise<boolean>;
     /**
      * Setup callback
      */
     setup(): void;
+    /**
+     * Signout
+     * @param apiUrl Signout API URL
+     */
+    signout(apiUrl?: string): Promise<void>;
+    /**
+     * Switch organization
+     * @param apiOrOrg API URL or organization id
+     */
+    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    /**
+     * Go to the login page
+     */
+    toLoginPage(): void;
     /**
      * Transform URL
      * @param url URL
@@ -420,6 +462,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     transformUrl(url: string): string;
     /**
      * Try login, returning false means is loading
+     * UI get involved while refreshToken not intended
      */
     tryLogin(): Promise<boolean>;
     /**

package/lib/mjs/app/CoreApp.js

@@ -396,14 +396,53 @@ export class CoreApp {
     }
     /**
      * Refresh token
+     * @param callback Callback
      */
-    async refreshToken() {
+    async refreshToken(callback) {
+        if (callback)
+            callback(true);
         return true;
     }
     /**
      * Setup callback
      */
     setup() { }
+    /**
+     * Signout
+     * @param apiUrl Signout API URL
+     */
+    async signout(apiUrl) {
+        await this.api.put(apiUrl !== null && apiUrl !== void 0 ? apiUrl : 'User/Signout', undefined, {
+            onError: (error) => {
+                console.log(error);
+                // Prevent further processing
+                return false;
+            }
+        });
+        // Clear
+        this.userLogout();
+        // Go to login page
+        this.toLoginPage();
+    }
+    /**
+     * Switch organization
+     * @param apiOrOrg API URL or organization id
+     */
+    async switchOrg(apiOrOrg) {
+        const api = typeof apiOrOrg === 'number'
+            ? `Organization/Switch/${apiOrOrg}`
+            : apiOrOrg;
+        const result = await this.api.put(api);
+        if (result)
+            return await this.refreshToken();
+        return result;
+    }
+    /**
+     * Go to the login page
+     */
+    toLoginPage() {
+        window.location.replace(this.transformUrl('/'));
+    }
     /**
      * Transform URL
      * @param url URL
@@ -428,6 +467,7 @@ export class CoreApp {
     }
     /**
      * Try login, returning false means is loading
+     * UI get involved while refreshToken not intended
      */
     async tryLogin() {
         if (this._isTryingLogin)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.50",
+    "version": "1.1.54",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,7 +52,7 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.0.93",
+        "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/restclient": "^1.0.62",
         "@etsoo/shared": "^1.0.75"
     },
@@ -65,10 +65,10 @@
         "@types/jest": "^27.0.3",
         "@typescript-eslint/eslint-plugin": "^5.5.0",
         "@typescript-eslint/parser": "^5.5.0",
-        "eslint": "^8.3.0",
+        "eslint": "^8.4.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
-        "jest": "^27.4.2",
+        "jest": "^27.4.3",
         "ts-jest": "^27.0.7",
         "typescript": "^4.5.2"
     }

package/src/app/CoreApp.ts

@@ -29,6 +29,24 @@ export interface IDetectIPCallback {
     (): void;
 }
 
+/**
+ * Refresh token result type
+ * true means success, false means failed but no any message
+ * other cases means failed with differnet message
+ */
+export type RefreshTokenResult =
+    | boolean
+    | string
+    | ApiDataError
+    | IActionResult;
+
+/**
+ * Refresh token callback
+ */
+export interface RefreshTokenCallback {
+    (result: RefreshTokenResult): void;
+}
+
 /**
  * Core application interface
  */
@@ -231,8 +249,26 @@ export interface ICoreApp<
 
     /**
      * Refresh token
+     * @param callback Callback
+     */
+    refreshToken(callback?: RefreshTokenCallback): Promise<boolean>;
+
+    /**
+     * Signout
+     * @param apiUrl Signout API URL
+     */
+    signout(apiUrl?: string): Promise<void>;
+
+    /**
+     * Switch organization
+     * @param apiOrOrg API URL or organization id
+     */
+    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+
+    /**
+     * Go to the login page
      */
-    refreshToken(): Promise<boolean>;
+    toLoginPage(): void;
 
     /**
      * Transform URL
@@ -806,8 +842,10 @@ export abstract class CoreApp<
 
     /**
      * Refresh token
+     * @param callback Callback
      */
-    async refreshToken(): Promise<boolean> {
+    async refreshToken(callback?: RefreshTokenCallback) {
+        if (callback) callback(true);
         return true;
     }
 
@@ -816,6 +854,47 @@ export abstract class CoreApp<
      */
     setup() {}
 
+    /**
+     * Signout
+     * @param apiUrl Signout API URL
+     */
+    async signout(apiUrl?: string) {
+        await this.api.put<boolean>(apiUrl ?? 'User/Signout', undefined, {
+            onError: (error) => {
+                console.log(error);
+                // Prevent further processing
+                return false;
+            }
+        });
+
+        // Clear
+        this.userLogout();
+
+        // Go to login page
+        this.toLoginPage();
+    }
+
+    /**
+     * Switch organization
+     * @param apiOrOrg API URL or organization id
+     */
+    async switchOrg(apiOrOrg: string | number) {
+        const api =
+            typeof apiOrOrg === 'number'
+                ? `Organization/Switch/${apiOrOrg}`
+                : apiOrOrg;
+        const result = await this.api.put<boolean>(api);
+        if (result) return await this.refreshToken();
+        return result;
+    }
+
+    /**
+     * Go to the login page
+     */
+    toLoginPage() {
+        window.location.replace(this.transformUrl('/'));
+    }
+
     /**
      * Transform URL
      * @param url URL
@@ -843,6 +922,7 @@ export abstract class CoreApp<
 
     /**
      * Try login, returning false means is loading
+     * UI get involved while refreshToken not intended
      */
     async tryLogin() {
         if (this._isTryingLogin) return false;