@etsoo/appscript 1.6.9 → 1.6.11

package/lib/cjs/api/AuthApi.d.ts

@@ -6,7 +6,7 @@ import { DataTypes, IActionResult } from "@etsoo/shared";
 import { RefreshTokenProps, RefreshTokenResult } from "../app/IApp";
 import { TokenInputRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
-import { LoginRQ } from "./rq/LoginRQ";
+import { LoginInputAuthResult, LoginInputRQ } from "./rq/LoginRQ";
 import { ResetPasswordInputRQ } from "./rq/ResetPasswordRQ";
 import { SignoutRQ } from "./rq/SignoutRQ";
 import { SwitchOrgRQ } from "./rq/SwitchOrgRQ";
@@ -71,7 +71,10 @@ export declare class AuthApi extends BaseApi {
      * @param tokenKey Refresh token key
      * @returns Result
      */
-    protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
+    login<T extends IUser, A extends AuthRequest | undefined>(rq: LoginInputRQ, auth: A, payload?: IApiPayload<IActionResult<A extends undefined ? T : LoginInputAuthResult>>, tokenKey?: string): Promise<[
+        IActionResult<A extends undefined ? T : LoginInputAuthResult> | undefined,
+        string | null
+    ]>;
     /**
      * Login id check
      * @param id Check id

package/lib/cjs/api/AuthApi.js

@@ -88,12 +88,19 @@ class AuthApi extends BaseApi_1.BaseApi {
      * @param tokenKey Refresh token key
      * @returns Result
      */
-    async loginBase(rq, payload, tokenKey) {
+    async login(rq, auth, payload, tokenKey) {
         // Default values
         payload ?? (payload = {});
         tokenKey ?? (tokenKey = AuthApi.HeaderTokenField);
+        const data = {
+            ...rq,
+            auth,
+            deviceId: this.app.deviceId,
+            region: this.app.region,
+            timeZone: this.app.getTimeZone()
+        };
         // Call the API
-        const result = await this.api.post("Auth/Login", rq, payload);
+        const result = await this.api.post("Auth/Login", data, payload);
         // Get the refresh token
         const refreshToken = result?.ok
             ? this.app.getResponseToken(payload.response, tokenKey)

package/lib/cjs/api/rq/LoginIdRQ.d.ts

@@ -1,15 +1,20 @@
+/**
+ * Login id input request data
+ */
+export type LoginIdInputRQ = {
+    /**
+     * Username, Email or mobile
+     */
+    id: string;
+};
 /**
  * Login id request data
  */
-export type LoginIdRQ = {
+export type LoginIdRQ = LoginIdInputRQ & {
     /**
      * Device id
      */
     deviceId: string;
-    /**
-     * Username, Email or mobile
-     */
-    id: string;
     /**
      * Country or region
      */

package/lib/cjs/api/rq/LoginRQ.d.ts

@@ -1,9 +1,9 @@
 import { AuthRequest } from "./AuthRequest";
-import { LoginIdRQ } from "./LoginIdRQ";
+import { LoginIdInputRQ, LoginIdRQ } from "./LoginIdRQ";
 /**
- * Login request data
+ * Login input request data
  */
-export type LoginRQ = LoginIdRQ & {
+export type LoginInputRQ = LoginIdInputRQ & {
     /**
      * Password
      */
@@ -12,12 +12,22 @@ export type LoginRQ = LoginIdRQ & {
      * Organization
      */
     org?: number;
+};
+/**
+ * Login input auth result
+ */
+export type LoginInputAuthResult = {
     /**
-     * Authorization request data
+     * Redirect URI
      */
-    auth?: AuthRequest;
+    uri: string;
 };
 /**
- * Login input request data
+ * Login request data
  */
-export type LoginInputRQ = Pick<LoginRQ, "id" | "pwd" | "org" | "auth">;
+export type LoginRQ = LoginIdRQ & LoginInputRQ & {
+    /**
+     * Authorization request data
+     */
+    auth?: AuthRequest;
+};

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

@@ -676,6 +676,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     protected apiRefreshToken(api: IApi, rq: ApiRefreshTokenRQ): Promise<[string, number] | undefined>;
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token: string | undefined): void;
     /**
      * Setup tasks
      */

package/lib/cjs/app/CoreApp.js

@@ -738,9 +738,7 @@ class CoreApp {
         this.api.authorize(schema, token);
         // Overwrite the current value
         if (refreshToken !== "") {
-            if (refreshToken != null)
-                refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(this.fields.headerToken, refreshToken);
+            this.saveCacheToken(refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -1657,6 +1655,15 @@ class CoreApp {
         // Return the new refresh token and access token expiration seconds
         return [data.refreshToken, data.expiresIn];
     }
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token) {
+        if (token != null)
+            token = this.encrypt(token);
+        this.storage.setData(this.fields.headerToken, token);
+    }
     /**
      * Setup tasks
      */

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

@@ -575,6 +575,11 @@ export interface IApp {
      * @param callback Callback
      */
     refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token: string | undefined): void;
     /**
      * Setup Api error handler
      * @param api Api

package/lib/mjs/api/AuthApi.d.ts

@@ -6,7 +6,7 @@ import { DataTypes, IActionResult } from "@etsoo/shared";
 import { RefreshTokenProps, RefreshTokenResult } from "../app/IApp";
 import { TokenInputRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
-import { LoginRQ } from "./rq/LoginRQ";
+import { LoginInputAuthResult, LoginInputRQ } from "./rq/LoginRQ";
 import { ResetPasswordInputRQ } from "./rq/ResetPasswordRQ";
 import { SignoutRQ } from "./rq/SignoutRQ";
 import { SwitchOrgRQ } from "./rq/SwitchOrgRQ";
@@ -71,7 +71,10 @@ export declare class AuthApi extends BaseApi {
      * @param tokenKey Refresh token key
      * @returns Result
      */
-    protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
+    login<T extends IUser, A extends AuthRequest | undefined>(rq: LoginInputRQ, auth: A, payload?: IApiPayload<IActionResult<A extends undefined ? T : LoginInputAuthResult>>, tokenKey?: string): Promise<[
+        IActionResult<A extends undefined ? T : LoginInputAuthResult> | undefined,
+        string | null
+    ]>;
     /**
      * Login id check
      * @param id Check id

package/lib/mjs/api/AuthApi.js

@@ -85,12 +85,19 @@ export class AuthApi extends BaseApi {
      * @param tokenKey Refresh token key
      * @returns Result
      */
-    async loginBase(rq, payload, tokenKey) {
+    async login(rq, auth, payload, tokenKey) {
         // Default values
         payload ?? (payload = {});
         tokenKey ?? (tokenKey = AuthApi.HeaderTokenField);
+        const data = {
+            ...rq,
+            auth,
+            deviceId: this.app.deviceId,
+            region: this.app.region,
+            timeZone: this.app.getTimeZone()
+        };
         // Call the API
-        const result = await this.api.post("Auth/Login", rq, payload);
+        const result = await this.api.post("Auth/Login", data, payload);
         // Get the refresh token
         const refreshToken = result?.ok
             ? this.app.getResponseToken(payload.response, tokenKey)

package/lib/mjs/api/rq/LoginIdRQ.d.ts

@@ -1,15 +1,20 @@
+/**
+ * Login id input request data
+ */
+export type LoginIdInputRQ = {
+    /**
+     * Username, Email or mobile
+     */
+    id: string;
+};
 /**
  * Login id request data
  */
-export type LoginIdRQ = {
+export type LoginIdRQ = LoginIdInputRQ & {
     /**
      * Device id
      */
     deviceId: string;
-    /**
-     * Username, Email or mobile
-     */
-    id: string;
     /**
      * Country or region
      */

package/lib/mjs/api/rq/LoginRQ.d.ts

@@ -1,9 +1,9 @@
 import { AuthRequest } from "./AuthRequest";
-import { LoginIdRQ } from "./LoginIdRQ";
+import { LoginIdInputRQ, LoginIdRQ } from "./LoginIdRQ";
 /**
- * Login request data
+ * Login input request data
  */
-export type LoginRQ = LoginIdRQ & {
+export type LoginInputRQ = LoginIdInputRQ & {
     /**
      * Password
      */
@@ -12,12 +12,22 @@ export type LoginRQ = LoginIdRQ & {
      * Organization
      */
     org?: number;
+};
+/**
+ * Login input auth result
+ */
+export type LoginInputAuthResult = {
     /**
-     * Authorization request data
+     * Redirect URI
      */
-    auth?: AuthRequest;
+    uri: string;
 };
 /**
- * Login input request data
+ * Login request data
  */
-export type LoginInputRQ = Pick<LoginRQ, "id" | "pwd" | "org" | "auth">;
+export type LoginRQ = LoginIdRQ & LoginInputRQ & {
+    /**
+     * Authorization request data
+     */
+    auth?: AuthRequest;
+};

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

@@ -676,6 +676,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     protected apiRefreshToken(api: IApi, rq: ApiRefreshTokenRQ): Promise<[string, number] | undefined>;
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token: string | undefined): void;
     /**
      * Setup tasks
      */

package/lib/mjs/app/CoreApp.js

@@ -735,9 +735,7 @@ export class CoreApp {
         this.api.authorize(schema, token);
         // Overwrite the current value
         if (refreshToken !== "") {
-            if (refreshToken != null)
-                refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(this.fields.headerToken, refreshToken);
+            this.saveCacheToken(refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -1654,6 +1652,15 @@ export class CoreApp {
         // Return the new refresh token and access token expiration seconds
         return [data.refreshToken, data.expiresIn];
     }
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token) {
+        if (token != null)
+            token = this.encrypt(token);
+        this.storage.setData(this.fields.headerToken, token);
+    }
     /**
      * Setup tasks
      */

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

@@ -575,6 +575,11 @@ export interface IApp {
      * @param callback Callback
      */
     refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token: string | undefined): void;
     /**
      * Setup Api error handler
      * @param api Api

package/package.json

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

package/src/api/AuthApi.ts

@@ -7,7 +7,7 @@ import { RefreshTokenProps, RefreshTokenResult } from "../app/IApp";
 import { TokenInputRQ, TokenRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
 import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
-import { LoginRQ } from "./rq/LoginRQ";
+import { LoginInputAuthResult, LoginInputRQ, LoginRQ } from "./rq/LoginRQ";
 import { LoginIdRQ } from "./rq/LoginIdRQ";
 import { RefreshTokenRQ } from "./rq/RefreshTokenRQ";
 import { ResetPasswordInputRQ, ResetPasswordRQ } from "./rq/ResetPasswordRQ";
@@ -125,17 +125,33 @@ export class AuthApi extends BaseApi {
    * @param tokenKey Refresh token key
    * @returns Result
    */
-  protected async loginBase<T extends IUser>(
-    rq: LoginRQ,
-    payload?: IApiPayload<IActionResult<T>>,
+  async login<T extends IUser, A extends AuthRequest | undefined>(
+    rq: LoginInputRQ,
+    auth: A,
+    payload?: IApiPayload<
+      IActionResult<A extends undefined ? T : LoginInputAuthResult>
+    >,
     tokenKey?: string
-  ): Promise<[IActionResult<T> | undefined, string | null]> {
+  ): Promise<
+    [
+      IActionResult<A extends undefined ? T : LoginInputAuthResult> | undefined,
+      string | null
+    ]
+  > {
     // Default values
     payload ??= {};
     tokenKey ??= AuthApi.HeaderTokenField;
 
+    const data: LoginRQ = {
+      ...rq,
+      auth,
+      deviceId: this.app.deviceId,
+      region: this.app.region,
+      timeZone: this.app.getTimeZone()
+    };
+
     // Call the API
-    const result = await this.api.post("Auth/Login", rq, payload);
+    const result = await this.api.post("Auth/Login", data, payload);
 
     // Get the refresh token
     const refreshToken = result?.ok

package/src/api/rq/LoginIdRQ.ts

@@ -1,16 +1,21 @@
 /**
- * Login id request data
+ * Login id input request data
  */
-export type LoginIdRQ = {
+export type LoginIdInputRQ = {
   /**
-   * Device id
+   * Username, Email or mobile
    */
-  deviceId: string;
+  id: string;
+};
 
+/**
+ * Login id request data
+ */
+export type LoginIdRQ = LoginIdInputRQ & {
   /**
-   * Username, Email or mobile
+   * Device id
    */
-  id: string;
+  deviceId: string;
 
   /**
    * Country or region

package/src/api/rq/LoginRQ.ts

@@ -1,10 +1,10 @@
 import { AuthRequest } from "./AuthRequest";
-import { LoginIdRQ } from "./LoginIdRQ";
+import { LoginIdInputRQ, LoginIdRQ } from "./LoginIdRQ";
 
 /**
- * Login request data
+ * Login input request data
  */
-export type LoginRQ = LoginIdRQ & {
+export type LoginInputRQ = LoginIdInputRQ & {
   /**
    * Password
    */
@@ -14,14 +14,25 @@ export type LoginRQ = LoginIdRQ & {
    * Organization
    */
   org?: number;
+};
 
+/**
+ * Login input auth result
+ */
+export type LoginInputAuthResult = {
   /**
-   * Authorization request data
+   * Redirect URI
    */
-  auth?: AuthRequest;
+  uri: string;
 };
 
 /**
- * Login input request data
+ * Login request data
  */
-export type LoginInputRQ = Pick<LoginRQ, "id" | "pwd" | "org" | "auth">;
+export type LoginRQ = LoginIdRQ &
+  LoginInputRQ & {
+    /**
+     * Authorization request data
+     */
+    auth?: AuthRequest;
+  };

package/src/app/CoreApp.ts

@@ -1120,8 +1120,7 @@ export abstract class CoreApp<
 
     // Overwrite the current value
     if (refreshToken !== "") {
-      if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
-      this.storage.setData(this.fields.headerToken, refreshToken);
+      this.saveCacheToken(refreshToken);
     }
 
     // Reset tryLogin state
@@ -2222,6 +2221,15 @@ export abstract class CoreApp<
     return [data.refreshToken, data.expiresIn];
   }
 
+  /**
+   * Save refresh token to cache
+   * @param token Refresh token
+   */
+  saveCacheToken(token: string | undefined) {
+    if (token != null) token = this.encrypt(token);
+    this.storage.setData(this.fields.headerToken, token);
+  }
+
   /**
    * Setup tasks
    */

package/src/app/IApp.ts

@@ -765,6 +765,12 @@ export interface IApp {
     callback?: (result?: boolean | IActionResult) => boolean | void
   ): Promise<void>;
 
+  /**
+   * Save refresh token to cache
+   * @param token Refresh token
+   */
+  saveCacheToken(token: string | undefined): void;
+
   /**
    * Setup Api error handler
    * @param api Api