Merge remote-tracking branch 'origin/master' into dafuga-handing-cancelation

Author: dafuga

package.json

@@ -42,8 +42,8 @@
         "@types/node": "^18.7.18",
         "@typescript-eslint/eslint-plugin": "^5.20.0",
         "@typescript-eslint/parser": "^5.20.0",
-        "@wharfkit/mock-data": "^1.0.0",
-        "@wharfkit/session": "next",
+        "@wharfkit/mock-data": "^1.3.0",
+        "@wharfkit/session": "^1.6.0",
         "chai": "^4.3.4",
         "eslint": "^8.13.0",
         "eslint-config-prettier": "^8.1.0",

rollup.config.js

@@ -3,6 +3,7 @@ import dts from 'rollup-plugin-dts'
 import typescript from '@rollup/plugin-typescript'
 
 import pkg from './package.json'
+import json from '@rollup/plugin-json'
 
 const name = pkg.name
 const license = fs.readFileSync('LICENSE').toString('utf-8').trim()
@@ -29,7 +30,7 @@ export default [
             sourcemap: true,
             exports: 'named',
         },
-        plugins: [typescript({target: 'es6'})],
+        plugins: [typescript({target: 'es6'}), json()],
         external,
     },
     {
@@ -40,7 +41,7 @@ export default [
             format: 'esm',
             sourcemap: true,
         },
-        plugins: [typescript({target: 'es2020'})],
+        plugins: [typescript({target: 'es2020'}), json()],
         external,
     },
     {

src/index.ts

@@ -26,6 +26,8 @@ import {PrivateKey, PublicKey, UInt64} from '@wharfkit/antelope'
 import {sealMessage} from '@wharfkit/sealed-messages'
 import WebSocket from 'isomorphic-ws'
 
+import defaultTranslations from './translations'
+
 interface WebAuthenticatorOptions {
     /** The URL of the web authenticator service */
     webAuthenticatorUrl?: string
@@ -79,6 +81,11 @@ export class WalletPluginWebAuthenticator extends AbstractWalletPlugin implement
         return 'web-authenticator'
     }
 
+    /**
+     * The translations for this plugin
+     */
+    translations = defaultTranslations
+
     /**
      * Opens a popup window with the given URL and waits for it to complete
      */
@@ -93,17 +100,10 @@ export class WalletPluginWebAuthenticator extends AbstractWalletPlugin implement
             // Show status message using WharfKit UI
             ui?.status('Opening authenticator popup...')
 
-            const popup = window.open(url, 'Web Authenticator', 'width=450,height=750')
+            let popup: Window | null = window.open(url, 'Web Authenticator', 'width=450,height=750')
 
             if (!popup) {
-                this.manualPopupShown = true
-                return this.showManualPopupPrompt(url, receiveOptions, ui)
-                    .then((response) => {
-                        resolve(response)
-                    })
-                    .catch((error) => {
-                        reject(error)
-                    })
+                throw new Error('Popup blocked - please enable popups for this site')
             }
 
             // Update status
@@ -113,6 +113,29 @@ export class WalletPluginWebAuthenticator extends AbstractWalletPlugin implement
                 elements: [],
             })
 
+            const checkClosed = setInterval(() => {
+                if (popup?.closed) {
+                    clearInterval(checkClosed)
+                    ui?.status('Transaction cancelled')
+                    reject(new Error('Transaction cancelled by user'))
+                }
+            }, 1000)
+
+            waitForCallback(receiveOptions, this.buoyWs, t)
+                .then((response) => {
+                    resolve({payload: response})
+                })
+                .catch((error) => {
+                    reject(error)
+                })
+
+            // Update status
+            ui?.prompt({
+                title: 'Approve',
+                body: 'Please approve the transaction in the popup that just opened',
+                elements: [],
+            })
+
             const checkClosedInterval = setInterval(() => {
                 if (popup?.closed) {
                     clearInterval(checkClosedInterval)
@@ -275,7 +298,7 @@ export class WalletPluginWebAuthenticator extends AbstractWalletPlugin implement
 
             const signUrl = `${this.webAuthenticatorUrl}/sign?sealed=${sealedRequest.toString(
                 'hex'
-            )}&nonce=${nonce.toString()}&chain=${context.chain?.name}&accountName=${
+            )}&nonce=${nonce.toString()}&chain=${context.chain?.id}&accountName=${
                 context.accountName
             }&permissionName=${context.permissionName}&appName=${
                 context.appName

src/translations/en.json

@@ -0,0 +1,8 @@
+{
+    "error": {
+        "expired": "The request expired, please try again.",
+        "invalid_response": "Invalid response from wallet, must contain link_ch, link_key, link_name and cid flags.",
+        "not_completed": "The request was not completed.",
+        "cancelled": "The request was cancelled."
+    }
+}

src/translations/index.ts

@@ -0,0 +1,11 @@
+import en from './en.json'
+import ko from './ko.json'
+import zh_hans from './zh-hans.json'
+import zh_hant from './zh-hant.json'
+
+export default {
+    en,
+    ko,
+    'zh-Hans': zh_hans,
+    'zh-Hant': zh_hant,
+}

src/translations/ko.json

@@ -0,0 +1 @@
+{}

src/translations/zh-hans.json

@@ -0,0 +1 @@
+{}

src/translations/zh-hant.json

@@ -0,0 +1 @@
+{}

tsconfig.json

@@ -11,7 +11,8 @@
         "noImplicitAny": false,
         "sourceMap": true,
         "strict": true,
-        "target": "es2020"
+        "target": "es2020",
+        "resolveJsonModule": true,
     },
     "include": ["src/**/*"]
 }

yarn.lock

@@ -662,7 +662,7 @@
     "@wharfkit/signing-request" "^3.1.0"
     tslib "^2.1.0"
 
-"@wharfkit/mock-data@^1.0.0":
+"@wharfkit/mock-data@^1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@wharfkit/mock-data/-/mock-data-1.3.0.tgz#7a9caa7c7fb2ad839bc12593de1b7a546b673ae6"
   integrity sha512-LkhAkrUOvG6o+lPWb2Q6JCrs9++F2XowGK42PODh35Xu9an5H+THMGjpUhTC1sPiYkfjhkmBbAzMpZbHjkXj4w==
@@ -721,10 +721,10 @@
     pako "^2.0.4"
     tslib "^2.1.0"
 
-"@wharfkit/session@next":
-  version "1.6.0-rc1"
-  resolved "https://registry.yarnpkg.com/@wharfkit/session/-/session-1.6.0-rc1.tgz#092e653c10e0cec91238e6c549baa13fbe17ede0"
-  integrity sha512-PkXkm/Xd//sv6C0KfSEgve4zzaF/0hEcOKdDSC98wnylmtDYZjPenjQJE5g1I2b3Irteww9DACPcsSg1iqTYTg==
+"@wharfkit/session@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@wharfkit/session/-/session-1.6.0.tgz#8863feb83fc71f55e49a0729aceabf1c688e216a"
+  integrity sha512-yrCDcW42Dqd387usVHa3qjnttc65OzHK3REKovzo6wLpQsPn709xzx4J6B9e9Xjb0WC/GQLghtr9EX+T+rRH6w==
   dependencies:
     "@wharfkit/abicache" "^1.2.1"
     "@wharfkit/antelope" "^1.0.11"