@etsoo/appscript 1.6.2 → 1.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/lib/cjs/api/AuthApi.d.ts +2 -1
  2. package/lib/cjs/api/AuthApi.js +3 -2
  3. package/lib/cjs/app/AppSettings.d.ts +5 -0
  4. package/lib/cjs/app/ExternalSettings.d.ts +0 -5
  5. package/lib/cjs/app/ExternalSettings.js +2 -2
  6. package/lib/mjs/api/AuthApi.d.ts +2 -1
  7. package/lib/mjs/api/AuthApi.js +3 -2
  8. package/lib/mjs/app/AppSettings.d.ts +5 -0
  9. package/lib/mjs/app/ExternalSettings.d.ts +0 -5
  10. package/lib/mjs/app/ExternalSettings.js +2 -2
  11. package/package.json +1 -1
  12. package/src/api/AuthApi.ts +7 -2
  13. package/src/app/AppSettings.ts +6 -0
  14. package/src/app/ExternalSettings.ts +2 -8
package/lib/cjs/api/AuthApi.d.ts CHANGED
@@ -61,9 +61,10 @@ export declare class AuthApi extends BaseApi {
61
61
  * Get log in url
62
62
  * @param rq Request data
63
63
  * @param payload Payload
64
+ * @param apiHost API host
64
65
  * @returns Result
65
66
  */
66
- getLogInUrl(rq: GetLogInUrlRQ, payload?: IApiPayload<string>): Promise<string | undefined>;
67
+ getLogInUrl(rq: GetLogInUrlRQ, payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
67
68
  /**
68
69
  * Login
69
70
  * @param rq Request data
package/lib/cjs/api/AuthApi.js CHANGED
@@ -71,10 +71,11 @@ class AuthApi extends BaseApi_1.BaseApi {
71
71
  * Get log in url
72
72
  * @param rq Request data
73
73
  * @param payload Payload
74
+ * @param apiHost API host
74
75
  * @returns Result
75
76
  */
76
- getLogInUrl(rq, payload) {
77
- return this.api.get("Auth/GetLogInUrl", rq, payload);
77
+ getLogInUrl(rq, payload, apiHost) {
78
+ return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
78
79
  }
79
80
  /**
80
81
  * Login
package/lib/cjs/app/AppSettings.d.ts CHANGED
@@ -5,6 +5,11 @@ import { IExternalSettings } from "./ExternalSettings";
5
5
  * App settings interface
6
6
  */
7
7
  export interface IAppSettings extends IExternalSettings {
8
+ /**
9
+ * Application id
10
+ * 程序编号
11
+ */
12
+ readonly appId: number;
8
13
  /**
9
14
  * Supported country/region ids
10
15
  */
package/lib/cjs/app/ExternalSettings.d.ts CHANGED
@@ -23,11 +23,6 @@ export interface IExternalSettings extends ExternalEndpoint {
23
23
  * App root url
24
24
  */
25
25
  readonly homepage: string;
26
- /**
27
- * Application id
28
- * 程序编号
29
- */
30
- readonly appId: number;
31
26
  /**
32
27
  * Default hostname for substitution
33
28
  * 用于替换的默认主机名
package/lib/cjs/app/ExternalSettings.js CHANGED
@@ -24,8 +24,8 @@ var ExternalSettings;
24
24
  }
25
25
  if (settings != null &&
26
26
  typeof settings === "object" &&
27
- "appId" in settings &&
28
- "endpoint" in settings) {
27
+ "endpoint" in settings &&
28
+ "webUrl" in settings) {
29
29
  const s = settings;
30
30
  if (hostname)
31
31
  s.hostname = hostname;
package/lib/mjs/api/AuthApi.d.ts CHANGED
@@ -61,9 +61,10 @@ export declare class AuthApi extends BaseApi {
61
61
  * Get log in url
62
62
  * @param rq Request data
63
63
  * @param payload Payload
64
+ * @param apiHost API host
64
65
  * @returns Result
65
66
  */
66
- getLogInUrl(rq: GetLogInUrlRQ, payload?: IApiPayload<string>): Promise<string | undefined>;
67
+ getLogInUrl(rq: GetLogInUrlRQ, payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
67
68
  /**
68
69
  * Login
69
70
  * @param rq Request data
package/lib/mjs/api/AuthApi.js CHANGED
@@ -68,10 +68,11 @@ export class AuthApi extends BaseApi {
68
68
  * Get log in url
69
69
  * @param rq Request data
70
70
  * @param payload Payload
71
+ * @param apiHost API host
71
72
  * @returns Result
72
73
  */
73
- getLogInUrl(rq, payload) {
74
- return this.api.get("Auth/GetLogInUrl", rq, payload);
74
+ getLogInUrl(rq, payload, apiHost) {
75
+ return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
75
76
  }
76
77
  /**
77
78
  * Login
package/lib/mjs/app/AppSettings.d.ts CHANGED
@@ -5,6 +5,11 @@ import { IExternalSettings } from "./ExternalSettings";
5
5
  * App settings interface
6
6
  */
7
7
  export interface IAppSettings extends IExternalSettings {
8
+ /**
9
+ * Application id
10
+ * 程序编号
11
+ */
12
+ readonly appId: number;
8
13
  /**
9
14
  * Supported country/region ids
10
15
  */
package/lib/mjs/app/ExternalSettings.d.ts CHANGED
@@ -23,11 +23,6 @@ export interface IExternalSettings extends ExternalEndpoint {
23
23
  * App root url
24
24
  */
25
25
  readonly homepage: string;
26
- /**
27
- * Application id
28
- * 程序编号
29
- */
30
- readonly appId: number;
31
26
  /**
32
27
  * Default hostname for substitution
33
28
  * 用于替换的默认主机名
package/lib/mjs/app/ExternalSettings.js CHANGED
@@ -21,8 +21,8 @@ export var ExternalSettings;
21
21
  }
22
22
  if (settings != null &&
23
23
  typeof settings === "object" &&
24
- "appId" in settings &&
25
- "endpoint" in settings) {
24
+ "endpoint" in settings &&
25
+ "webUrl" in settings) {
26
26
  const s = settings;
27
27
  if (hostname)
28
28
  s.hostname = hostname;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.6.2",
3
+ "version": "1.6.4",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
package/src/api/AuthApi.ts CHANGED
@@ -103,10 +103,15 @@ export class AuthApi extends BaseApi {
103
103
  * Get log in url
104
104
  * @param rq Request data
105
105
  * @param payload Payload
106
+ * @param apiHost API host
106
107
  * @returns Result
107
108
  */
108
- getLogInUrl(rq: GetLogInUrlRQ, payload?: IApiPayload<string>) {
109
- return this.api.get("Auth/GetLogInUrl", rq, payload);
109
+ getLogInUrl(
110
+ rq: GetLogInUrlRQ,
111
+ payload?: IApiPayload<string>,
112
+ apiHost?: string
113
+ ) {
114
+ return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
110
115
  }
111
116
 
112
117
  /**
package/src/app/AppSettings.ts CHANGED
@@ -6,6 +6,12 @@ import { IExternalSettings } from "./ExternalSettings";
6
6
  * App settings interface
7
7
  */
8
8
  export interface IAppSettings extends IExternalSettings {
9
+ /**
10
+ * Application id
11
+ * 程序编号
12
+ */
13
+ readonly appId: number;
14
+
9
15
  /**
10
16
  * Supported country/region ids
11
17
  */
package/src/app/ExternalSettings.ts CHANGED
@@ -27,12 +27,6 @@ export interface IExternalSettings extends ExternalEndpoint {
27
27
  */
28
28
  readonly homepage: string;
29
29
 
30
- /**
31
- * Application id
32
- * 程序编号
33
- */
34
- readonly appId: number;
35
-
36
30
  /**
37
31
  * Default hostname for substitution
38
32
  * 用于替换的默认主机名
@@ -77,8 +71,8 @@ export namespace ExternalSettings {
77
71
  if (
78
72
  settings != null &&
79
73
  typeof settings === "object" &&
80
- "appId" in settings &&
81
- "endpoint" in settings
74
+ "endpoint" in settings &&
75
+ "webUrl" in settings
82
76
  ) {
83
77
  const s = settings as T;
84
78
  if (hostname) s.hostname = hostname;