@etsoo/appscript 1.5.31 → 1.5.33

package/lib/cjs/app/CoreApp.js

@@ -11,6 +11,7 @@ const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
 const IApp_1 = require("./IApp");
 const UserRole_1 = require("./UserRole");
+const AuthApi_1 = require("../erp/AuthApi");
 let CJ;
 const loadCrypto = () => import('crypto-js');
 /**
@@ -1418,9 +1419,7 @@ class CoreApp {
      */
     async exchangeToken(api, token) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await api.put('Auth/ExchangeToken', {
-            token
-        }, {
+        const data = await new AuthApi_1.AuthApi(this).exchangeToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.ExchangeToken error`, error);
@@ -1470,9 +1469,7 @@ class CoreApp {
      */
     async apiRefreshToken(api, token) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await api.put('Auth/ApiRefreshToken', {
-            token
-        }, {
+        const data = await new AuthApi_1.AuthApi(this).apiRefreshToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.apiRefreshToken error`, error);
@@ -1551,16 +1548,19 @@ class CoreApp {
     async signout() {
         const token = this.getCacheToken();
         if (token) {
-            await this.api.put('Auth/Signout', {
+            const result = await new AuthApi_1.AuthApi(this).signout({
                 deviceId: this.deviceId,
-                token: this.encrypt(token)
+                token
             }, {
                 onError: (error) => {
-                    console.error('CoreApp.signout error', error);
+                    console.error(`CoreApp.${this.name}.signout error`, error);
                     // Prevent further processing
                     return false;
                 }
             });
+            if (result && !result.ok) {
+                console.error(`CoreApp.${this.name}.signout failed`, result);
+            }
         }
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);

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

@@ -5,10 +5,35 @@ import { ResultPayload } from './dto/ResultPayload';
 import { LoginRQ } from './rq/LoginRQ';
 import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
 import { IActionResult } from '@etsoo/shared';
+import { SignoutRQ } from './rq/SignoutRQ';
+import { GetSigninUrlRQ } from './rq/GetSigninUrlRQ';
+import { TokenRQ } from './rq/TokenRQ';
+import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
 /**
  * Authentication API
  */
 export declare class AuthApi extends BaseApi {
+    /**
+     * API refresh token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    apiRefreshToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    /**
+     * Exchange token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    exchangeToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    /**
+     * Get signin url
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    getSigninUrl(rq: GetSigninUrlRQ, payload?: IApiPayload<string>): Promise<string | undefined>;
     /**
      * Login
      * @param rq Request data
@@ -31,4 +56,11 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Signout
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    signout(rq: SignoutRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
 }

package/lib/cjs/erp/AuthApi.js

@@ -6,6 +6,33 @@ const BaseApi_1 = require("./BaseApi");
  * Authentication API
  */
 class AuthApi extends BaseApi_1.BaseApi {
+    /**
+     * API refresh token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    apiRefreshToken(rq, payload) {
+        return this.api.post('Auth/ApiRefreshToken', rq, payload);
+    }
+    /**
+     * Exchange token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    exchangeToken(rq, payload) {
+        return this.api.post('Auth/ExchangeToken', rq, payload);
+    }
+    /**
+     * Get signin url
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    getSigninUrl(rq, payload) {
+        return this.api.post('Auth/GetSigninUrl', rq, payload);
+    }
     /**
      * Login
      * @param rq Request data
@@ -46,5 +73,14 @@ class AuthApi extends BaseApi_1.BaseApi {
     resetPassword(rq, payload) {
         return this.api.put('Auth/ResetPassword', rq, payload);
     }
+    /**
+     * Signout
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    signout(rq, payload) {
+        return this.api.put('Auth/Signout', rq, payload);
+    }
 }
 exports.AuthApi = AuthApi;

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

@@ -0,0 +1,13 @@
+/**
+ * Get signin url request data
+ */
+export type GetSigninUrlRQ = {
+    /**
+     * Region
+     */
+    region: string;
+    /**
+     * Device id
+     */
+    device: string;
+};

package/lib/cjs/erp/rq/GetSigninUrlRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,13 @@
+/**
+ * Signout request data
+ */
+export type SignoutRQ = {
+    /**
+     * Device id
+     */
+    readonly deviceId: string;
+    /**
+     * Refresh token
+     */
+    readonly token: string;
+};

package/lib/cjs/erp/rq/SignoutRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,9 @@
+/**
+ * Token request data
+ */
+export type TokenRQ = {
+    /**
+     * Refresh token
+     */
+    token: string;
+};

package/lib/cjs/erp/rq/TokenRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/index.d.ts

@@ -44,6 +44,7 @@ export * from './erp/dto/PlaceParsedDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
 export * from './erp/rq/AuthRequest';
+export * from './erp/rq/GetSigninUrlRQ';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
@@ -59,7 +60,9 @@ export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';
 export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/SendActionMessageRQ';
+export * from './erp/rq/SignoutRQ';
 export * from './erp/rq/TiplistRQ';
+export * from './erp/rq/TokenRQ';
 export * from './erp/rq/UpdateStatusRQ';
 export * from './erp/AddressApi';
 export * from './erp/AuthApi';

package/lib/cjs/index.js

@@ -69,6 +69,7 @@ __exportStar(require("./erp/dto/ResponseActionMessageDto"), exports);
 __exportStar(require("./erp/dto/ResultPayload"), exports);
 // erp rq
 __exportStar(require("./erp/rq/AuthRequest"), exports);
+__exportStar(require("./erp/rq/GetSigninUrlRQ"), exports);
 __exportStar(require("./erp/rq/LoginIdRQ"), exports);
 __exportStar(require("./erp/rq/LoginRQ"), exports);
 __exportStar(require("./erp/rq/MemberListRQ"), exports);
@@ -84,7 +85,9 @@ __exportStar(require("./erp/rq/RefreshTokenRQ"), exports);
 __exportStar(require("./erp/rq/RegionsRQ"), exports);
 __exportStar(require("./erp/rq/ResetPasswordRQ"), exports);
 __exportStar(require("./erp/rq/SendActionMessageRQ"), exports);
+__exportStar(require("./erp/rq/SignoutRQ"), exports);
 __exportStar(require("./erp/rq/TiplistRQ"), exports);
+__exportStar(require("./erp/rq/TokenRQ"), exports);
 __exportStar(require("./erp/rq/UpdateStatusRQ"), exports);
 // erp api
 __exportStar(require("./erp/AddressApi"), exports);

package/lib/mjs/app/CoreApp.js

@@ -8,6 +8,7 @@ import { EntityStatus } from '../business/EntityStatus';
 import { ActionResultError } from '../result/ActionResultError';
 import { appFields } from './IApp';
 import { UserRole } from './UserRole';
+import { AuthApi } from '../erp/AuthApi';
 let CJ;
 const loadCrypto = () => import('crypto-js');
 /**
@@ -1415,9 +1416,7 @@ export class CoreApp {
      */
     async exchangeToken(api, token) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await api.put('Auth/ExchangeToken', {
-            token
-        }, {
+        const data = await new AuthApi(this).exchangeToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.ExchangeToken error`, error);
@@ -1467,9 +1466,7 @@ export class CoreApp {
      */
     async apiRefreshToken(api, token) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await api.put('Auth/ApiRefreshToken', {
-            token
-        }, {
+        const data = await new AuthApi(this).apiRefreshToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.apiRefreshToken error`, error);
@@ -1548,16 +1545,19 @@ export class CoreApp {
     async signout() {
         const token = this.getCacheToken();
         if (token) {
-            await this.api.put('Auth/Signout', {
+            const result = await new AuthApi(this).signout({
                 deviceId: this.deviceId,
-                token: this.encrypt(token)
+                token
             }, {
                 onError: (error) => {
-                    console.error('CoreApp.signout error', error);
+                    console.error(`CoreApp.${this.name}.signout error`, error);
                     // Prevent further processing
                     return false;
                 }
             });
+            if (result && !result.ok) {
+                console.error(`CoreApp.${this.name}.signout failed`, result);
+            }
         }
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);

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

@@ -5,10 +5,35 @@ import { ResultPayload } from './dto/ResultPayload';
 import { LoginRQ } from './rq/LoginRQ';
 import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
 import { IActionResult } from '@etsoo/shared';
+import { SignoutRQ } from './rq/SignoutRQ';
+import { GetSigninUrlRQ } from './rq/GetSigninUrlRQ';
+import { TokenRQ } from './rq/TokenRQ';
+import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
 /**
  * Authentication API
  */
 export declare class AuthApi extends BaseApi {
+    /**
+     * API refresh token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    apiRefreshToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    /**
+     * Exchange token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    exchangeToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    /**
+     * Get signin url
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    getSigninUrl(rq: GetSigninUrlRQ, payload?: IApiPayload<string>): Promise<string | undefined>;
     /**
      * Login
      * @param rq Request data
@@ -31,4 +56,11 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Signout
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    signout(rq: SignoutRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
 }

package/lib/mjs/erp/AuthApi.js

@@ -3,6 +3,33 @@ import { BaseApi } from './BaseApi';
  * Authentication API
  */
 export class AuthApi extends BaseApi {
+    /**
+     * API refresh token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    apiRefreshToken(rq, payload) {
+        return this.api.post('Auth/ApiRefreshToken', rq, payload);
+    }
+    /**
+     * Exchange token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    exchangeToken(rq, payload) {
+        return this.api.post('Auth/ExchangeToken', rq, payload);
+    }
+    /**
+     * Get signin url
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    getSigninUrl(rq, payload) {
+        return this.api.post('Auth/GetSigninUrl', rq, payload);
+    }
     /**
      * Login
      * @param rq Request data
@@ -43,4 +70,13 @@ export class AuthApi extends BaseApi {
     resetPassword(rq, payload) {
         return this.api.put('Auth/ResetPassword', rq, payload);
     }
+    /**
+     * Signout
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    signout(rq, payload) {
+        return this.api.put('Auth/Signout', rq, payload);
+    }
 }

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

@@ -0,0 +1,13 @@
+/**
+ * Get signin url request data
+ */
+export type GetSigninUrlRQ = {
+    /**
+     * Region
+     */
+    region: string;
+    /**
+     * Device id
+     */
+    device: string;
+};

package/lib/mjs/erp/rq/GetSigninUrlRQ.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,13 @@
+/**
+ * Signout request data
+ */
+export type SignoutRQ = {
+    /**
+     * Device id
+     */
+    readonly deviceId: string;
+    /**
+     * Refresh token
+     */
+    readonly token: string;
+};

package/lib/mjs/erp/rq/SignoutRQ.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,9 @@
+/**
+ * Token request data
+ */
+export type TokenRQ = {
+    /**
+     * Refresh token
+     */
+    token: string;
+};

package/lib/mjs/erp/rq/TokenRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/index.d.ts

@@ -44,6 +44,7 @@ export * from './erp/dto/PlaceParsedDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
 export * from './erp/rq/AuthRequest';
+export * from './erp/rq/GetSigninUrlRQ';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
@@ -59,7 +60,9 @@ export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';
 export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/SendActionMessageRQ';
+export * from './erp/rq/SignoutRQ';
 export * from './erp/rq/TiplistRQ';
+export * from './erp/rq/TokenRQ';
 export * from './erp/rq/UpdateStatusRQ';
 export * from './erp/AddressApi';
 export * from './erp/AuthApi';

package/lib/mjs/index.js

@@ -52,6 +52,7 @@ export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
 // erp rq
 export * from './erp/rq/AuthRequest';
+export * from './erp/rq/GetSigninUrlRQ';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
@@ -67,7 +68,9 @@ export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';
 export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/SendActionMessageRQ';
+export * from './erp/rq/SignoutRQ';
 export * from './erp/rq/TiplistRQ';
+export * from './erp/rq/TokenRQ';
 export * from './erp/rq/UpdateStatusRQ';
 // erp api
 export * from './erp/AddressApi';

package/package.json

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

package/src/app/CoreApp.ts

@@ -46,6 +46,7 @@ import type CryptoJS from 'crypto-js';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
+import { AuthApi } from '../erp/AuthApi';
 
 type CJType = typeof CryptoJS;
 let CJ: CJType;
@@ -1961,11 +1962,8 @@ export abstract class CoreApp<
      */
     async exchangeToken(api: IApi, token: string) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await api.put<ApiRefreshTokenDto>(
-            'Auth/ExchangeToken',
-            {
-                token
-            },
+        const data = await new AuthApi(this).exchangeToken(
+            { token },
             {
                 showLoading: false,
                 onError: (error) => {
@@ -2031,11 +2029,8 @@ export abstract class CoreApp<
         token: string
     ): Promise<[string, number] | undefined> {
         // Call the API quietly, no loading bar and no error popup
-        const data = await api.put<ApiRefreshTokenDto>(
-            'Auth/ApiRefreshToken',
-            {
-                token
-            },
+        const data = await new AuthApi(this).apiRefreshToken(
+            { token },
             {
                 showLoading: false,
                 onError: (error) => {
@@ -2049,7 +2044,6 @@ export abstract class CoreApp<
                 }
             }
         );
-
         if (data == null) return undefined;
 
         // Update the access token
@@ -2128,20 +2122,26 @@ export abstract class CoreApp<
     async signout() {
         const token = this.getCacheToken();
         if (token) {
-            await this.api.put<boolean>(
-                'Auth/Signout',
+            const result = await new AuthApi(this).signout(
                 {
                     deviceId: this.deviceId,
-                    token: this.encrypt(token)
+                    token
                 },
                 {
                     onError: (error) => {
-                        console.error('CoreApp.signout error', error);
+                        console.error(
+                            `CoreApp.${this.name}.signout error`,
+                            error
+                        );
                         // Prevent further processing
                         return false;
                     }
                 }
             );
+
+            if (result && !result.ok) {
+                console.error(`CoreApp.${this.name}.signout failed`, result);
+            }
         }
 
         // Clear, noTrigger = true, avoid state update

package/src/erp/AuthApi.ts

@@ -6,11 +6,45 @@ import { LoginIdRQ } from './rq/LoginIdRQ';
 import { LoginRQ } from './rq/LoginRQ';
 import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
 import { IActionResult } from '@etsoo/shared';
+import { SignoutRQ } from './rq/SignoutRQ';
+import { GetSigninUrlRQ } from './rq/GetSigninUrlRQ';
+import { TokenRQ } from './rq/TokenRQ';
+import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
 
 /**
  * Authentication API
  */
 export class AuthApi extends BaseApi {
+    /**
+     * API refresh token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    apiRefreshToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>) {
+        return this.api.post('Auth/ApiRefreshToken', rq, payload);
+    }
+
+    /**
+     * Exchange token
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    exchangeToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>) {
+        return this.api.post('Auth/ExchangeToken', rq, payload);
+    }
+
+    /**
+     * Get signin url
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    getSigninUrl(rq: GetSigninUrlRQ, payload?: IApiPayload<string>) {
+        return this.api.post('Auth/GetSigninUrl', rq, payload);
+    }
+
     /**
      * Login
      * @param rq Request data
@@ -57,4 +91,14 @@ export class AuthApi extends BaseApi {
     resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload) {
         return this.api.put('Auth/ResetPassword', rq, payload);
     }
+
+    /**
+     * Signout
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    signout(rq: SignoutRQ, payload?: ResultPayload) {
+        return this.api.put('Auth/Signout', rq, payload);
+    }
 }

package/src/erp/rq/GetSigninUrlRQ.ts

@@ -0,0 +1,14 @@
+/**
+ * Get signin url request data
+ */
+export type GetSigninUrlRQ = {
+    /**
+     * Region
+     */
+    region: string;
+
+    /**
+     * Device id
+     */
+    device: string;
+};

package/src/erp/rq/SignoutRQ.ts

@@ -0,0 +1,14 @@
+/**
+ * Signout request data
+ */
+export type SignoutRQ = {
+    /**
+     * Device id
+     */
+    readonly deviceId: string;
+
+    /**
+     * Refresh token
+     */
+    readonly token: string;
+};

package/src/erp/rq/TokenRQ.ts

@@ -0,0 +1,9 @@
+/**
+ * Token request data
+ */
+export type TokenRQ = {
+    /**
+     * Refresh token
+     */
+    token: string;
+};

package/src/index.ts

@@ -59,6 +59,7 @@ export * from './erp/dto/ResultPayload';
 
 // erp rq
 export * from './erp/rq/AuthRequest';
+export * from './erp/rq/GetSigninUrlRQ';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
@@ -74,7 +75,9 @@ export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';
 export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/SendActionMessageRQ';
+export * from './erp/rq/SignoutRQ';
 export * from './erp/rq/TiplistRQ';
+export * from './erp/rq/TokenRQ';
 export * from './erp/rq/UpdateStatusRQ';
 
 // erp api