zmp-sdk 2.19.0-rc.4 → 2.19.0-rc.7

package/dist/browser.min.js

@@ -2306,7 +2306,7 @@
         ShareSheetType[ShareSheetType["video"] = 12] = "video";
         ShareSheetType[ShareSheetType["link"] = 4] = "link";
         ShareSheetType[ShareSheetType["oa"] = 5] = "oa";
-        ShareSheetType[ShareSheetType["zmp"] = 22] = "zmp";
+        ShareSheetType[ShareSheetType["zmp"] = 20] = "zmp";
     })(ShareSheetType || (ShareSheetType = {}));
     var OrientationType;
     (function (OrientationType) {
@@ -2338,8 +2338,6 @@
         MediaPickerType[MediaPickerType["photo"] = 4] = "photo";
         MediaPickerType[MediaPickerType["video"] = 5] = "video";
         MediaPickerType[MediaPickerType["file"] = 6] = "file";
-        MediaPickerType[MediaPickerType["multi_photo"] = 7] = "multi_photo";
-        MediaPickerType[MediaPickerType["multi_video"] = 8] = "multi_video";
     })(MediaPickerType || (MediaPickerType = {}));
 
     const readCookie = (name) => {
@@ -2431,7 +2429,6 @@
         '4G': isAndroid ? 13 : 2
     });
     const MEDIA_PICKER_LIMIT = 1 * MB;
-    const MEDIA_PICKER_UPLOAD_SERVER = 'https://zapi-server.tungnt.xyz/upload/photos';
     const ACTION = {
         GET_DOWNLOADED_STICKER: {
             name: 'action.get.downloaded.sticker',
@@ -2750,7 +2747,7 @@
         },
         PICK_MEDIA: {
             name: 'action.pick.media',
-            version_live: { iOS: 999 }
+            version_live: { iOS: 440 }
         },
         MP_CLOSE_LOADINGVIEW: {
             name: 'action.mp.close.loadingview'
@@ -4236,7 +4233,7 @@
     }
     _ZJSBridgeProvider_bridge = new WeakMap();
 
-    var version = "2.19.0-rc.4";
+    var version = "2.19.0-rc.7";
 
     class Basics {
         /**
@@ -5739,10 +5736,10 @@
          * @category Window
          *
          */
-        static openWebview(object) {
+        static openWebview(url) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.callNative(ACTION.OPEN_INAPP, {
-                    url: object.url
+                    url: url
                 });
             });
         }
@@ -6190,12 +6187,12 @@
          * @category Zalo
          *
          */
