@etsoo/appscript 1.5.14 → 1.5.16

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

@@ -17,6 +17,11 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
+    /**
+     * Get log in url
+     * @returns Url
+     */
+    getLogInUrl(): Promise<string | undefined>;
     /**
      * Login id check
      * @param id Check id
@@ -24,6 +29,10 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Redirect to log in url
+     */
+    redirectToLogInUrl(): Promise<void>;
     /**
      * Reset password
      * @param rq Request data

package/lib/cjs/erp/AuthApi.js

@@ -21,6 +21,16 @@ class AuthApi extends BaseApi_1.BaseApi {
             : null;
         return [result, refreshToken];
     }
+    /**
+     * Get log in url
+     * @returns Url
+     */
+    getLogInUrl() {
+        return this.api.get('Auth/GetLogInUrl', {
+            region: this.app.region,
+            device: this.app.deviceId
+        });
+    }
     /**
      * Login id check
      * @param id Check id
@@ -37,6 +47,15 @@ class AuthApi extends BaseApi_1.BaseApi {
         };
         return this.api.post('Auth/LoginId', rq, payload);
     }
+    /**
+     * Redirect to log in url
+     */
+    async redirectToLogInUrl() {
+        const url = await this.getLogInUrl();
+        if (url == null)
+            return;
+        window.location.replace(url);
+    }
     /**
      * Reset password
      * @param rq Request data

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

@@ -7,7 +7,6 @@ import { CurrencyDto } from './dto/CurrencyDto';
 import { ExchangeRateDto } from './dto/ExchangeRateDto';
 import { ExchangeRateHistoryDto } from './dto/ExchangeRateHistoryDto';
 import { PinDto } from './dto/PinDto';
-import { PublicOrgProductDto, PublicProductDto } from './dto/PublicProductDto';
 import { ParsePinRQ } from './rq/ParsePinRQ';
 /**
  * Public API
@@ -98,14 +97,6 @@ export declare class PublicApi extends BaseApi {
      * @returns Result
      */
     parsePin(input: ParsePinRQ | string, payload?: IApiPayload<PinDto>): Promise<PinDto | undefined>;
-    /**
-     * Get public and valid product data
-     * @param id Product/Service Id or Uid
-     * @param culture Language
-     * @param payload Payload
-     * @returns Result
-     */
-    product<T extends number | string>(id: T, culture?: string, payload?: IApiPayload<T extends number ? PublicProductDto : PublicOrgProductDto>): Promise<(T extends number ? PublicProductDto : PublicOrgProductDto) | undefined>;
     /**
      *
      * Get all repeat options

package/lib/cjs/erp/PublicApi.js

@@ -172,17 +172,6 @@ class PublicApi extends BaseApi_1.BaseApi {
         rq.language ?? (rq.language = this.app.culture);
         return this.api.post('Public/ParsePin', rq, payload);
     }
-    /**
-     * Get public and valid product data
-     * @param id Product/Service Id or Uid
-     * @param culture Language
-     * @param payload Payload
-     * @returns Result
-     */
-    product(id, culture, payload) {
-        culture = this.app.checkLanguage(culture);
-        return this.api.get(`Public/Product/${id}/${culture}`, undefined, payload);
-    }
     /**
      *
      * Get all repeat options

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

@@ -0,0 +1,46 @@
+/**
+ * Application authentication request object
+ * 程序认证请求对象
+ */
+export type AuthRequest = {
+    /**
+     * Application ID
+     * 应用编号
+     */
+    appId: number;
+    /**
+     * Application key
+     * 应用键值
+     */
+    appKey: string;
+    /**
+     * login hint (user login name)
+     * 登录提示（个人登录名）
+     */
+    loginHint?: string;
+    /**
+     * Redirect URI
+     * 重定向URI
+     */
+    redirectUri: string;
+    /**
+     * Response type, code or token
+     * 响应类型，代码或令牌
+     */
+    responseType: 'code' | 'token';
+    /**
+     * Scope
+     * 作用域
+     */
+    scope: string;
+    /**
+     * State value
+     * 状态值
+     */
+    state: string;
+    /**
+     * Signature
+     * 签名
+     */
+    sign: string;
+};

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

@@ -1,5 +1,5 @@
-import { IdType } from '@etsoo/shared';
 import { LoginIdRQ } from './LoginIdRQ';
+import { AuthRequest } from './AuthRequest';
 /**
  * Login request data
  */
@@ -17,7 +17,7 @@ export type LoginRQ = LoginIdRQ & {
      */
     timezone?: string;
     /**
-     * Service id or uid
+     * Authorization request data
      */
-    serviceId?: IdType;
+    auth?: AuthRequest;
 };

