@etsoo/appscript 1.1.52 → 1.1.56

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

@@ -12,6 +12,29 @@ 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 props
+ */
+export interface RefreshTokenProps<D extends {}> {
+    /**
+     * Callback
+     */
+    callback?: (result: RefreshTokenResult) => void;
+    /**
+     * Data to pass
+     */
+    data?: D;
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
+}
 /**
  * Core application interface
  */
@@ -171,13 +194,19 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     pageExit(): void;
     /**
      * Refresh token
+     * @param props Props
      */
-    refreshToken(): Promise<boolean>;
+    refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): 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
      */
@@ -415,8 +444,9 @@ 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<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Setup callback
      */
@@ -426,6 +456,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @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
      */
@@ -438,6 +473,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,8 +399,11 @@ class CoreApp {
     }
     /**
      * Refresh token
+     * @param callback Callback
      */
-    async refreshToken() {
+    async refreshToken(props) {
+        if (props && props.callback)
+            props.callback(true);
         return true;
     }
     /**
@@ -424,6 +427,19 @@ class CoreApp {
         // 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
      */
@@ -454,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,29 @@ 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 props
+ */
+export interface RefreshTokenProps<D extends {}> {
+    /**
+     * Callback
+     */
+    callback?: (result: RefreshTokenResult) => void;
+    /**
+     * Data to pass
+     */
+    data?: D;
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
+}
 /**
  * Core application interface
  */
@@ -171,13 +194,19 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     pageExit(): void;
     /**
      * Refresh token
+     * @param props Props
      */
-    refreshToken(): Promise<boolean>;
+    refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): 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
      */
@@ -415,8 +444,9 @@ 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<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Setup callback
      */
@@ -426,6 +456,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @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
      */
@@ -438,6 +473,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,8 +396,11 @@ export class CoreApp {
     }
     /**
      * Refresh token
+     * @param callback Callback
      */
-    async refreshToken() {
+    async refreshToken(props) {
+        if (props && props.callback)
+            props.callback(true);
         return true;
     }
     /**
@@ -421,6 +424,19 @@ export class CoreApp {
         // 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
      */
@@ -451,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.52",
+    "version": "1.1.56",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -65,7 +65,7 @@
         "@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.3",

package/src/app/CoreApp.ts

@@ -29,6 +29,37 @@ 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 props
+ */
+export interface RefreshTokenProps<D extends {}> {
+    /**
+     * Callback
+     */
+    callback?: (result: RefreshTokenResult) => void;
+
+    /**
+     * Data to pass
+     */
+    data?: D;
+
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
+}
+
 /**
  * Core application interface
  */
@@ -231,8 +262,11 @@ export interface ICoreApp<
 
     /**
      * Refresh token
+     * @param props Props
      */
-    refreshToken(): Promise<boolean>;
+    refreshToken<D extends {} = {}>(
+        props?: RefreshTokenProps<D>
+    ): Promise<boolean>;
 
     /**
      * Signout
@@ -240,6 +274,12 @@ export interface ICoreApp<
      */
     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
      */
@@ -817,8 +857,10 @@ export abstract class CoreApp<
 
     /**
      * Refresh token
+     * @param callback Callback
      */
-    async refreshToken(): Promise<boolean> {
+    async refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>) {
+        if (props && props.callback) props.callback(true);
         return true;
     }
 
@@ -847,6 +889,20 @@ export abstract class CoreApp<
         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
      */
@@ -881,6 +937,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;