@etsoo/appscript 1.5.17 → 1.5.19

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

@@ -83,7 +83,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     get region(): string;
     private _deviceId;
     /**
-     * Country or region, like CN
+     * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId(): string;
     /**
@@ -550,7 +550,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
     /**
      * Setup callback
      */

package/lib/cjs/app/CoreApp.js

@@ -36,7 +36,7 @@ class CoreApp {
         return this._region;
     }
     /**
-     * Country or region, like CN
+     * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
         return this._deviceId;
@@ -1391,7 +1391,9 @@ class CoreApp {
     userLogin(user, refreshToken, keep) {
         this.userData = user;
         // Cache the encrypted serverside device id
-        this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
+        if (user.deviceId) {
+            this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
+        }
         if (keep) {
             this.authorize(user.token, user.tokenScheme, refreshToken);
         }

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

@@ -41,19 +41,11 @@ export type FormatResultCustomCallback = ((data: FormatResultCustom) => string |
 /**
  * Refresh token props
  */
-export interface RefreshTokenProps<D extends object> {
+export interface RefreshTokenProps {
     /**
      * Callback
      */
     callback?: (result: RefreshTokenResult, successData?: string) => void;
-    /**
-     * Data to pass
-     */
-    data?: D;
-    /**
-     * Support relogin or not
-     */
-    relogin?: boolean;
     /**
      * Show loading bar or not
      */
@@ -478,7 +470,7 @@ export interface IApp {
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
     /**
      * Setup Api error handler
      * @param api Api

package/lib/cjs/erp/rq/RefreshTokenRQ.d.ts

@@ -6,16 +6,4 @@ export type RefreshTokenRQ = {
      * Device id
      */
     deviceId: string;
-    /**
-     * Country or region
-     */
-    region: string;
-    /**
-     * Login password
-     */
-    pwd?: string;
-    /**
-     * Time zone
-     */
-    timezone?: string;
 };

package/lib/cjs/state/User.d.ts

@@ -4,9 +4,9 @@ import { IState } from './State';
  */
 export interface IUserData {
     /**
-     * Serverside device id encrypted
+     * Serverside device id encrypted, not the same device id of the app
      */
-    readonly deviceId: string;
+    readonly deviceId?: string;
     /**
      * User name
      * 用户姓名

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

@@ -83,7 +83,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     get region(): string;
     private _deviceId;
     /**
-     * Country or region, like CN
+     * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId(): string;
     /**
@@ -550,7 +550,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
     /**
      * Setup callback
      */

package/lib/mjs/app/CoreApp.js

@@ -33,7 +33,7 @@ export class CoreApp {
         return this._region;
     }
     /**
-     * Country or region, like CN
+     * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
         return this._deviceId;
@@ -1388,7 +1388,9 @@ export class CoreApp {
     userLogin(user, refreshToken, keep) {
         this.userData = user;
         // Cache the encrypted serverside device id
-        this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
+        if (user.deviceId) {
+            this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
+        }
         if (keep) {
             this.authorize(user.token, user.tokenScheme, refreshToken);
         }

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

@@ -41,19 +41,11 @@ export type FormatResultCustomCallback = ((data: FormatResultCustom) => string |
 /**
  * Refresh token props
  */
-export interface RefreshTokenProps<D extends object> {
+export interface RefreshTokenProps {
     /**
      * Callback
      */
     callback?: (result: RefreshTokenResult, successData?: string) => void;
-    /**
-     * Data to pass
-     */
-    data?: D;
-    /**
-     * Support relogin or not
-     */
-    relogin?: boolean;
     /**
      * Show loading bar or not
      */
@@ -478,7 +470,7 @@ export interface IApp {
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
     /**
      * Setup Api error handler
      * @param api Api

package/lib/mjs/erp/rq/RefreshTokenRQ.d.ts

@@ -6,16 +6,4 @@ export type RefreshTokenRQ = {
      * Device id
      */
     deviceId: string;
-    /**
-     * Country or region
-     */
-    region: string;
-    /**
-     * Login password
-     */
-    pwd?: string;
-    /**
-     * Time zone
-     */
-    timezone?: string;
 };

package/lib/mjs/state/User.d.ts

@@ -4,9 +4,9 @@ import { IState } from './State';
  */
 export interface IUserData {
     /**
-     * Serverside device id encrypted
+     * Serverside device id encrypted, not the same device id of the app
      */
-    readonly deviceId: string;
+    readonly deviceId?: string;
     /**
      * User name
      * 用户姓名

package/package.json

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

package/src/app/CoreApp.ts

@@ -155,7 +155,7 @@ export abstract class CoreApp<
 
     private _deviceId: string;
     /**
-     * Country or region, like CN
+     * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
         return this._deviceId;
@@ -1813,7 +1813,7 @@ export abstract class CoreApp<
      * Refresh token
      * @param props Props
      */
-    async refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>) {
+    async refreshToken(props?: RefreshTokenProps) {
         if (props && props.callback) props.callback(true, undefined);
         return true;
     }
@@ -1891,7 +1891,9 @@ export abstract class CoreApp<
         this.userData = user;
 
         // Cache the encrypted serverside device id
-        this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
+        if (user.deviceId) {
+            this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
+        }
 
         if (keep) {
             this.authorize(user.token, user.tokenScheme, refreshToken);

package/src/app/IApp.ts

@@ -68,22 +68,12 @@ export type FormatResultCustomCallback =
 /**
  * Refresh token props
  */
-export interface RefreshTokenProps<D extends object> {
+export interface RefreshTokenProps {
     /**
      * Callback
      */
     callback?: (result: RefreshTokenResult, successData?: string) => void;
 
-    /**
-     * Data to pass
-     */
-    data?: D;
-
-    /**
-     * Support relogin or not
-     */
-    relogin?: boolean;
-
     /**
      * Show loading bar or not
      */
@@ -650,9 +640,7 @@ export interface IApp {
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends object = {}>(
-        props?: RefreshTokenProps<D>
-    ): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
 
     /**
      * Setup Api error handler

package/src/erp/rq/RefreshTokenRQ.ts

@@ -6,19 +6,4 @@ export type RefreshTokenRQ = {
      * Device id
      */
     deviceId: string;
-
-    /**
-     * Country or region
-     */
-    region: string;
-
-    /**
-     * Login password
-     */
-    pwd?: string;
-
-    /**
-     * Time zone
-     */
-    timezone?: string;
 };

package/src/state/User.ts

@@ -5,9 +5,9 @@ import { IState } from './State';
  */
 export interface IUserData {
     /**
-     * Serverside device id encrypted
+     * Serverside device id encrypted, not the same device id of the app
      */
-    readonly deviceId: string;
+    readonly deviceId?: string;
 
     /**
      * User name