package/lib/cjs/index.d.ts

@@ -40,9 +40,9 @@ export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/OrgViewDto';
 export * from './erp/dto/PinDto';
 export * from './erp/dto/PlaceParsedDto';
-export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
+export * from './erp/rq/AuthRequest';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';

package/lib/cjs/index.js

@@ -64,10 +64,10 @@ __exportStar(require("./erp/dto/OrgQueryDto"), exports);
 __exportStar(require("./erp/dto/OrgViewDto"), exports);
 __exportStar(require("./erp/dto/PinDto"), exports);
 __exportStar(require("./erp/dto/PlaceParsedDto"), exports);
-__exportStar(require("./erp/dto/PublicProductDto"), exports);
 __exportStar(require("./erp/dto/ResponseActionMessageDto"), exports);
 __exportStar(require("./erp/dto/ResultPayload"), exports);
 // erp rq
+__exportStar(require("./erp/rq/AuthRequest"), exports);
 __exportStar(require("./erp/rq/LoginIdRQ"), exports);
 __exportStar(require("./erp/rq/LoginRQ"), exports);
 __exportStar(require("./erp/rq/MemberListRQ"), exports);

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

@@ -17,6 +17,11 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
+    /**
+     * Get log in url
+     * @returns Url
+     */
+    getLogInUrl(): Promise<string | undefined>;
     /**
      * Login id check
      * @param id Check id
@@ -24,6 +29,10 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Redirect to log in url
+     */
+    redirectToLogInUrl(): Promise<void>;
     /**
      * Reset password
      * @param rq Request data

package/lib/mjs/erp/AuthApi.js

@@ -18,6 +18,16 @@ export class AuthApi extends BaseApi {
             : null;
         return [result, refreshToken];
     }
+    /**
+     * Get log in url
+     * @returns Url
+     */
+    getLogInUrl() {
+        return this.api.get('Auth/GetLogInUrl', {
+            region: this.app.region,
+            device: this.app.deviceId
+        });
+    }
     /**
      * Login id check
      * @param id Check id
@@ -34,6 +44,15 @@ export class AuthApi extends BaseApi {
         };
         return this.api.post('Auth/LoginId', rq, payload);
     }
+    /**
+     * Redirect to log in url
+     */
+    async redirectToLogInUrl() {
+        const url = await this.getLogInUrl();
+        if (url == null)
+            return;
+        window.location.replace(url);
+    }
     /**
      * Reset password
      * @param rq Request data

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

@@ -7,7 +7,6 @@ import { CurrencyDto } from './dto/CurrencyDto';
 import { ExchangeRateDto } from './dto/ExchangeRateDto';
 import { ExchangeRateHistoryDto } from './dto/ExchangeRateHistoryDto';
 import { PinDto } from './dto/PinDto';
-import { PublicOrgProductDto, PublicProductDto } from './dto/PublicProductDto';
 import { ParsePinRQ } from './rq/ParsePinRQ';
 /**
  * Public API
@@ -98,14 +97,6 @@ export declare class PublicApi extends BaseApi {
      * @returns Result
      */
     parsePin(input: ParsePinRQ | string, payload?: IApiPayload<PinDto>): Promise<PinDto | undefined>;
-    /**
-     * Get public and valid product data
-     * @param id Product/Service Id or Uid
-     * @param culture Language
-     * @param payload Payload
-     * @returns Result
-     */
-    product<T extends number | string>(id: T, culture?: string, payload?: IApiPayload<T extends number ? PublicProductDto : PublicOrgProductDto>): Promise<(T extends number ? PublicProductDto : PublicOrgProductDto) | undefined>;
     /**
      *
      * Get all repeat options

package/lib/mjs/erp/PublicApi.js

@@ -169,17 +169,6 @@ export class PublicApi extends BaseApi {
         rq.language ?? (rq.language = this.app.culture);
         return this.api.post('Public/ParsePin', rq, payload);
     }
-    /**
-     * Get public and valid product data
-     * @param id Product/Service Id or Uid
-     * @param culture Language
-     * @param payload Payload
-     * @returns Result
-     */
-    product(id, culture, payload) {
-        culture = this.app.checkLanguage(culture);
-        return this.api.get(`Public/Product/${id}/${culture}`, undefined, payload);
-    }
     /**
      *
      * Get all repeat options

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

@@ -0,0 +1,46 @@
+/**
+ * Application authentication request object
+ * 程序认证请求对象
+ */
+export type AuthRequest = {
+    /**
+     * Application ID
+     * 应用编号
+     */
+    appId: number;
+    /**
+     * Application key
+     * 应用键值
+     */
+    appKey: string;
+    /**
+     * login hint (user login name)
+     * 登录提示（个人登录名）
+     */
+    loginHint?: string;
+    /**
+     * Redirect URI
+     * 重定向URI
+     */
+    redirectUri: string;
+    /**
+     * Response type, code or token
+     * 响应类型，代码或令牌
+     */
+    responseType: 'code' | 'token';
+    /**
+     * Scope
+     * 作用域
+     */
+    scope: string;
+    /**
+     * State value
+     * 状态值
+     */
+    state: string;
+    /**
+     * Signature
+     * 签名
+     */
+    sign: string;
+};

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

