dimorder-orderapp-lib 1.6.14 → 1.7.1
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.
- package/dist/api/Api.d.ts +5 -0
- package/dist/api/Api.d.ts.map +1 -1
- package/dist/api/Api.js +28 -17
- package/dist/api/Api.js.map +1 -1
- package/dist/api/Client/Auth.d.ts +2 -2
- package/dist/api/Client/Auth.d.ts.map +1 -1
- package/dist/api/Client/Auth.js +19 -11
- package/dist/api/Client/Auth.js.map +1 -1
- package/dist/api/Client/Device.d.ts +5 -0
- package/dist/api/Client/Device.d.ts.map +1 -1
- package/dist/api/Client/Device.js +5 -0
- package/dist/api/Client/Device.js.map +1 -1
- package/dist/api/Merchant/Auth.d.ts.map +1 -1
- package/dist/api/Merchant/Auth.js +10 -6
- package/dist/api/Merchant/Auth.js.map +1 -1
- package/dist/api/Merchant/Device.d.ts +2 -2
- package/dist/api/Merchant/Device.js +2 -2
- package/dist/libs/apiOrderToAppOrder.d.ts.map +1 -1
- package/dist/libs/apiOrderToAppOrder.js +2 -0
- package/dist/libs/apiOrderToAppOrder.js.map +1 -1
- package/dist/types/Device.d.ts +12 -0
- package/dist/types/Device.d.ts.map +1 -1
- package/package.json +6 -4
package/dist/api/Api.d.ts
CHANGED
|
@@ -2,11 +2,16 @@ import { AxiosInstance, AxiosError } from 'axios';
|
|
|
2
2
|
import { IRegisterResponseData } from '../types/Auth';
|
|
3
3
|
import { IAppOrder } from '../types/AppOrder';
|
|
4
4
|
import { ICalculateOrderRequestData } from '../types/Order';
|
|
5
|
+
export declare type DimOrderAxiosError = AxiosError<{
|
|
6
|
+
error?: string;
|
|
7
|
+
message?: string;
|
|
8
|
+
}>;
|
|
5
9
|
export default class Api {
|
|
6
10
|
baseUrlGo: string;
|
|
7
11
|
baseUrlNode: string;
|
|
8
12
|
apiVersion: string;
|
|
9
13
|
appVersion?: string;
|
|
14
|
+
gzip: boolean;
|
|
10
15
|
token?: string;
|
|
11
16
|
refresh?: string;
|
|
12
17
|
locale?: string;
|
package/dist/api/Api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../src/api/Api.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../src/api/Api.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAKxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAA;AAW3D,oBAAY,kBAAkB,GAAG,UAAU,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC,CAAA;AAE/E,MAAM,CAAC,OAAO,OAAO,GAAG;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,UAAO;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,aAAa,CAAA;IAExB,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,UAAU,GAAG,KAAK,KAAK,IAAI,CAAA;IACrF,iBAAiB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,KAAK,KAAK,IAAI,CAAA;IAC7E,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAA;gBAE1B,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO;;;KAAmC;IAyC/F,MAAM,CAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAKrD,aAAa,CAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAKhC,qBAAqB,CAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,qBAAqB,KAAK,IAAI,GAAG,IAAI;IAI7E,oBAAoB,CAAE,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAIrE,6BAA6B,CAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAI1D,QAAQ,CAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAO/C,aAAa,CAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAIxC,WAAW,CAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAIlC,QAAQ,CAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAoB5B,QAAQ,CAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAS3C,aAAa,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAsBjD,cAAc,CAAE,OAAO,EAAE,MAAM,EAAE,KAAK,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAenE,cAAc,CAAE,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,SAAS,CAAC;CAgD9E"}
|
package/dist/api/Api.js
CHANGED
|
@@ -36,6 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
const axios_1 = __importDefault(require("axios"));
|
|
39
|
+
const pako_1 = __importDefault(require("pako"));
|
|
39
40
|
const AxiosRetry = __importStar(require("axios-retry"));
|
|
40
41
|
const apiOrderToAppOrder_1 = __importDefault(require("../libs/apiOrderToAppOrder"));
|
|
41
42
|
const appBatchToApiBatch_1 = __importDefault(require("../libs/appBatchToApiBatch"));
|
|
@@ -51,28 +52,38 @@ const retryConfig = {
|
|
|
51
52
|
};
|
|
52
53
|
class Api {
|
|
53
54
|
constructor(baseUrlGo, baseUrlNode, configs = { locale: 'zh', appVersion: '' }) {
|
|
55
|
+
this.gzip = true;
|
|
54
56
|
this.appVersion = configs.appVersion;
|
|
55
57
|
this.locale = configs.locale;
|
|
56
58
|
this.baseUrlGo = baseUrlGo;
|
|
57
59
|
this.baseUrlNode = baseUrlNode;
|
|
58
60
|
this.axiosGo = axios_1.default.create({
|
|
59
61
|
baseURL: baseUrlGo,
|
|
60
|
-
timeout: 30000,
|
|
62
|
+
timeout: 30000,
|
|
63
|
+
transformRequest: [(data, headers) => {
|
|
64
|
+
headers['Accept-Language'] = this.locale;
|
|
65
|
+
headers['X-App-Version'] = this.appVersion;
|
|
66
|
+
try {
|
|
67
|
+
if (typeof data === 'object') {
|
|
68
|
+
const gzipData = pako_1.default.gzip(JSON.stringify(data));
|
|
69
|
+
// headers['Content-Encoding'] = 'gzip'
|
|
70
|
+
return gzipData;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
console.error('transformRequest error', error);
|
|
75
|
+
}
|
|
76
|
+
return data;
|
|
77
|
+
}],
|
|
61
78
|
});
|
|
62
79
|
this.axiosNode = axios_1.default.create({
|
|
63
80
|
baseURL: baseUrlNode,
|
|
64
|
-
timeout: 30000,
|
|
81
|
+
timeout: 30000,
|
|
82
|
+
transformRequest: [(data, headers) => {
|
|
83
|
+
headers['Accept-Language'] = this.locale;
|
|
84
|
+
headers['X-App-Version'] = this.appVersion;
|
|
85
|
+
}],
|
|
65
86
|
});
|
|
66
|
-
this.axiosGo.interceptors.request.use(config => {
|
|
67
|
-
config.headers['Accept-Language'] = this.locale;
|
|
68
|
-
config.headers['X-App-Version'] = this.appVersion;
|
|
69
|
-
return config;
|
|
70
|
-
}, error => error);
|
|
71
|
-
this.axiosNode.interceptors.request.use(config => {
|
|
72
|
-
config.headers['Accept-Language'] = this.locale;
|
|
73
|
-
config.headers['X-App-Version'] = this.appVersion;
|
|
74
|
-
return config;
|
|
75
|
-
}, error => error);
|
|
76
87
|
axiosRetry(this.axiosGo, retryConfig);
|
|
77
88
|
axiosRetry(this.axiosNode, retryConfig);
|
|
78
89
|
this.apiVersion = '2.0.0';
|
|
@@ -109,15 +120,15 @@ class Api {
|
|
|
109
120
|
this.locale = locale;
|
|
110
121
|
}
|
|
111
122
|
logError(error) {
|
|
112
|
-
var _a, _b;
|
|
123
|
+
var _a, _b, _c, _d, _e, _f;
|
|
113
124
|
if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) != null && ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) != null) {
|
|
114
125
|
console.error({
|
|
115
126
|
type: 'ajax error',
|
|
116
127
|
request: {
|
|
117
|
-
method: error.config.method,
|
|
118
|
-
url: error.config.url,
|
|
119
|
-
data: error.config.data,
|
|
120
|
-
params: error.config.params,
|
|
128
|
+
method: (_c = error.config) === null || _c === void 0 ? void 0 : _c.method,
|
|
129
|
+
url: (_d = error.config) === null || _d === void 0 ? void 0 : _d.url,
|
|
130
|
+
data: (_e = error.config) === null || _e === void 0 ? void 0 : _e.data,
|
|
131
|
+
params: (_f = error.config) === null || _f === void 0 ? void 0 : _f.params,
|
|
121
132
|
},
|
|
122
133
|
response: {
|
|
123
134
|
data: error.response.data,
|
package/dist/api/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/api/Api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAwD;AACxD,wDAAyC;AACzC,oFAA2D;AAC3D,oFAA2D;AAK3D,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAA;AACrC,MAAM,WAAW,GAAiC;IAChD,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,UAAU,CAAC,gBAAgB;IACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;;QACxB,OAAO,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC;YACvC,CAAC,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,IAAI,CAAA,
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/api/Api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { AxiosError } from 'axios';
|
|
2
1
|
import OrderappClientApi from './index';
|
|
3
2
|
import { ILoginData, IRegisterResponseData } from '../../types/Auth';
|
|
3
|
+
import { DimOrderAxiosError } from '../Api';
|
|
4
4
|
export default class AuthApi {
|
|
5
5
|
api: OrderappClientApi;
|
|
6
6
|
constructor(api: OrderappClientApi);
|
|
7
|
-
sanitizeError(error:
|
|
7
|
+
sanitizeError(error: DimOrderAxiosError): DimOrderAxiosError;
|
|
8
8
|
scopeLogin(merchantUsername: string, username: string, password: string): Promise<ILoginData>;
|
|
9
9
|
register(payload?: string, hash?: string, client?: string): Promise<IRegisterResponseData>;
|
|
10
10
|
refresh(token: string): Promise<IRegisterResponseData>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/api/Client/Auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/api/Client/Auth.ts"],"names":[],"mappings":"AAEA,OAAO,iBAAiB,MAAM,SAAS,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AAE3C,MAAM,CAAC,OAAO,OAAO,OAAO;IAC1B,GAAG,EAAE,iBAAiB,CAAA;gBAET,GAAG,EAAE,iBAAiB;IA0GnC,aAAa,CAAE,KAAK,EAAE,kBAAkB,GAAG,kBAAkB;IAavD,UAAU,CAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAa9F,QAAQ,CAAE,OAAO,GAAE,MAAW,EAAE,IAAI,GAAE,MAAW,EAAE,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC;IASvG,OAAO,CAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAUvD,cAAc,IAAK,OAAO,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,CAAC;CAK/C"}
|
package/dist/api/Client/Auth.js
CHANGED
|
@@ -30,8 +30,10 @@ class AuthApi {
|
|
|
30
30
|
try {
|
|
31
31
|
yield this.api.refreshCustomerApiCallback();
|
|
32
32
|
// retry with new token
|
|
33
|
-
error.config
|
|
34
|
-
|
|
33
|
+
if (error.config != null) {
|
|
34
|
+
error.config.headers.Authorization = this.api.axiosGo.defaults.headers.common.Authorization;
|
|
35
|
+
return yield this.api.axiosGo.request(error.config);
|
|
36
|
+
}
|
|
35
37
|
}
|
|
36
38
|
catch (error) {
|
|
37
39
|
return yield Promise.reject(error);
|
|
@@ -50,8 +52,10 @@ class AuthApi {
|
|
|
50
52
|
yield this.api.updateUserCallback(user, error);
|
|
51
53
|
}
|
|
52
54
|
// retry with new token
|
|
53
|
-
error.config
|
|
54
|
-
|
|
55
|
+
if ((error === null || error === void 0 ? void 0 : error.config) != null) {
|
|
56
|
+
error.config.headers.Authorization = this.api.axiosGo.defaults.headers.common.Authorization;
|
|
57
|
+
return yield this.api.axiosGo.request(error.config);
|
|
58
|
+
}
|
|
55
59
|
}
|
|
56
60
|
catch (error) {
|
|
57
61
|
// refresh 失敗 要求重登
|
|
@@ -86,12 +90,14 @@ class AuthApi {
|
|
|
86
90
|
if ((res === null || res === void 0 ? void 0 : res.status) === 500 && errorMessage === 'UnauthorizedError: jwt expired') {
|
|
87
91
|
if (this.api.refresh != null) {
|
|
88
92
|
const user = yield this.refresh(this.api.refresh);
|
|
89
|
-
error.config.headers.Authorization = this.api.axiosNode.defaults.headers.common.Authorization;
|
|
90
93
|
if (this.api.updateUserCallback != null) {
|
|
91
94
|
this.api.updateUserCallback(user, error);
|
|
92
95
|
}
|
|
93
|
-
|
|
94
|
-
|
|
96
|
+
if ((error === null || error === void 0 ? void 0 : error.config) != null) {
|
|
97
|
+
error.config.headers.Authorization = this.api.axiosNode.defaults.headers.common.Authorization;
|
|
98
|
+
// retry
|
|
99
|
+
return yield this.api.axiosNode.request(error.config);
|
|
100
|
+
}
|
|
95
101
|
}
|
|
96
102
|
}
|
|
97
103
|
else if ((res === null || res === void 0 ? void 0 : res.status) === 401) {
|
|
@@ -105,11 +111,13 @@ class AuthApi {
|
|
|
105
111
|
}
|
|
106
112
|
sanitizeError(error) {
|
|
107
113
|
try {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
114
|
+
if (error.config != null) {
|
|
115
|
+
const data = JSON.parse(error.config.data);
|
|
116
|
+
if (lodash_1.default.get(data, 'payment.payload.paymentMethod.paymentCard') != null) {
|
|
117
|
+
delete data.payment.payload.paymentMethod.paymentCard;
|
|
118
|
+
}
|
|
119
|
+
error.config.data = JSON.stringify(data);
|
|
111
120
|
}
|
|
112
|
-
error.config.data = JSON.stringify(data);
|
|
113
121
|
}
|
|
114
122
|
catch (e) { }
|
|
115
123
|
return error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../src/api/Client/Auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAAsB;
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../src/api/Client/Auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,11 @@ import { IDevice } from '../../types/Device';
|
|
|
3
3
|
export default class DeviceApi {
|
|
4
4
|
api: OrderappClientApi;
|
|
5
5
|
constructor(api: OrderappClientApi);
|
|
6
|
+
/**
|
|
7
|
+
* for CA-989 https://dimorder.atlassian.net/browse/CA-989
|
|
8
|
+
* CA 的 findOfflineDevice 會抓 master device 判斷 device.lastHealthTime 確認 master 是否在線上
|
|
9
|
+
* 但該功能目前此功能備註解掉，未被使用
|
|
10
|
+
*/
|
|
6
11
|
getMerchantDevices(merchantId: string, isMaster: boolean): Promise<IDevice[]>;
|
|
7
12
|
}
|
|
8
13
|
//# sourceMappingURL=Device.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../../src/api/Client/Device.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,SAAS,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B,GAAG,EAAE,iBAAiB,CAAA;gBAET,GAAG,EAAE,iBAAiB;
|
|
1
|
+
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../../src/api/Client/Device.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,SAAS,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B,GAAG,EAAE,iBAAiB,CAAA;gBAET,GAAG,EAAE,iBAAiB;IAInC;;;;OAIG;IACG,kBAAkB,CAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CASrF"}
|
|
@@ -13,6 +13,11 @@ class DeviceApi {
|
|
|
13
13
|
constructor(api) {
|
|
14
14
|
this.api = api;
|
|
15
15
|
}
|
|
16
|
+
/**
|
|
17
|
+
* for CA-989 https://dimorder.atlassian.net/browse/CA-989
|
|
18
|
+
* CA 的 findOfflineDevice 會抓 master device 判斷 device.lastHealthTime 確認 master 是否在線上
|
|
19
|
+
* 但該功能目前此功能備註解掉，未被使用
|
|
20
|
+
*/
|
|
16
21
|
getMerchantDevices(merchantId, isMaster) {
|
|
17
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
18
23
|
const endpoint = '/c/device';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../src/api/Client/Device.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,MAAqB,SAAS;IAG5B,YAAa,GAAsB;QACjC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;
|
|
1
|
+
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../src/api/Client/Device.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,MAAqB,SAAS;IAG5B,YAAa,GAAsB;QACjC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED;;;;OAIG;IACG,kBAAkB,CAAE,UAAkB,EAAE,QAAiB;;YAC7D,MAAM,QAAQ,GAAG,WAAW,CAAA;YAC5B,MAAM,MAAM,GAAG;gBACb,UAAU,EAAE,UAAU;gBACtB,MAAM,EAAE,QAAQ;aACjB,CAAA;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;YACjE,OAAO,QAAQ,CAAC,IAAI,CAAA;QACtB,CAAC;KAAA;CACF;AArBD,4BAqBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/api/Merchant/Auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/api/Merchant/Auth.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAGrD,MAAM,CAAC,OAAO,OAAO,OAAO;IAC1B,GAAG,EAAE,mBAAmB,CAAA;gBAEX,GAAG,EAAE,mBAAmB;IA0DrC;;OAEG;IACG,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;IAO/E;;OAEG;IACG,KAAK,CAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAQvF;;OAEG;IACG,UAAU,CAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAQ5F;;OAEG;IACG,yBAAyB,CAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAO3G;;OAEG;IACG,6BAA6B,CAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAQvH;;OAEG;IACG,UAAU,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAOlD,OAAO,CAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAQlD;;;OAGG;IACG,UAAU,CAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAO1E;;OAEG;IACG,WAAW,IAAK,OAAO,CAAC,UAAU,CAAC;IAMzC;;OAEG;IACG,UAAU,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;CAKzD"}
|
|
@@ -22,14 +22,16 @@ class AuthApi {
|
|
|
22
22
|
if (this.api.updateUserCallback != null) {
|
|
23
23
|
const user = yield this.refresh(this.api.refresh);
|
|
24
24
|
this.api.updateUserCallback(user, error);
|
|
25
|
-
error.config
|
|
26
|
-
|
|
25
|
+
if (error.config != null) {
|
|
26
|
+
error.config.headers.Authorization = this.api.axiosGo.defaults.headers.common.Authorization;
|
|
27
|
+
return yield this.api.axiosGo.request(error.config);
|
|
28
|
+
}
|
|
27
29
|
}
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
32
|
else if ((res === null || res === void 0 ? void 0 : res.status) === 401) {
|
|
31
33
|
if (this.api.resetUserCallback != null) {
|
|
32
|
-
this.api.resetUserCallback((_c = (_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.error) !== null && _c !== void 0 ? _c : res === null || res === void 0 ? void 0 : res.status, error);
|
|
34
|
+
this.api.resetUserCallback(String((_c = (_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.error) !== null && _c !== void 0 ? _c : res === null || res === void 0 ? void 0 : res.status), error);
|
|
33
35
|
return yield Promise.reject(error);
|
|
34
36
|
}
|
|
35
37
|
}
|
|
@@ -45,14 +47,16 @@ class AuthApi {
|
|
|
45
47
|
if (this.api.updateUserCallback != null) {
|
|
46
48
|
const user = yield this.refresh(this.api.refresh);
|
|
47
49
|
this.api.updateUserCallback(user, error);
|
|
48
|
-
error.config
|
|
49
|
-
|
|
50
|
+
if ((error === null || error === void 0 ? void 0 : error.config) != null) {
|
|
51
|
+
error.config.headers.Authorization = this.api.axiosNode.defaults.headers.common.Authorization;
|
|
52
|
+
return yield this.api.axiosNode.request(error.config);
|
|
53
|
+
}
|
|
50
54
|
}
|
|
51
55
|
}
|
|
52
56
|
}
|
|
53
57
|
else if ((res === null || res === void 0 ? void 0 : res.status) === 401) {
|
|
54
58
|
if (this.api.resetUserCallback != null) {
|
|
55
|
-
this.api.resetUserCallback((_h = (_f = (_e = res === null || res === void 0 ? void 0 : res.data) === null || _e === void 0 ? void 0 : _e.error) !== null && _f !== void 0 ? _f : (_g = res === null || res === void 0 ? void 0 : res.data) === null || _g === void 0 ? void 0 : _g.message) !== null && _h !== void 0 ? _h : res === null || res === void 0 ? void 0 : res.status, error);
|
|
59
|
+
this.api.resetUserCallback(String((_h = (_f = (_e = res === null || res === void 0 ? void 0 : res.data) === null || _e === void 0 ? void 0 : _e.error) !== null && _f !== void 0 ? _f : (_g = res === null || res === void 0 ? void 0 : res.data) === null || _g === void 0 ? void 0 : _g.message) !== null && _h !== void 0 ? _h : res === null || res === void 0 ? void 0 : res.status), error);
|
|
56
60
|
return yield Promise.reject(error);
|
|
57
61
|
}
|
|
58
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../src/api/Merchant/Auth.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA,MAAqB,OAAO;IAG1B,YAAa,GAAwB;QACnC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QAEd,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CACxC,IAAI,CAAC,EAAE,CAAC,IAAI,EACZ,CAAO,
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../src/api/Merchant/Auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,11 @@ export default class DeviceApi {
|
|
|
4
4
|
api: OrderappMerchantApi;
|
|
5
5
|
constructor(api: OrderappMerchantApi);
|
|
6
6
|
/**
|
|
7
|
-
* 回報 Device
|
|
7
|
+
* 回報 Device 最後活著的時間，後端會根據收到 request 的時間寫入 lastHealthTime
|
|
8
8
|
*/
|
|
9
9
|
updateTTL(deviceId: string): Promise<IDevice>;
|
|
10
10
|
/**
|
|
11
|
-
* 修改 Device
|
|
11
|
+
* 修改 Device 內容，但目前只有 CA 使用 isMaster 和 lastHealthTime 這兩個欄位
|
|
12
12
|
*/
|
|
13
13
|
updateDevice(deviceId: string, data: IUpdateDeviceRequestData): Promise<IDevice>;
|
|
14
14
|
}
|
|
@@ -14,7 +14,7 @@ class DeviceApi {
|
|
|
14
14
|
this.api = api;
|
|
15
15
|
}
|
|
16
16
|
/**
|
|
17
|
-
* 回報 Device
|
|
17
|
+
* 回報 Device 最後活著的時間，後端會根據收到 request 的時間寫入 lastHealthTime
|
|
18
18
|
*/
|
|
19
19
|
updateTTL(deviceId) {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -24,7 +24,7 @@ class DeviceApi {
|
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
/**
|
|
27
|
-
* 修改 Device
|
|
27
|
+
* 修改 Device 內容，但目前只有 CA 使用 isMaster 和 lastHealthTime 這兩個欄位
|
|
28
28
|
*/
|
|
29
29
|
updateDevice(deviceId, data) {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiOrderToAppOrder.d.ts","sourceRoot":"","sources":["../../src/libs/apiOrderToAppOrder.ts"],"names":[],"mappings":"AAKA,OAAO,EAAe,SAAS,EAAsD,MAAM,mBAAmB,CAAA;AAC9G,OAAO,EAAE,MAAM,EAA4F,MAAM,gBAAgB,CAAA;AAEjI,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"apiOrderToAppOrder.d.ts","sourceRoot":"","sources":["../../src/libs/apiOrderToAppOrder.ts"],"names":[],"mappings":"AAKA,OAAO,EAAe,SAAS,EAAsD,MAAM,mBAAmB,CAAA;AAC9G,OAAO,EAAE,MAAM,EAA4F,MAAM,gBAAgB,CAAA;AAEjI,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAgBvE"}
|
|
@@ -10,6 +10,8 @@ const getDisplayStatusKey_1 = __importDefault(require("./getDisplayStatusKey"));
|
|
|
10
10
|
const toUtcFormat_1 = __importDefault(require("./toUtcFormat"));
|
|
11
11
|
function apiOrderToAppOrder(apiOrder) {
|
|
12
12
|
var _a, _b, _c, _d;
|
|
13
|
+
if (apiOrder == null)
|
|
14
|
+
throw new Error("apiOrderToAppOrder error, apiOrder can't be null");
|
|
13
15
|
const appOrder = Object.assign(Object.assign({}, apiOrder), { batches: (_a = apiOrder.batches) === null || _a === void 0 ? void 0 : _a.map(apiBatch => toAppBatch(apiBatch, apiOrder)),
|
|
14
16
|
// modifiers 為變價新格式，若後端還沒有，從將原本的 discount 格式轉換進來
|
|
15
17
|
modifiers: (_b = apiOrder.modifiers) !== null && _b !== void 0 ? _b : [apiOrder.discount],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiOrderToAppOrder.js","sourceRoot":"","sources":["../../src/libs/apiOrderToAppOrder.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,oFAA2D;AAC3D,oEAA2C;AAC3C,gFAAuD;AACvD,gEAAuC;AAIvC,SAAwB,kBAAkB,CAAE,QAAgB;;IAC1D,MAAM,QAAQ,mCACT,QAAQ,KACX,OAAO,EAAE,MAAA,QAAQ,CAAC,OAAO,0CAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1E,gDAAgD;QAChD,SAAS,EAAE,MAAA,QAAQ,CAAC,SAAS,mCAAI,CAAC,QAAQ,CAAC,QAA0B,CAAC;QACtE,uCAAuC;QACvC,QAAQ,EAAE,MAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,mCAAI,EAAE,EAC9E,gBAAgB,EAAE,SAAS,EAC3B,SAAS,EAAE,IAAA,qBAAW,EAAC,QAAQ,CAAC,SAAS,CAAC,GAE3C,CAAA;IAED,QAAQ,CAAC,gBAAgB,GAAG,IAAA,6BAAmB,EAAC,QAAQ,CAAC,CAAA;IACzD,OAAO,QAAQ,CAAA;AACjB,CAAC;
|
|
1
|
+
{"version":3,"file":"apiOrderToAppOrder.js","sourceRoot":"","sources":["../../src/libs/apiOrderToAppOrder.ts"],"names":[],"mappings":"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"}
|
package/dist/types/Device.d.ts
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
export default class Device {
|
|
2
2
|
device: undefined;
|
|
3
3
|
}
|
|
4
|
+
/**
|
|
5
|
+
* for CA-989 https://dimorder.atlassian.net/browse/CA-989
|
|
6
|
+
* CA 的 findOfflineDevice 會抓 GET /c/device 找出 master device
|
|
7
|
+
* 判斷 device.lastHealthTime 確認 master 是否在線上
|
|
8
|
+
* 但該功能目前此功能備註解掉，未被使用
|
|
9
|
+
*/
|
|
4
10
|
export interface IDevice {
|
|
5
11
|
id: string;
|
|
6
12
|
createdAt: string;
|
|
@@ -16,6 +22,12 @@ export interface IDevice {
|
|
|
16
22
|
ttl: string;
|
|
17
23
|
lastHealthTime: string;
|
|
18
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* MR 在上線時會 request PUT /m/device/$id 更新這些東西
|
|
27
|
+
* 但其實只有 isMaster 會被用到
|
|
28
|
+
* 之後每分鐘 MR 會 request PUT /m/device/$id/ttl 後端會更新 lastHealthTime
|
|
29
|
+
* 所以除了 device.isMaster 和 device.lastHealthTime 其他欄位都沒用到
|
|
30
|
+
*/
|
|
19
31
|
export interface IUpdateDeviceRequestData {
|
|
20
32
|
client: TDeviceClient;
|
|
21
33
|
deploymentChannel: TDeviceDeploymentChannel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/types/Device.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,MAAM;IACzB,MAAM,EAAE,SAAS,CAAA;CAClB;
|
|
1
|
+
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/types/Device.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,MAAM;IACzB,MAAM,EAAE,SAAS,CAAA;CAClB;AAED;;;;;GAKG;AACH,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,aAAa,CAAA;IACrB,SAAS,EAAE,eAAe,EAAE,CAAA;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,wBAAwB,CAAA;IAC3C,KAAK,EAAE,OAAO,CAAA;IACd,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,aAAa,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;CACvB;AAED;;;;;GAKG;AACH,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,aAAa,CAAA;IACrB,iBAAiB,EAAE,wBAAwB,CAAA;IAC3C,KAAK,EAAE,OAAO,CAAA;IACd,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,eAAe,EAAE,CAAA;IAC5B,MAAM,EAAE,aAAa,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,oBAAY,aAAa,GAAG,cAAc,CAAA;AAC1C,oBAAY,wBAAwB,GAAG,MAAM,CAAA;AAC7C,oBAAY,eAAe,GAAG,KAAK,GAAG,KAAK,CAAA;AAC3C,oBAAY,aAAa,GAAG,QAAQ,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dimorder-orderapp-lib",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.1",
|
|
4
4
|
"main": "dist",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"scripts": {
|
|
@@ -17,13 +17,14 @@
|
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@types/lodash": "^4.14.167",
|
|
19
19
|
"atob": "^2.1.2",
|
|
20
|
-
"axios": "^
|
|
20
|
+
"axios": "^1.6.5",
|
|
21
21
|
"axios-retry": "^3.1.9",
|
|
22
|
-
"immer": "^
|
|
22
|
+
"immer": "^10.0.3",
|
|
23
23
|
"lodash": "^4.17.20",
|
|
24
24
|
"moment": "^2.29.1",
|
|
25
|
+
"pako": "^2.1.0",
|
|
25
26
|
"plist": "^3.0.2",
|
|
26
|
-
"semver": "^7.
|
|
27
|
+
"semver": "^7.5.4",
|
|
27
28
|
"sizeof": "^1.0.0",
|
|
28
29
|
"uuid": "^8.3.2",
|
|
29
30
|
"yargs": "^17.0.1"
|
|
@@ -34,6 +35,7 @@
|
|
|
34
35
|
"@types/jest": "^29.2.1",
|
|
35
36
|
"@types/moment": "^2.13.0",
|
|
36
37
|
"@types/node": "^14.14.20",
|
|
38
|
+
"@types/pako": "^2.0.3",
|
|
37
39
|
"@types/sizeof": "^1.0.1",
|
|
38
40
|
"@types/uuid": "^8.3.0",
|
|
39
41
|
"@typescript-eslint/eslint-plugin": "^4.8.1",
|