-        static openMediaPicker(type, editView, silentRequest, maxSelectItem) {
+        static openMediaPicker(type, serverUpload, maxItemSize, editView, silentRequest, maxSelectItem) {
             return __awaiter(this, void 0, void 0, function* () {
                 const uploadSetting = {
                     type: 0,
-                    url: MEDIA_PICKER_UPLOAD_SERVER,
-                    maxSize: MEDIA_PICKER_LIMIT
+                    url: serverUpload,
+                    maxSize: maxItemSize || MEDIA_PICKER_LIMIT
                 };
                 const defaultEditView = {
                     enable: 1,
@@ -6828,8 +6825,8 @@
             this.vibrate = () => {
                 return Promise.resolve();
             };
-            this.openWebview = (object) => {
-                location.replace(object.url);
+            this.openWebview = (url) => {
+                location.replace(url);
                 return Promise.resolve();
             };
             this.getRouteParams = Routing.getRouteParams;
@@ -6886,7 +6883,7 @@
         removeAllListeners(event) {
             throw new Error('Method not implemented.');
         }
-        openMediaPicker(type, editView, silentRequest, maxSelectItem) {
+        openMediaPicker(type, serverUpload, maxItemSize, editView, silentRequest, maxSelectItem) {
             console.warn('This api only works on zalo app');
             return Promise.resolve({
                 urls: []
@@ -7343,7 +7340,12 @@
         }
         openWebview(object) {
             return __awaiter(this, void 0, void 0, function* () {
-                yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").openWebview(object);
+                const url = new URL(object.url);
+                const typeInapp = url.searchParams.get("typeInapp");
+                if (_.isEmpty(typeInapp)) {
+                    url.searchParams.set("typeInapp", "1");
+                }
+                yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").openWebview(url.href);
             });
         }
         getRouteParams() {
@@ -7454,7 +7456,7 @@
                 editView.aspect_ratio = (_c = object.editView) === null || _c === void 0 ? void 0 : _c.aspectRatio;
                 const silentRequest = object.silentRequest === true ? 1 : 0;
                 const maxSelectItem = object.maxSelectItem;
-                return yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").openMediaPicker(object.type, editView, silentRequest, maxSelectItem);
+                return yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").openMediaPicker(object.type, object.serverUploadUrl, object.maxItemSize, editView, silentRequest, maxSelectItem);
             });
         }
         getShareableLink(object) {
@@ -7814,7 +7816,7 @@
         handleError,
         validate,
         __param(0, checkType('object', {
-            url: checkData('string')
+            url: checkData('url')
         }))
     ], SDKCreator.prototype, "openWebview", null);
     __decorate([
@@ -7858,6 +7860,8 @@
             type: checkData('string', {
                 values: ['photo', 'video', 'file', 'multi_photo', 'multi_video']
             }),
+            'serverUploadUrl': checkData('url'),
+            'maxItemSize?': checkData('number', { min: 0 }),
             'editView?': checkData('object'),
             'editView.enable?': checkData('boolean'),
             'editView.aspectRatio?': checkData('string', { regex: /^\d+:\d+$/ }),
@@ -7946,13 +7950,16 @@
                         throw apiResponse.error.badRequest(resData.msg);
                     }
                     const orderId = resData.data.id;
+                    const jwt = resData.data.jwt;
                     const version = window.APP_VERSION;
                     const env = window.APP_ENV;
                     const params = {
                         miniAppId,
-                        accessToken: accessToken || '',
                         orderId,
                     };
+                    if (jwt) {
+                        params.token = jwt;
+                    }
                     if (version) {
                         params.version = version;
                     }
@@ -8001,13 +8008,24 @@
                         const appTransID = queryString.getParameterByName("appTransID", inputData) || queryString.getParameterByName("apptransid", inputData);
                         id = orderId || appTransID;
                     }
+                    const getConfig = {
+                        headers: {
+                            'authorization': `Bearer `
+                        }
+                    };
+                    const accessToken = yield sdk.getAccessToken({
+                        fail: (error) => {
+                            throw apiResponse.error.loginRequired;
+                        }
+                    });
+                    getConfig.headers.authorization = `Bearer ${accessToken}`;
                     const url = new URL(PAYMENT_APIS.GET_TRANSACTION);
                     const params = {
                         transId: id || "",
                         appId: __classPrivateFieldGet(this, _PaymentService_appId, "f")
                     };
                     url.search = new URLSearchParams(params).toString();
-                    const res = yield fetch(url.toString());
+                    const res = yield fetch(url.toString(), getConfig);
                     const resData = yield res.json();
                     if (!resData.data || resData.err !== 0) {
                         throw apiResponse.error.badRequest(resData.msg);
@@ -8015,11 +8033,11 @@
                     const data = resData.data || {};
                     const transaction = {
                         msg: data.resultMessage,
-                        appId: data.appId,
                         orderId: data.orderId,
                         resultCode: data.resultCode,
                         transTime: data.transTime,
-                        createdAt: data.createAt
+                        createdAt: data.createAt,
+                        transId: data.transId
                     };
                     return transaction;
                 }
@@ -8028,47 +8046,6 @@
                 }
             });
         }
-        /**
-         * Truy vấn tình trạng một đơn hàng
-         * @async
-         * @function getOrderStatus
-         * @category PaymentService
-         * @returns {Promise<CallbackDataType.GetOrderStatusSuccessCallback>}
-         */
-        getOrderStatus(object) {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const { orderId } = object;
-                    const url = new URL(PAYMENT_APIS.GET_ORDER_STATUS);
-                    const params = {
-                        appId: __classPrivateFieldGet(this, _PaymentService_appId, "f")
-                    };
-                    if (object.transId) {
-                        params.transId = object.transId;
-                    }
-                    if (object.orderId) {
-                        params.orderId = object.orderId;
-                    }
-                    url.search = new URLSearchParams(params).toString();
-                    const res = yield fetch(url.toString());
-                    const resData = yield res.json();
-                    if (!resData.data || resData.err !== 0) {
-                        throw apiResponse.error.badRequest(resData.msg);
-                    }
-                    const data = resData.data || {};
-                    const orderStatus = {
-                        returnCode: data.returnCode,
-                        returnMessage: data.returnMessage,
-                        isProcessing: data.isProcessing,
-                        amount: data.amount
-                    };
-                    return orderStatus;
-                }
-                catch (err) {
-                    throw err;
-                }
-            });
-        }
     }
     _PaymentService_appId = new WeakMap();
 