@@ -1,5 +1,5 @@
-import { IdType } from '@etsoo/shared';
 import { LoginIdRQ } from './LoginIdRQ';
+import { AuthRequest } from './AuthRequest';
 /**
  * Login request data
  */
@@ -17,7 +17,7 @@ export type LoginRQ = LoginIdRQ & {
      */
     timezone?: string;
     /**
-     * Service id or uid
+     * Authorization request data
      */
-    serviceId?: IdType;
+    auth?: AuthRequest;
 };

package/lib/mjs/index.d.ts

@@ -40,9 +40,9 @@ export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/OrgViewDto';
 export * from './erp/dto/PinDto';
 export * from './erp/dto/PlaceParsedDto';
-export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
+export * from './erp/rq/AuthRequest';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';

package/lib/mjs/index.js

@@ -47,10 +47,10 @@ export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/OrgViewDto';
 export * from './erp/dto/PinDto';
 export * from './erp/dto/PlaceParsedDto';
-export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
 // erp rq
+export * from './erp/rq/AuthRequest';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.14",
+    "version": "1.5.16",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -64,10 +64,10 @@
         "@babel/preset-env": "^7.25.4",
         "@babel/runtime-corejs3": "^7.25.6",
         "@types/crypto-js": "^4.2.2",
-        "@types/jest": "^29.5.12",
+        "@types/jest": "^29.5.13",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.2.5",
-        "typescript": "^5.5.4"
+        "typescript": "^5.6.2"
     }
 }

package/src/erp/AuthApi.ts

@@ -31,6 +31,17 @@ export class AuthApi extends BaseApi {
         return [result, refreshToken];
     }
 
+    /**
+     * Get log in url
+     * @returns Url
+     */
+    getLogInUrl() {
+        return this.api.get<string>('Auth/GetLogInUrl', {
+            region: this.app.region,
+            device: this.app.deviceId
+        });
+    }
+
     /**
      * Login id check
      * @param id Check id
@@ -48,6 +59,15 @@ export class AuthApi extends BaseApi {
         return this.api.post('Auth/LoginId', rq, payload);
     }
 
+    /**
+     * Redirect to log in url
+     */
+    async redirectToLogInUrl() {
+        const url = await this.getLogInUrl();
+        if (url == null) return;
+        window.location.replace(url);
+    }
+
     /**
      * Reset password
      * @param rq Request data

package/src/erp/PublicApi.ts

@@ -8,7 +8,6 @@ import { CurrencyDto } from './dto/CurrencyDto';
 import { ExchangeRateDto } from './dto/ExchangeRateDto';
 import { ExchangeRateHistoryDto } from './dto/ExchangeRateHistoryDto';
 import { PinDto } from './dto/PinDto';
-import { PublicOrgProductDto, PublicProductDto } from './dto/PublicProductDto';
 import { ParsePinRQ } from './rq/ParsePinRQ';
 
 const cachedCurrencyRates: {
@@ -224,28 +223,6 @@ export class PublicApi extends BaseApi {
         return this.api.post('Public/ParsePin', rq, payload);
     }
 
-    /**
-     * Get public and valid product data
-     * @param id Product/Service Id or Uid
-     * @param culture Language
-     * @param payload Payload
-     * @returns Result
-     */
-    product<T extends number | string>(
-        id: T,
-        culture?: string,
-        payload?: IApiPayload<
-            T extends number ? PublicProductDto : PublicOrgProductDto
-        >
-    ) {
-        culture = this.app.checkLanguage(culture);
-        return this.api.get(
-            `Public/Product/${id}/${culture}`,
-            undefined,
-            payload
-        );
-    }
-
     /**
      *
      * Get all repeat options

package/src/erp/rq/AuthRequest.ts

@@ -0,0 +1,53 @@
+/**
+ * Application authentication request object
+ * 程序认证请求对象
+ */
+export type AuthRequest = {
+    /**
+     * Application ID
+     * 应用编号
+     */
+    appId: number;
+
+    /**
+     * Application key
+     * 应用键值
+     */
+    appKey: string;
+
+    /**
+     * login hint (user login name)
+     * 登录提示（个人登录名）
+     */
+    loginHint?: string;
+
+    /**
+     * Redirect URI
+     * 重定向URI
+     */
+    redirectUri: string;
+
+    /**
+     * Response type, code or token
+     * 响应类型，代码或令牌
+     */
+    responseType: 'code' | 'token';
+
+    /**
+     * Scope
+     * 作用域
+     */
+    scope: string;
+
+    /**
+     * State value
+     * 状态值
+     */
+    state: string;
+
+    /**
+     * Signature
+     * 签名
+     */
+    sign: string;
+};

