zetrix-connect-wallet-sdk-test 1.0.1 → 1.0.3

package/lib/index.js

@@ -209,35 +209,84 @@ class ZetrixWalletConnect {
             return this.zetrixWebView.authAndSignMessage(param)
         } else {
             return new Promise((resolve, reject) => {
-                this.auth().then(authRes => {
+                let obj = {
+                    linkTo: 'H5_' + sdkType.bindAndSignMessage,
+                    type: 'H5_' + sdkType.bindAndSignMessage,
+                    host: getWindowUrl(),
+                    icon: getWindowICO(),
+                    sessionId: createSessionId(),
+                    source: isMobile() ? typeInfo.mobileSource : '',
+                    message: param.message
+                }                
+
+                this.walletSocket.h5Bind({
+                    type: obj.type,
+                    sessionId: obj.sessionId,
+                    source: obj.source
+                }).then(res => {
+                    closeQr()
+                    if (res.code === 0) {
+                        setAuthData(res.sessionId, res.data.address)
+                    } else {
+                        reject({
+                            code: res.code,
+                            message: res.message
+                        })
+                    }
+                    
                     this.signMessage(param).then(signRes => {
                         resolve({
                             code: 0,
                             data: {
+                                sessionId: res.sessionId,
                                 address: signRes.data.address,
                                 publicKey: signRes.data.publicKey,
                                 signData: signRes.data.signData
                             }
                         })
                     }).catch(signError => {
-                        reject(signError)
+                        reject({
+                            code: signError.code,
+                            message: signError.message
+                        })
+                    })
+                }).catch(error => {
+                    closeQr()
+                    reject({
+                        code: errorCode,
+                        message: systemErrorInfo.abnormalOperation
                     })
-                }).catch(authError => {
-                    reject(authError)
                 })
 
-                let urlObj = {
-                    linkTo: 'H5_' + sdkType.bindAndSignMessage,
-                    type: 'H5_' + sdkType.bindAndSignMessage,
-                    sessionId: getSessionId(),
-                    host: getWindowUrl(),
-                    icon: getWindowICO(),
-                    message: param.message
+                if (this.isQrcode) {
+                    this.authQr(obj).then(res => {
+                        resolve(res)
+                    })
+                } else {
+                    this.linkTo.createHostParam(obj)
                 }
+            })
+        }
 
-                if (!this.isQrcode) {
-                    this.linkTo.createHostParam(urlObj)
-                }
+//////////////////////////////////////////////////////////////////////////////////
+            return new Promise((resolve, reject) => {
+                this.auth().then(authRes => {
+                    let urlObj = {
+                                   linkTo: 'H5_' + sdkType.bindAndSignMessage,
+             type: 'H5_' + sdkType.bindAndSignMessage,
+                        sessionId: createSessionId(),
+                        host: getWindowUrl(),
+                        icon: getWindowICO(),
+                        message: param.message
+                    }
+    
+                    if (!this.isQrcode) {
+                        this.linkTo.createHostParam(urlObj)
+                    }
+
+                }).catch(authError => {
+                    reject(authError)
+                })
             })
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zetrix-connect-wallet-sdk-test",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A library for mobile wallet and non-Chrome browsers to connect with the Zetrix blockchain.",
   "main": "lib/index.js",
   "scripts": {