dimorder-orderapp-lib 1.6.13 → 1.7.0
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 +6 -0
- package/dist/api/Api.d.ts.map +1 -1
- package/dist/api/Api.js +49 -6
- 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/Client/index.d.ts +1 -0
- package/dist/api/Client/index.d.ts.map +1 -1
- package/dist/api/Client/index.js +1 -1
- package/dist/api/Client/index.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/api/Merchant/index.d.ts +1 -0
- package/dist/api/Merchant/index.d.ts.map +1 -1
- package/dist/api/Merchant/index.js +1 -1
- package/dist/api/Merchant/index.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/types/Device.d.ts +12 -0
- package/dist/types/Device.d.ts.map +1 -1
- package/dist/types/Landing.d.ts +167 -0
- package/dist/types/Landing.d.ts.map +1 -0
- package/dist/types/Landing.js +6 -0
- package/dist/types/Landing.js.map +1 -0
- package/dist/types/PromoCode.d.ts +2 -1
- package/dist/types/PromoCode.d.ts.map +1 -1
- package/dist/types/PromoCode.js.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +2 -0
- package/dist/types/index.js.map +1 -1
- package/jest.config.js +5 -0
- 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;
|
|
@@ -18,6 +23,7 @@ export default class Api {
|
|
|
18
23
|
constructor(baseUrlGo: string, baseUrlNode: string, configs?: {
|
|
19
24
|
locale: string;
|
|
20
25
|
appVersion: string;
|
|
26
|
+
gzip: boolean;
|
|
21
27
|
});
|
|
22
28
|
setUrl(baseUrlGo: string, baseUrlNode: string): void;
|
|
23
29
|
setApiTimeout(ms: number): void;
|
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;;;;KAA+C;IAqF3G,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"));
|
|
@@ -50,9 +51,11 @@ const retryConfig = {
|
|
|
50
51
|
},
|
|
51
52
|
};
|
|
52
53
|
class Api {
|
|
53
|
-
constructor(baseUrlGo, baseUrlNode, configs = { locale: 'zh', appVersion: '' }) {
|
|
54
|
+
constructor(baseUrlGo, baseUrlNode, configs = { locale: 'zh', appVersion: '', gzip: true }) {
|
|
55
|
+
this.gzip = true;
|
|
54
56
|
this.appVersion = configs.appVersion;
|
|
55
57
|
this.locale = configs.locale;
|
|
58
|
+
this.gzip = configs.gzip;
|
|
56
59
|
this.baseUrlGo = baseUrlGo;
|
|
57
60
|
this.baseUrlNode = baseUrlNode;
|
|
58
61
|
this.axiosGo = axios_1.default.create({
|
|
@@ -64,10 +67,50 @@ class Api {
|
|
|
64
67
|
timeout: 30000, // 預設 30 秒 timeout
|
|
65
68
|
});
|
|
66
69
|
this.axiosGo.interceptors.request.use(config => {
|
|
70
|
+
if (this.gzip) {
|
|
71
|
+
try {
|
|
72
|
+
if (typeof config.data === 'object') {
|
|
73
|
+
config.data = JSON.stringify(config.data);
|
|
74
|
+
}
|
|
75
|
+
// 使用 pako 將 JSON 字符串進行 Gzip 壓縮
|
|
76
|
+
config.data = pako_1.default.gzip(config.data);
|
|
77
|
+
config.headers['Content-Encoding'] = 'gzip';
|
|
78
|
+
}
|
|
79
|
+
catch (encodeError) {
|
|
80
|
+
console.log(encodeError);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
67
83
|
config.headers['Accept-Language'] = this.locale;
|
|
68
84
|
config.headers['X-App-Version'] = this.appVersion;
|
|
69
85
|
return config;
|
|
70
86
|
}, error => error);
|
|
87
|
+
this.axiosGo.interceptors.response.use(response => {
|
|
88
|
+
// 檢查 Response Header 中是否包含 Content-Encoding: gzip
|
|
89
|
+
const contentEncoding = response.headers['content-encoding'];
|
|
90
|
+
if ((contentEncoding === null || contentEncoding === void 0 ? void 0 : contentEncoding.toLowerCase()) === 'gzip') {
|
|
91
|
+
// 如果是 Gzip,解壓縮數據
|
|
92
|
+
try {
|
|
93
|
+
response.data = JSON.parse(pako_1.default.ungzip(response.data, { to: 'string' }));
|
|
94
|
+
}
|
|
95
|
+
catch (parseError) {
|
|
96
|
+
response.data = pako_1.default.ungzip(response.data, { to: 'string' });
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
return response;
|
|
100
|
+
}, error => {
|
|
101
|
+
// 檢查 Error Response 中是否包含 Content-Encoding: gzip
|
|
102
|
+
const contentEncoding = error.response.headers['content-encoding'];
|
|
103
|
+
if ((contentEncoding === null || contentEncoding === void 0 ? void 0 : contentEncoding.toLowerCase()) === 'gzip') {
|
|
104
|
+
// 如果是 Gzip,解壓縮錯誤數據
|
|
105
|
+
try {
|
|
106
|
+
error.response.data = JSON.parse(pako_1.default.ungzip(error.response.data, { to: 'string' }));
|
|
107
|
+
}
|
|
108
|
+
catch (parseError) {
|
|
109
|
+
error.response.data = pako_1.default.ungzip(error.response.data, { to: 'string' });
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return error;
|
|
113
|
+
});
|
|
71
114
|
this.axiosNode.interceptors.request.use(config => {
|
|
72
115
|
config.headers['Accept-Language'] = this.locale;
|
|
73
116
|
config.headers['X-App-Version'] = this.appVersion;
|
|
@@ -109,15 +152,15 @@ class Api {
|
|
|
109
152
|
this.locale = locale;
|
|
110
153
|
}
|
|
111
154
|
logError(error) {
|
|
112
|
-
var _a, _b;
|
|
155
|
+
var _a, _b, _c, _d, _e, _f;
|
|
113
156
|
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
157
|
console.error({
|
|
115
158
|
type: 'ajax error',
|
|
116
159
|
request: {
|
|
117
|
-
method: error.config.method,
|
|
118
|
-
url: error.config.url,
|
|
119
|
-
data: error.config.data,
|
|
120
|
-
params: error.config.params,
|
|
160
|
+
method: (_c = error.config) === null || _c === void 0 ? void 0 : _c.method,
|
|
161
|
+
url: (_d = error.config) === null || _d === void 0 ? void 0 : _d.url,
|
|
162
|
+
data: (_e = error.config) === null || _e === void 0 ? void 0 : _e.data,
|
|
163
|
+
params: (_f = error.config) === null || _f === void 0 ? void 0 : _f.params,
|
|
121
164
|
},
|
|
122
165
|
response: {
|
|
123
166
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAwD;AACxD,gDAAuB;AACvB,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,MAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAA0B,0CAAE,KAAK,MAAK,iBAAiB,CAAC,CAAA;IAC9G,CAAC;CACF,CAAA;AAGD,MAAqB,GAAG;IAgBtB,YAAa,SAAiB,EAAE,WAAmB,EAAE,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;QAX3G,SAAI,GAAG,IAAI,CAAA;QAYT,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;QACpC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAE9B,IAAI,CAAC,OAAO,GAAG,eAAK,CAAC,MAAM,CAAC;YAC1B,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,KAAK,EAAE,kBAAkB;SACnC,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,GAAG,eAAK,CAAC,MAAM,CAAC;YAC5B,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,KAAK,EAAE,kBAAkB;SACnC,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CACnC,MAAM,CAAC,EAAE;YACP,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,IAAI;oBACF,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;wBACnC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;qBAC1C;oBACD,+BAA+B;oBAC/B,MAAM,CAAC,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;oBACpC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAA;iBAC5C;gBAAC,OAAO,WAAW,EAAE;oBACpB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;iBACzB;aACF;YACD,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,MAAM,CAAA;YAC/C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAA;YACjD,OAAO,MAAM,CAAA;QACf,CAAC,EACD,KAAK,CAAC,EAAE,CAAC,KAAK,CACf,CAAA;QACD,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CACpC,QAAQ,CAAC,EAAE;YACT,kDAAkD;YAClD,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;YAE5D,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,EAAE,MAAK,MAAM,EAAE;gBAC7C,iBAAiB;gBACjB,IAAI;oBACF,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,cAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAA;iBACzE;gBAAC,OAAO,UAAU,EAAE;oBACnB,QAAQ,CAAC,IAAI,GAAG,cAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;iBAC7D;aACF;YAED,OAAO,QAAQ,CAAA;QACjB,CAAC,EACD,KAAK,CAAC,EAAE;YACN,iDAAiD;YACjD,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;YAElE,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,EAAE,MAAK,MAAM,EAAE;gBAC7C,mBAAmB;gBACnB,IAAI;oBACF,KAAK,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,cAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAA;iBACrF;gBAAC,OAAO,UAAU,EAAE;oBACnB,KAAK,CAAC,QAAQ,CAAC,IAAI,GAAG,cAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;iBACzE;aACF;YAED,OAAO,KAAK,CAAA;QACd,CAAC,CACF,CAAA;QACD,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CACrC,MAAM,CAAC,EAAE;YACP,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,MAAM,CAAA;YAC/C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAA;YACjD,OAAO,MAAM,CAAA;QACf,CAAC,EACD,KAAK,CAAC,EAAE,CAAC,KAAK,CACf,CAAA;QAED,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QACrC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;QAEvC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAA;QACzB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAA;QACvE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAA;IAC3E,CAAC;IAED,MAAM,CAAE,SAAiB,EAAE,WAAmB;QAC5C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,GAAG,SAAS,CAAA;QACzC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAA;IAC/C,CAAC;IAED,aAAa,CAAE,EAAU;QACvB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,GAAG,EAAE,CAAA;QAClC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,GAAG,EAAE,CAAA;IACtC,CAAC;IAED,qBAAqB,CAAE,QAA+C;QACpE,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAA;IACpC,CAAC;IAED,oBAAoB,CAAE,QAAwC;QAC5D,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAA;IACnC,CAAC;IAED,6BAA6B,CAAE,QAAoB;QACjD,IAAI,CAAC,0BAA0B,GAAG,QAAQ,CAAA;IAC5C,CAAC;IAED,QAAQ,CAAE,KAAa,EAAE,OAAe;QACtC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAA;QACtE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAA;IAC1E,CAAC;IAED,aAAa,CAAE,UAAkB;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,WAAW,CAAE,MAAc;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,QAAQ,CAAE,KAAiB;;QACzB,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,KAAI,IAAI,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,KAAI,IAAI,EAAE;YAClE,OAAO,CAAC,KAAK,CAAC;gBACZ,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE;oBACP,MAAM,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM;oBAC5B,GAAG,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,GAAG;oBACtB,IAAI,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,IAAI;oBACxB,MAAM,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM;iBAC7B;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;oBACzB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;iBAC9B;aACF,CAAC,CAAA;SACH;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SACrB;IACH,CAAC;IAEK,QAAQ,CAAE,OAAe;;YAC7B,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,KAAK,EAAE,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;aACtC;YAED,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,uCAAuC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;YACjG,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAA;QAChC,CAAC;KAAA;IAEK,aAAa,CAAE,QAAgB;;YACnC,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;aACtC;YAED,IAAI,QAAQ,CAAC,KAAK,CAAC,6BAA6B,CAAC,IAAI,IAAI,EAAE;gBACzD,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;aACjC;YAED,MAAM,QAAQ,GAAa,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE;gBAC9E,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;aACF,CAAC,CAAA;YACF,MAAM,IAAI,GAAoB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACnD,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,IAAI,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,MAAK,EAAE,EAAE;gBAC7C,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;aAC7B;YAED,OAAO,IAAI,CAAC,KAAK,CAAA;QACnB,CAAC;KAAA;IAEK,cAAc,CAAE,OAAe,EAAE,KAAK,GAAG,KAAK;;YAClD,MAAM,QAAQ,GAAG,YAAY,OAAO,EAAE,CAAA;YACtC,MAAM,MAAM,GAAsB,EAAE,CAAA;YACpC,IAAI,KAAK,EAAE;gBACT,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;aACrB;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;gBAChD,MAAM;aACP,CAAC,CAAA;YAEF,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAA;YAC9B,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAA;YAC7C,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAEK,cAAc,CAAE,MAAkC;;;YACtD,MAAM,QAAQ,GAAG,UAAU,CAAA;YAC3B,MAAM,EACJ,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,SAAS,EACT,WAAW,EACX,YAAY,EACZ,IAAI,GACL,GAAG,MAAM,CAAA;YAEV,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACjD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC7B,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC;wBAClC,OAAO,EAAE,EAAE;wBACX,UAAU,EAAE,KAAK;wBACjB,YAAY,EAAE,YAAY;wBAC1B,QAAQ,EAAE,QAAQ;wBAClB,iBAAiB,EAAE,KAAK;wBACxB,SAAS,EAAE,KAAK;wBAChB,IAAI,EAAE,IAAI;qBACX,CAAC,CAAA;oBACF,QAAQ,CAAC,MAAM,GAAG,WAAW,CAAA;oBAC7B,OAAO,QAAQ,CAAA;gBACjB,CAAC,CAAC;gBACF,YAAY;gBACZ,QAAQ,EAAE,YAAY,KAAK,eAAe,IAAI,QAAQ,IAAI,IAAI;oBAC5D,CAAC,iCACI,QAAQ,KACX,cAAc,EAAE,MAAA,QAAQ,CAAC,QAAQ,mCAAI,CAAC,IAExC,CAAC,CAAC,IAAI;gBACR,QAAQ;gBACR,SAAS,EAAE,YAAY,KAAK,OAAO;oBACjC,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,IAAI;gBACR,SAAS;gBACT,WAAW,EAAE,WAAW;gBACxB,QAAQ,EAAE,YAAY;aACvB,CAAC,CAAA;YAEF,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAA;YAC9B,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAA;YAC7C,OAAO,QAAQ,CAAA;;KAChB;CACF;AA5PD,sBA4PC"}
|
|
@@ -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":"index.d.ts","sourceRoot":"","sources":["../../../src/api/Client/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,QAAQ,CAAA;AACxB,OAAO,OAAO,MAAM,QAAQ,CAAA;AAC5B,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,OAAO,MAAM,QAAQ,CAAA;AAC5B,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,QAAQ,MAAM,SAAS,CAAA;AAC9B,OAAO,YAAY,MAAM,aAAa,CAAA;AACtC,OAAO,SAAS,MAAM,UAAU,CAAA;AAChC,OAAO,MAAM,MAAM,OAAO,CAAA;AAC1B,OAAO,WAAW,MAAM,YAAY,CAAA;AAEpC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,GAAG;IAChD,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,WAAW,CAAA;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,WAAW,CAAA;IACrB,KAAK,EAAE,QAAQ,CAAA;IACf,SAAS,EAAE,YAAY,CAAA;IACvB,MAAM,EAAE,SAAS,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,WAAW,CAAA;gBAER,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/api/Client/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,QAAQ,CAAA;AACxB,OAAO,OAAO,MAAM,QAAQ,CAAA;AAC5B,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,OAAO,MAAM,QAAQ,CAAA;AAC5B,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,QAAQ,MAAM,SAAS,CAAA;AAC9B,OAAO,YAAY,MAAM,aAAa,CAAA;AACtC,OAAO,SAAS,MAAM,UAAU,CAAA;AAChC,OAAO,MAAM,MAAM,OAAO,CAAA;AAC1B,OAAO,WAAW,MAAM,YAAY,CAAA;AAEpC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,GAAG;IAChD,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,WAAW,CAAA;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,WAAW,CAAA;IACrB,KAAK,EAAE,QAAQ,CAAA;IACf,SAAS,EAAE,YAAY,CAAA;IACvB,MAAM,EAAE,SAAS,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,WAAW,CAAA;gBAER,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO;;;;KAA+C;CAY5G"}
|
package/dist/api/Client/index.js
CHANGED
|
@@ -14,7 +14,7 @@ const Device_1 = __importDefault(require("./Device"));
|
|
|
14
14
|
const CRM_1 = __importDefault(require("./CRM"));
|
|
15
15
|
const Timeslot_1 = __importDefault(require("./Timeslot"));
|
|
16
16
|
class OrderappClientApi extends Api_1.default {
|
|
17
|
-
constructor(baseUrlGo, baseUrlNode, configs = { locale: 'zh', appVersion: '' }) {
|
|
17
|
+
constructor(baseUrlGo, baseUrlNode, configs = { locale: 'zh', appVersion: '', gzip: true }) {
|
|
18
18
|
super(baseUrlGo, baseUrlNode, configs);
|
|
19
19
|
this.auth = new Auth_1.default(this);
|
|
20
20
|
this.category = new Category_1.default(this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/Client/index.ts"],"names":[],"mappings":";;;;;AAAA,iDAAwB;AACxB,kDAA4B;AAC5B,0DAAoC;AACpC,kDAA4B;AAC5B,0DAAoC;AACpC,oDAA8B;AAC9B,4DAAsC;AACtC,sDAAgC;AAChC,gDAA0B;AAC1B,0DAAoC;AAEpC,MAAqB,iBAAkB,SAAQ,aAAG;IAWhD,YAAa,SAAiB,EAAE,WAAmB,EAAE,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/Client/index.ts"],"names":[],"mappings":";;;;;AAAA,iDAAwB;AACxB,kDAA4B;AAC5B,0DAAoC;AACpC,kDAA4B;AAC5B,0DAAoC;AACpC,oDAA8B;AAC9B,4DAAsC;AACtC,sDAAgC;AAChC,gDAA0B;AAC1B,0DAAoC;AAEpC,MAAqB,iBAAkB,SAAQ,aAAG;IAWhD,YAAa,SAAiB,EAAE,WAAmB,EAAE,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;QACzG,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,cAAO,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,IAAI,CAAC,CAAA;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,cAAO,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,IAAI,CAAC,CAAA;QACrC,IAAI,CAAC,KAAK,GAAG,IAAI,eAAQ,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,mBAAY,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAS,CAAC,IAAI,CAAC,CAAA;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,aAAM,CAAC,IAAI,CAAC,CAAA;QAC3B,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;CACF;AAvBD,oCAuBC"}
|
|
@@ -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":"index.d.ts","sourceRoot":"","sources":["../../../src/api/Merchant/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,QAAQ,CAAA;AACxB,OAAO,OAAO,MAAM,QAAQ,CAAA;AAC5B,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,OAAO,MAAM,QAAQ,CAAA;AAC5B,OAAO,SAAS,MAAM,UAAU,CAAA;AAChC,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,kBAAkB,MAAM,mBAAmB,CAAA;AAClD,OAAO,QAAQ,MAAM,SAAS,CAAA;AAC9B,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,aAAa,MAAM,cAAc,CAAA;AACxC,OAAO,eAAe,MAAM,gBAAgB,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,GAAG;IAClD,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,WAAW,CAAA;IACrB,MAAM,EAAE,SAAS,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,WAAW,CAAA;IACrB,eAAe,EAAE,kBAAkB,CAAA;IACnC,KAAK,EAAE,QAAQ,CAAA;IACf,QAAQ,EAAE,WAAW,CAAA;IACrB,UAAU,EAAE,aAAa,CAAA;IACzB,YAAY,EAAE,eAAe,CAAA;gBAEhB,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/api/Merchant/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,QAAQ,CAAA;AACxB,OAAO,OAAO,MAAM,QAAQ,CAAA;AAC5B,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,OAAO,MAAM,QAAQ,CAAA;AAC5B,OAAO,SAAS,MAAM,UAAU,CAAA;AAChC,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,kBAAkB,MAAM,mBAAmB,CAAA;AAClD,OAAO,QAAQ,MAAM,SAAS,CAAA;AAC9B,OAAO,WAAW,MAAM,YAAY,CAAA;AACpC,OAAO,aAAa,MAAM,cAAc,CAAA;AACxC,OAAO,eAAe,MAAM,gBAAgB,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,GAAG;IAClD,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,WAAW,CAAA;IACrB,MAAM,EAAE,SAAS,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,WAAW,CAAA;IACrB,eAAe,EAAE,kBAAkB,CAAA;IACnC,KAAK,EAAE,QAAQ,CAAA;IACf,QAAQ,EAAE,WAAW,CAAA;IACrB,UAAU,EAAE,aAAa,CAAA;IACzB,YAAY,EAAE,eAAe,CAAA;gBAEhB,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO;;;;KAA+C;CAa5G"}
|
|
@@ -15,7 +15,7 @@ const Modifier_1 = __importDefault(require("./Modifier"));
|
|
|
15
15
|
const Department_1 = __importDefault(require("./Department"));
|
|
16
16
|
const CustomReason_1 = __importDefault(require("./CustomReason"));
|
|
17
17
|
class OrderappMerchantApi extends Api_1.default {
|
|
18
|
-
constructor(baseUrlGo, baseUrlNode, configs = { locale: 'zh', appVersion: '' }) {
|
|
18
|
+
constructor(baseUrlGo, baseUrlNode, configs = { locale: 'zh', appVersion: '', gzip: true }) {
|
|
19
19
|
super(baseUrlGo, baseUrlNode, configs);
|
|
20
20
|
this.auth = new Auth_1.default(this);
|
|
21
21
|
this.category = new Category_1.default(this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/Merchant/index.ts"],"names":[],"mappings":";;;;;AAAA,iDAAwB;AACxB,kDAA4B;AAC5B,0DAAoC;AACpC,kDAA4B;AAC5B,sDAAgC;AAChC,0DAAoC;AACpC,wEAAkD;AAClD,oDAA8B;AAC9B,0DAAoC;AACpC,8DAAwC;AACxC,kEAA4C;AAE5C,MAAqB,mBAAoB,SAAQ,aAAG;IAYlD,YAAa,SAAiB,EAAE,WAAmB,EAAE,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/Merchant/index.ts"],"names":[],"mappings":";;;;;AAAA,iDAAwB;AACxB,kDAA4B;AAC5B,0DAAoC;AACpC,kDAA4B;AAC5B,sDAAgC;AAChC,0DAAoC;AACpC,wEAAkD;AAClD,oDAA8B;AAC9B,0DAAoC;AACpC,8DAAwC;AACxC,kEAA4C;AAE5C,MAAqB,mBAAoB,SAAQ,aAAG;IAYlD,YAAa,SAAiB,EAAE,WAAmB,EAAE,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;QACzG,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,cAAO,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,IAAI,CAAC,CAAA;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,cAAO,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,IAAI,CAAC,CAAA;QACrC,IAAI,CAAC,eAAe,GAAG,IAAI,yBAAkB,CAAC,IAAI,CAAC,CAAA;QACnD,IAAI,CAAC,KAAK,GAAG,IAAI,eAAQ,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,IAAI,CAAC,CAAA;QACrC,IAAI,CAAC,UAAU,GAAG,IAAI,oBAAa,CAAC,IAAI,CAAC,CAAA;QACzC,IAAI,CAAC,YAAY,GAAG,IAAI,sBAAe,CAAC,IAAI,CAAC,CAAA;QAC7C,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAS,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;CACF;AAzBD,sCAyBC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -51,6 +51,7 @@ export declare const types: {
|
|
|
51
51
|
apiOrder: import("./types/ApiOrder").default;
|
|
52
52
|
customReason: import("./types/CustomReason").default;
|
|
53
53
|
device: import("./types/Device").default;
|
|
54
|
+
landing: import("./types/Landing").default;
|
|
54
55
|
};
|
|
55
56
|
declare const _default: {
|
|
56
57
|
api: {
|
|
@@ -106,6 +107,7 @@ declare const _default: {
|
|
|
106
107
|
apiOrder: import("./types/ApiOrder").default;
|
|
107
108
|
customReason: import("./types/CustomReason").default;
|
|
108
109
|
device: import("./types/Device").default;
|
|
110
|
+
landing: import("./types/Landing").default;
|
|
109
111
|
};
|
|
110
112
|
};
|
|
111
113
|
export default _default;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,GAAG;;;CAAO,CAAA;AACvB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAQ,CAAA;AACzB,eAAO,MAAM,KAAK
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,GAAG;;;CAAO,CAAA;AACvB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAQ,CAAA;AACzB,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;CAAS,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE3B,wBAIC"}
|
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"}
|
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
import { IPromoCode } from './PromoCode';
|
|
2
|
+
import { TDeliveryType } from './Order';
|
|
3
|
+
import { ILatLng } from './Merchant';
|
|
4
|
+
export default class Landing {
|
|
5
|
+
device: undefined;
|
|
6
|
+
}
|
|
7
|
+
export declare type TLandingAction = 'MERCHANT' | 'CATEGORY' | 'SEARCH' | 'CUISINE' | 'LINK';
|
|
8
|
+
export interface ILandingState {
|
|
9
|
+
isInit: boolean;
|
|
10
|
+
banners: ILandingBanner[];
|
|
11
|
+
restaurant: ILandingRestaurant;
|
|
12
|
+
merchantPromocodes: IAppMerchantPromocode[];
|
|
13
|
+
filter: {};
|
|
14
|
+
searchText: string;
|
|
15
|
+
fetchRestaurantsParams: {
|
|
16
|
+
merchantId?: string;
|
|
17
|
+
deliveryType?: TDeliveryType;
|
|
18
|
+
latlng?: ILatLng;
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
export interface ILandingBanner {
|
|
22
|
+
type: 'IMAGE' | 'VIDEO';
|
|
23
|
+
bannerUrl: string;
|
|
24
|
+
action: TLandingAction;
|
|
25
|
+
payload: string;
|
|
26
|
+
}
|
|
27
|
+
export interface ILandingCuisine {
|
|
28
|
+
name: string;
|
|
29
|
+
imageUrl: string;
|
|
30
|
+
bannerUrl: string;
|
|
31
|
+
action: 'CUISINE';
|
|
32
|
+
payload: string;
|
|
33
|
+
total: number;
|
|
34
|
+
}
|
|
35
|
+
export interface ILandingCategory {
|
|
36
|
+
name: string;
|
|
37
|
+
storeDelivery: boolean;
|
|
38
|
+
takeaway: boolean;
|
|
39
|
+
table: boolean;
|
|
40
|
+
bannerUrl: string;
|
|
41
|
+
links: {
|
|
42
|
+
tnc: string;
|
|
43
|
+
};
|
|
44
|
+
total: number;
|
|
45
|
+
restaurants: ILandingRestaurant[];
|
|
46
|
+
}
|
|
47
|
+
export interface ILandingTrendingTag {
|
|
48
|
+
action: TLandingAction;
|
|
49
|
+
name: string;
|
|
50
|
+
payload: string;
|
|
51
|
+
}
|
|
52
|
+
export interface ILandingFilter {
|
|
53
|
+
action: TLandingAction;
|
|
54
|
+
title: string;
|
|
55
|
+
payload: string;
|
|
56
|
+
}
|
|
57
|
+
export interface ILandingRestaurant {
|
|
58
|
+
id: string;
|
|
59
|
+
name: string;
|
|
60
|
+
cover: string;
|
|
61
|
+
coverImage: string;
|
|
62
|
+
deliveryDisabled: boolean;
|
|
63
|
+
deliveryPrice: IDeliveryPrice;
|
|
64
|
+
deliveryTime: number;
|
|
65
|
+
disabled: boolean;
|
|
66
|
+
distance: number;
|
|
67
|
+
featuredTags: string;
|
|
68
|
+
image: string;
|
|
69
|
+
link: string;
|
|
70
|
+
location: [number, number];
|
|
71
|
+
logoImage: string;
|
|
72
|
+
mapLink: string;
|
|
73
|
+
nextStartOpening?: INextStartOpening;
|
|
74
|
+
open?: boolean;
|
|
75
|
+
openResult?: IOpenResult;
|
|
76
|
+
pickerRange: IPickerRange;
|
|
77
|
+
region: string;
|
|
78
|
+
ricecoinBonusRatio: number;
|
|
79
|
+
setting: {
|
|
80
|
+
storedelivery?: boolean;
|
|
81
|
+
takeaway?: boolean;
|
|
82
|
+
table?: boolean;
|
|
83
|
+
};
|
|
84
|
+
shippings: IShippings[];
|
|
85
|
+
tags: string[];
|
|
86
|
+
takeawaydisabled: boolean;
|
|
87
|
+
}
|
|
88
|
+
export interface IDeliveryPrice {
|
|
89
|
+
normal?: number;
|
|
90
|
+
poonchoi?: number;
|
|
91
|
+
}
|
|
92
|
+
export interface INextStartOpening {
|
|
93
|
+
start: string;
|
|
94
|
+
startMin: string;
|
|
95
|
+
weekday: number;
|
|
96
|
+
displayDate: string;
|
|
97
|
+
displayWeekday: string;
|
|
98
|
+
}
|
|
99
|
+
export interface IOpenResult {
|
|
100
|
+
/** @deprecated rename to result */
|
|
101
|
+
rt?: boolean;
|
|
102
|
+
/** @deprecated rename to result */
|
|
103
|
+
data?: boolean;
|
|
104
|
+
/** @deprecated rename to message */
|
|
105
|
+
msg?: string;
|
|
106
|
+
result?: boolean;
|
|
107
|
+
message?: string;
|
|
108
|
+
fields?: {
|
|
109
|
+
[fieldName: string]: any;
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
export interface IShippings {
|
|
113
|
+
type: TDeliveryType;
|
|
114
|
+
enable: boolean;
|
|
115
|
+
}
|
|
116
|
+
export interface IPickerRange {
|
|
117
|
+
busyModeDelayMinutes: number;
|
|
118
|
+
minMinutes: number;
|
|
119
|
+
maxMinutes: number;
|
|
120
|
+
minPreorderDays: number;
|
|
121
|
+
maxPreorderDays: number;
|
|
122
|
+
timeslotDurationMinutes: number;
|
|
123
|
+
/** @deprecated rename to busyModeDelayMinutes */
|
|
124
|
+
delay?: number;
|
|
125
|
+
/** @deprecated rename to minMinutes */
|
|
126
|
+
min?: number;
|
|
127
|
+
/** @deprecated rename to maxMinutes */
|
|
128
|
+
max?: number;
|
|
129
|
+
/** @deprecated rename to maxPreorderDays */
|
|
130
|
+
maxMinute?: number;
|
|
131
|
+
/** @deprecated rename to timeslotDurationMinutes */
|
|
132
|
+
duration?: number;
|
|
133
|
+
/** @deprecated rename to minPreorderDays */
|
|
134
|
+
preOrderDay?: number;
|
|
135
|
+
}
|
|
136
|
+
export interface ISplashAd {
|
|
137
|
+
type: 'IMAGE' | 'VIDEO';
|
|
138
|
+
splashUrl: string;
|
|
139
|
+
action: 'MERCHANT' | 'CATEGORY' | 'SEARCH';
|
|
140
|
+
payload: string;
|
|
141
|
+
}
|
|
142
|
+
export interface IAppPromoCode extends IPromoCode {
|
|
143
|
+
deliveryType: TDeliveryType;
|
|
144
|
+
}
|
|
145
|
+
export interface IApiMerchantPromocode {
|
|
146
|
+
id: string;
|
|
147
|
+
takeawayBannerText: string;
|
|
148
|
+
storeDeliveryBannerText: string;
|
|
149
|
+
tableBannerText: string;
|
|
150
|
+
takeawayPromocode: string;
|
|
151
|
+
storeDeliveryPromocode: string;
|
|
152
|
+
tablePromocode: string;
|
|
153
|
+
}
|
|
154
|
+
export interface IAppMerchantPromocode {
|
|
155
|
+
id: string;
|
|
156
|
+
bannerText: {
|
|
157
|
+
takeaway: string;
|
|
158
|
+
storeDelivery: string;
|
|
159
|
+
table: string;
|
|
160
|
+
};
|
|
161
|
+
promoCodes: {
|
|
162
|
+
takeaway: IAppPromoCode[];
|
|
163
|
+
storeDelivery: IAppPromoCode[];
|
|
164
|
+
table: IAppPromoCode[];
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
//# sourceMappingURL=Landing.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Landing.d.ts","sourceRoot":"","sources":["../../src/types/Landing.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Landing.js","sourceRoot":"","sources":["../../src/types/Landing.ts"],"names":[],"mappings":";;AAIA,MAAqB,OAAO;CAE3B;AAFD,0BAEC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TDeliveryType } from './Order';
|
|
1
2
|
export default class AppOrder {
|
|
2
3
|
order: undefined;
|
|
3
4
|
}
|
|
@@ -32,7 +33,7 @@ export interface IPromoCode {
|
|
|
32
33
|
offeredBy: 'DimOrder' | 'Merchant';
|
|
33
34
|
creator: string;
|
|
34
35
|
tags: string[];
|
|
35
|
-
deliveryType:
|
|
36
|
+
deliveryType: TDeliveryType;
|
|
36
37
|
action: IMarketingAction;
|
|
37
38
|
name: {
|
|
38
39
|
zh: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PromoCode.d.ts","sourceRoot":"","sources":["../../src/types/PromoCode.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,KAAK,EAAE,SAAS,CAAA;CACjB;AAED,oBAAY,oBAAoB,GAAG,CACjC,UAAU,GACV,UAAU,GACV,SAAS,GACT,QAAQ,GACR,MAAM,GACN,EAAE,CACH,CAAA;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,GAAG,QAAQ,CAAA;IAC5B,OAAO,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,CAAA;IACvC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,kBAAkB,EAAE,OAAO,CAAA;IAC3B,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,CAAC,EAAE;QAAE,CAAE,YAAY,EAAE,MAAM,GAAI,UAAU,EAAE,CAAA;KAAE,CAAA;IAChE,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE;QAAE,CAAE,YAAY,EAAE,MAAM,GAAI,UAAU,EAAE,CAAA;KAAE,CAAA;IACrD,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,UAAU,GAAG,UAAU,CAAA;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"PromoCode.d.ts","sourceRoot":"","sources":["../../src/types/PromoCode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PromoCode.js","sourceRoot":"","sources":["../../src/types/PromoCode.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"PromoCode.js","sourceRoot":"","sources":["../../src/types/PromoCode.ts"],"names":[],"mappings":";;AACA,MAAqB,QAAQ;CAE5B;AAFD,2BAEC"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ import Department from './Department';
|
|
|
14
14
|
import ApiOrder from './ApiOrder';
|
|
15
15
|
import CustomReason from './CustomReason';
|
|
16
16
|
import Device from './Device';
|
|
17
|
+
import Landing from './Landing';
|
|
17
18
|
declare const _default: {
|
|
18
19
|
auth: Auth;
|
|
19
20
|
category: Category;
|
|
@@ -31,6 +32,7 @@ declare const _default: {
|
|
|
31
32
|
apiOrder: ApiOrder;
|
|
32
33
|
customReason: CustomReason;
|
|
33
34
|
device: Device;
|
|
35
|
+
landing: Landing;
|
|
34
36
|
};
|
|
35
37
|
export default _default;
|
|
36
38
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,eAAe,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,MAAM,SAAS,CAAA;AAC3B,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,SAAS,MAAM,aAAa,CAAA;AACnC,OAAO,MAAM,MAAM,UAAU,CAAA;AAC7B,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAC3C,OAAO,UAAU,MAAM,cAAc,CAAA;AACrC,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,MAAM,MAAM,UAAU,CAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,eAAe,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,MAAM,SAAS,CAAA;AAC3B,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,SAAS,MAAM,aAAa,CAAA;AACnC,OAAO,MAAM,MAAM,UAAU,CAAA;AAC7B,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAC3C,OAAO,UAAU,MAAM,cAAc,CAAA;AACrC,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,MAAM,MAAM,UAAU,CAAA;AAC7B,OAAO,OAAO,MAAM,WAAW,CAAA;;;;;;;;;;;;;;;;;;;;AAE/B,wBAkBC"}
|
package/dist/types/index.js
CHANGED
|
@@ -19,6 +19,7 @@ const Department_1 = __importDefault(require("./Department"));
|
|
|
19
19
|
const ApiOrder_1 = __importDefault(require("./ApiOrder"));
|
|
20
20
|
const CustomReason_1 = __importDefault(require("./CustomReason"));
|
|
21
21
|
const Device_1 = __importDefault(require("./Device"));
|
|
22
|
+
const Landing_1 = __importDefault(require("./Landing"));
|
|
22
23
|
exports.default = {
|
|
23
24
|
auth: new Auth_1.default(),
|
|
24
25
|
category: new Category_1.default(),
|
|
@@ -36,5 +37,6 @@ exports.default = {
|
|
|
36
37
|
apiOrder: new ApiOrder_1.default(),
|
|
37
38
|
customReason: new CustomReason_1.default(),
|
|
38
39
|
device: new Device_1.default(),
|
|
40
|
+
landing: new Landing_1.default(),
|
|
39
41
|
};
|
|
40
42
|
//# sourceMappingURL=index.js.map
|
package/dist/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,0DAAiC;AACjC,kDAAyB;AACzB,0DAAiC;AACjC,wEAA+C;AAC/C,oDAA2B;AAC3B,0DAAiC;AACjC,wDAA+B;AAC/B,4DAAmC;AACnC,sDAA6B;AAC7B,0DAAiC;AACjC,oEAA2C;AAC3C,8DAAqC;AACrC,0DAAiC;AACjC,kEAAyC;AACzC,sDAA6B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,0DAAiC;AACjC,kDAAyB;AACzB,0DAAiC;AACjC,wEAA+C;AAC/C,oDAA2B;AAC3B,0DAAiC;AACjC,wDAA+B;AAC/B,4DAAmC;AACnC,sDAA6B;AAC7B,0DAAiC;AACjC,oEAA2C;AAC3C,8DAAqC;AACrC,0DAAiC;AACjC,kEAAyC;AACzC,sDAA6B;AAC7B,wDAA+B;AAE/B,kBAAe;IACb,IAAI,EAAE,IAAI,cAAI,EAAE;IAChB,QAAQ,EAAE,IAAI,kBAAQ,EAAE;IACxB,IAAI,EAAE,IAAI,cAAI,EAAE;IAChB,QAAQ,EAAE,IAAI,kBAAQ,EAAE;IACxB,eAAe,EAAE,IAAI,yBAAe,EAAE;IACtC,KAAK,EAAE,IAAI,eAAK,EAAE;IAClB,QAAQ,EAAE,IAAI,kBAAQ,EAAE;IACxB,OAAO,EAAE,IAAI,iBAAO,EAAE;IACtB,SAAS,EAAE,IAAI,mBAAS,EAAE;IAC1B,MAAM,EAAE,IAAI,gBAAM,EAAE;IACpB,QAAQ,EAAE,IAAI,kBAAQ,EAAE;IACxB,aAAa,EAAE,IAAI,uBAAa,EAAE;IAClC,UAAU,EAAE,IAAI,oBAAU,EAAE;IAC5B,QAAQ,EAAE,IAAI,kBAAQ,EAAE;IACxB,YAAY,EAAE,IAAI,sBAAY,EAAE;IAChC,MAAM,EAAE,IAAI,gBAAM,EAAE;IACpB,OAAO,EAAE,IAAI,iBAAO,EAAE;CACvB,CAAA"}
|
package/jest.config.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dimorder-orderapp-lib",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
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",
|