package/src/erp/rq/LoginRQ.ts

@@ -1,5 +1,5 @@
-import { IdType } from '@etsoo/shared';
 import { LoginIdRQ } from './LoginIdRQ';
+import { AuthRequest } from './AuthRequest';
 
 /**
  * Login request data
@@ -21,7 +21,7 @@ export type LoginRQ = LoginIdRQ & {
     timezone?: string;
 
     /**
-     * Service id or uid
+     * Authorization request data
      */
-    serviceId?: IdType;
+    auth?: AuthRequest;
 };

package/src/index.ts

@@ -53,11 +53,11 @@ export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/OrgViewDto';
 export * from './erp/dto/PinDto';
 export * from './erp/dto/PlaceParsedDto';
-export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
 
 // erp rq
+export * from './erp/rq/AuthRequest';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';

package/lib/cjs/erp/dto/PublicProductDto.d.ts

@@ -1,40 +0,0 @@
-import { IdType } from '@etsoo/shared';
-import { EntityStatus } from '../../business/EntityStatus';
-/**
- * Public product data
- */
-export type PublicProductDto = {
-    /**
-     * Id
-     */
-    id: number;
-    /**
-     * Name
-     */
-    name: string;
-    /**
-     * Logo
-     */
-    logo?: string;
-    /**
-     * Web URL for access
-     */
-    webUrl: string;
-    /**
-     * Query id for service Id / service Uid
-     */
-    queryId?: IdType;
-};
-/**
- * Public product with organization data
- */
-export type PublicOrgProductDto = PublicProductDto & {
-    /**
-     * Purchased service status
-     */
-    serviceEntityStatus?: EntityStatus;
-    /**
-     * Purchased service expiry
-     */
-    serviceExpiry?: string | Date;
-};

package/lib/mjs/erp/dto/PublicProductDto.d.ts

@@ -1,40 +0,0 @@
-import { IdType } from '@etsoo/shared';
-import { EntityStatus } from '../../business/EntityStatus';
-/**
- * Public product data
- */
-export type PublicProductDto = {
-    /**
-     * Id
-     */
-    id: number;
-    /**
-     * Name
-     */
-    name: string;
-    /**
-     * Logo
-     */
-    logo?: string;
-    /**
-     * Web URL for access
-     */
-    webUrl: string;
-    /**
-     * Query id for service Id / service Uid
-     */
-    queryId?: IdType;
-};
-/**
- * Public product with organization data
- */
-export type PublicOrgProductDto = PublicProductDto & {
-    /**
-     * Purchased service status
-     */
-    serviceEntityStatus?: EntityStatus;
-    /**
-     * Purchased service expiry
-     */
-    serviceExpiry?: string | Date;
-};

package/src/erp/dto/PublicProductDto.ts

@@ -1,47 +0,0 @@
-import { IdType } from '@etsoo/shared';
-import { EntityStatus } from '../../business/EntityStatus';
-
-/**
- * Public product data
- */
-export type PublicProductDto = {
-    /**
-     * Id
-     */
-    id: number;
-
-    /**
-     * Name
-     */
-    name: string;
-
-    /**
-     * Logo
-     */
-    logo?: string;
-
-    /**
-     * Web URL for access
-     */
-    webUrl: string;
-
-    /**
-     * Query id for service Id / service Uid
-     */
-    queryId?: IdType;
-};
-
-/**
- * Public product with organization data
- */
-export type PublicOrgProductDto = PublicProductDto & {
-    /**
-     * Purchased service status
-     */
-    serviceEntityStatus?: EntityStatus;
-
-    /**
-     * Purchased service expiry
-     */
-    serviceExpiry?: string | Date;
-};