@@ -8091,20 +8068,11 @@
         checkTransaction(sdk, object) {
             const result = {
                 msg: 'Success',
-                appId: __classPrivateFieldGet(this, _MockPaymentService_appId, "f"),
                 orderId: '',
                 resultCode: 1,
                 transTime: new Date().getTime().toString(),
                 createdAt: new Date().getTime().toString(),
-            };
-            return Promise.resolve(result);
-        }
-        getOrderStatus(object) {
-            const result = {
-                returnCode: 3,
-                returnMessage: 'Giao dịch chưa được thực hiện.',
-                isProcessing: false,
-                amount: 10000
+                transId: ''
             };
             return Promise.resolve(result);
         }
@@ -8141,17 +8109,6 @@
         checkTransaction(object) {
             return __classPrivateFieldGet(this, _PaymentCreator_instance, "f").checkTransaction(__classPrivateFieldGet(this, _PaymentCreator_sdk, "f"), object);
         }
-        /**
-        * Khiểm tra trạng thái đơn hàng
-        *
-        * @async
-        * @function getOrderStatus
-        * @category Payment
-        * @returns  {Promise<CallbackDataType.GetOrderStatusSuccessCallback>}
-        */
-        getOrderStatus(object) {
-            return __classPrivateFieldGet(this, _PaymentCreator_instance, "f").getOrderStatus(object);
-        }
     }
     _PaymentCreator_instance = new WeakMap(), _PaymentCreator_sdk = new WeakMap();
     __decorate([
@@ -8167,16 +8124,6 @@
         handleError,
         validate
     ], PaymentCreator.prototype, "checkTransaction", null);
-    __decorate([
-        handleError,
-        validate,
-        __param(0, required(['transId'], { if: { orderId: undefined } })),
-        __param(0, required(['orderId'], { if: { transId: undefined } })),
-        __param(0, checkType('object', {
-            'transId?': checkData('string'),
-            'orderId?': checkData('string'),
-        }))
-    ], PaymentCreator.prototype, "getOrderStatus", null);
     class ZaloMiniAppPaymentCreator extends PaymentCreator {
         getInstance() {
             return PaymentService.getInstance();

package/dist/index.es.js

@@ -2135,7 +2135,7 @@ var ShareSheetType;
     ShareSheetType[ShareSheetType["video"] = 12] = "video";
     ShareSheetType[ShareSheetType["link"] = 4] = "link";
     ShareSheetType[ShareSheetType["oa"] = 5] = "oa";
-    ShareSheetType[ShareSheetType["zmp"] = 22] = "zmp";
+    ShareSheetType[ShareSheetType["zmp"] = 20] = "zmp";
 })(ShareSheetType || (ShareSheetType = {}));
 var OrientationType;
 (function (OrientationType) {
@@ -2167,8 +2167,6 @@ var MediaPickerType;
     MediaPickerType[MediaPickerType["photo"] = 4] = "photo";
     MediaPickerType[MediaPickerType["video"] = 5] = "video";
     MediaPickerType[MediaPickerType["file"] = 6] = "file";
-    MediaPickerType[MediaPickerType["multi_photo"] = 7] = "multi_photo";
-    MediaPickerType[MediaPickerType["multi_video"] = 8] = "multi_video";
 })(MediaPickerType || (MediaPickerType = {}));
 
 const readCookie = (name) => {
@@ -2260,7 +2258,6 @@ const NETWORK_TYPE = (isAndroid) => ({
     '4G': isAndroid ? 13 : 2
 });
 const MEDIA_PICKER_LIMIT = 1 * MB;
-const MEDIA_PICKER_UPLOAD_SERVER = 'https://zapi-server.tungnt.xyz/upload/photos';
 const ACTION = {
     GET_DOWNLOADED_STICKER: {
         name: 'action.get.downloaded.sticker',
@@ -2579,7 +2576,7 @@ const ACTION = {
     },
     PICK_MEDIA: {
         name: 'action.pick.media',
-        version_live: { iOS: 999 }
+        version_live: { iOS: 440 }
     },
     MP_CLOSE_LOADINGVIEW: {
         name: 'action.mp.close.loadingview'
@@ -4061,7 +4058,7 @@ class ZJSBridgeProvider {
 }
 _ZJSBridgeProvider_bridge = new WeakMap();
 
-var version$1 = "2.19.0-rc.4";
+var version$1 = "2.19.0-rc.7";
 
 class Basics {
     /**
@@ -5563,10 +5560,10 @@ class Window {
      * @category Window
      *
      */
-    static openWebview(object) {
+    static openWebview(url) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.callNative(ACTION.OPEN_INAPP, {
-                url: object.url
+                url: url
             });
         });
     }
@@ -6014,12 +6011,12 @@ class Zalo {
      * @category Zalo
      *
      */
-    static openMediaPicker(type, editView, silentRequest, maxSelectItem) {
+    static openMediaPicker(type, serverUpload, maxItemSize, editView, silentRequest, maxSelectItem) {
         return __awaiter(this, void 0, void 0, function* () {
             const uploadSetting = {
                 type: 0,
-                url: MEDIA_PICKER_UPLOAD_SERVER,
-                maxSize: MEDIA_PICKER_LIMIT
+                url: serverUpload,
+                maxSize: maxItemSize || MEDIA_PICKER_LIMIT
             };
             const defaultEditView = {
                 enable: 1,
@@ -6652,8 +6649,8 @@ class MockSDKService {
         this.vibrate = () => {
             return Promise.resolve();
         };
-        this.openWebview = (object) => {
-            location.replace(object.url);
+        this.openWebview = (url) => {
+            location.replace(url);
             return Promise.resolve();
         };
         this.getRouteParams = Routing.getRouteParams;
@@ -6710,7 +6707,7 @@ class MockSDKService {
     removeAllListeners(event) {
         throw new Error('Method not implemented.');
     }
-    openMediaPicker(type, editView, silentRequest, maxSelectItem) {
+    openMediaPicker(type, serverUpload, maxItemSize, editView, silentRequest, maxSelectItem) {
         console.warn('This api only works on zalo app');
         return Promise.resolve({
             urls: []
@@ -8527,7 +8524,12 @@ class SDKCreator {
     }
     openWebview(object) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").openWebview(object);
+            const url = new URL(object.url);
+            const typeInapp = url.searchParams.get("typeInapp");
+            if (_.isEmpty(typeInapp)) {
+                url.searchParams.set("typeInapp", "1");
+            }
+            yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").openWebview(url.href);
         });
     }
     getRouteParams() {
@@ -8638,7 +8640,7 @@ class SDKCreator {
             editView.aspect_ratio = (_c = object.editView) === null || _c === void 0 ? void 0 : _c.aspectRatio;
             const silentRequest = object.silentRequest === true ? 1 : 0;
             const maxSelectItem = object.maxSelectItem;
-            return yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").openMediaPicker(object.type, editView, silentRequest, maxSelectItem);
+            return yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").openMediaPicker(object.type, object.serverUploadUrl, object.maxItemSize, editView, silentRequest, maxSelectItem);
         });
     }
     getShareableLink(object) {
@@ -8998,7 +9000,7 @@ __decorate([
     handleError,
     validate,
     __param(0, checkType('object', {
-        url: checkData('string')
+        url: checkData('url')
     }))
 ], SDKCreator.prototype, "openWebview", null);
 __decorate([
@@ -9042,6 +9044,8 @@ __decorate([
         type: checkData('string', {
             values: ['photo', 'video', 'file', 'multi_photo', 'multi_video']
         }),
+        'serverUploadUrl': checkData('url'),
+        'maxItemSize?': checkData('number', { min: 0 }),
         'editView?': checkData('object'),
         'editView.enable?': checkData('boolean'),
         'editView.aspectRatio?': checkData('string', { regex: /^\d+:\d+$/ }),
@@ -9130,13 +9134,16 @@ class PaymentService {
                     throw apiResponse.error.badRequest(resData.msg);
                 }
                 const orderId = resData.data.id;
+                const jwt = resData.data.jwt;
                 const version = window.APP_VERSION;
                 const env = window.APP_ENV;
                 const params = {
                     miniAppId,
-                    accessToken: accessToken || '',
                     orderId,
                 };
+                if (jwt) {
+                    params.token = jwt;
+                }
                 if (version) {
                     params.version = version;
                 }
@@ -9185,13 +9192,24 @@ class PaymentService {
                     const appTransID = QueryString.getParameterByName("appTransID", inputData) || QueryString.getParameterByName("apptransid", inputData);
                     id = orderId || appTransID;
                 }
+                const getConfig = {
+                    headers: {
+                        'authorization': `Bearer `
+                    }
+                };
+                const accessToken = yield sdk.getAccessToken({
+                    fail: (error) => {
+                        throw apiResponse.error.loginRequired;
+                    }
+                });
+                getConfig.headers.authorization = `Bearer ${accessToken}`;
                 const url = new URL(PAYMENT_APIS.GET_TRANSACTION);
                 const params = {
                     transId: id || "",
                     appId: __classPrivateFieldGet(this, _PaymentService_appId, "f")
                 };
                 url.search = new URLSearchParams(params).toString();
-                const res = yield fetch(url.toString());
+                const res = yield fetch(url.toString(), getConfig);
                 const resData = yield res.json();
                 if (!resData.data || resData.err !== 0) {
                     throw apiResponse.error.badRequest(resData.msg);
@@ -9199,11 +9217,11 @@ class PaymentService {
                 const data = resData.data || {};
                 const transaction = {
                     msg: data.resultMessage,
-                    appId: data.appId,
                     orderId: data.orderId,
                     resultCode: data.resultCode,
                     transTime: data.transTime,
-                    createdAt: data.createAt
+                    createdAt: data.createAt,
+                    transId: data.transId
                 };
                 return transaction;
             }
@@ -9212,47 +9230,6 @@ class PaymentService {
             }
         });
     }
-    /**
-     * Truy vấn tình trạng một đơn hàng
-     * @async
-     * @function getOrderStatus
-     * @category PaymentService
-     * @returns {Promise<CallbackDataType.GetOrderStatusSuccessCallback>}
-     */
-    getOrderStatus(object) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const { orderId } = object;
-                const url = new URL(PAYMENT_APIS.GET_ORDER_STATUS);
-                const params = {
-                    appId: __classPrivateFieldGet(this, _PaymentService_appId, "f")
-                };
-                if (object.transId) {
-                    params.transId = object.transId;
-                }
-                if (object.orderId) {
-                    params.orderId = object.orderId;
-                }
-                url.search = new URLSearchParams(params).toString();
-                const res = yield fetch(url.toString());
-                const resData = yield res.json();
-                if (!resData.data || resData.err !== 0) {
-                    throw apiResponse.error.badRequest(resData.msg);
-                }
-                const data = resData.data || {};
-                const orderStatus = {
-                    returnCode: data.returnCode,
-                    returnMessage: data.returnMessage,
-                    isProcessing: data.isProcessing,
-                    amount: data.amount
-                };
-                return orderStatus;
-            }
-            catch (err) {
-                throw err;
-            }
-        });
-    }
 }
 _PaymentService_appId = new WeakMap();
 
@@ -9275,20 +9252,11 @@ class MockPaymentService {
     checkTransaction(sdk, object) {
         const result = {
             msg: 'Success',
-            appId: __classPrivateFieldGet(this, _MockPaymentService_appId, "f"),
             orderId: '',
             resultCode: 1,
             transTime: new Date().getTime().toString(),
             createdAt: new Date().getTime().toString(),
-        };
-        return Promise.resolve(result);
-    }
-    getOrderStatus(object) {
-        const result = {
-            returnCode: 3,
-            returnMessage: 'Giao dịch chưa được thực hiện.',
-            isProcessing: false,
-            amount: 10000
+            transId: ''
         };
         return Promise.resolve(result);
     }
@@ -9325,17 +9293,6 @@ class PaymentCreator {
     checkTransaction(object) {
         return __classPrivateFieldGet(this, _PaymentCreator_instance, "f").checkTransaction(__classPrivateFieldGet(this, _PaymentCreator_sdk, "f"), object);
     }
-    /**
-    * Khiểm tra trạng thái đơn hàng
-    *
-    * @async
-    * @function getOrderStatus
-    * @category Payment
-    * @returns  {Promise<CallbackDataType.GetOrderStatusSuccessCallback>}
-    */
-    getOrderStatus(object) {
-        return __classPrivateFieldGet(this, _PaymentCreator_instance, "f").getOrderStatus(object);
-    }
 }
 _PaymentCreator_instance = new WeakMap(), _PaymentCreator_sdk = new WeakMap();
 __decorate([
@@ -9351,16 +9308,6 @@ __decorate([
     handleError,
     validate
 ], PaymentCreator.prototype, "checkTransaction", null);
-__decorate([
-    handleError,
-    validate,
-    __param(0, required(['transId'], { if: { orderId: undefined } })),
-    __param(0, required(['orderId'], { if: { transId: undefined } })),
-    __param(0, checkType('object', {
-        'transId?': checkData('string'),
-        'orderId?': checkData('string'),
-    }))
-], PaymentCreator.prototype, "getOrderStatus", null);
 class ZaloMiniAppPaymentCreator extends PaymentCreator {
     getInstance() {
         return PaymentService.getInstance();