${title}
diff --git a/src/client/views/utils/wallet-info.ts b/src/client/views/utils/wallet-info.ts
index db33167c..1d544fb5 100644
--- a/src/client/views/utils/wallet-info.ts
+++ b/src/client/views/utils/wallet-info.ts
@@ -54,7 +54,6 @@ const flowSVG = `
`
-// its bigger resolution image
const imToken = {
imgSmall: `
((resolve, reject) => {
+ return new Promise((resolve, reject) => {
const typeTxt = whiteListType === 'read' ? 'read' : 'read & write'
const permissionTxt = `${origin} is requesting ${typeTxt} access to your ${this.tokenConfig.title} tickets`
- const acceptBtn = 'Accept '
- const denyBtn = 'Deny '
+ const acceptBtn = 'Accept '
+ const denyBtn = 'Deny '
const content = this.tokenConfig.whitelistDialogRenderer
? this.tokenConfig.whitelistDialogRenderer(permissionTxt, acceptBtn, denyBtn)
@@ -358,32 +339,18 @@ export class Outlet {
document.body.insertAdjacentHTML('beforeend', content)
- document.getElementById('tn-access-accept').addEventListener('click', async () => {
- /* if (storageAccessRequired) {
- try {
- await document.requestStorageAccess()
- } catch (e) {
- console.error(e)
- reject(new Error('IFRAME_STORAGE'))
- return
- }
- // Ensure whitelist is loaded from top-level storage context
- // this is not required if already granted or using a browser without the storageAccess API
- accessWhitelist = JSON.parse(localStorage.getItem('tn-whitelist')) ?? {}
- }*/
-
+ document.getElementById('tn-access-accept').addEventListener('click', () => {
if (!accessWhitelist[origin] || whiteListType !== accessWhitelist[origin].type) {
accessWhitelist[origin] = {
type: whiteListType,
}
localStorage.setItem('tn-whitelist', JSON.stringify(accessWhitelist))
}
-
- resolve()
+ resolve('user-accept')
})
document.getElementById('tn-access-deny').addEventListener('click', () => {
- reject('USER_ABORT')
+ resolve('user-abort')
})
this.sendMessageResponse({
@@ -394,18 +361,9 @@ export class Outlet {
})
})
}
+ return 'user-accept'
}
- /* sendCookieCheck(evtid: string){
- this.sendMessageResponse({
- evtid: evtid,
- evt: ResponseActionBase.COOKIE_CHECK,
- data: {
- thirdPartyCookies: localStorage.getItem("cookie-support-check"),
- }
- });
- }*/
-
prepareTokenOutput(filter: any) {
const storageTokens = localStorage.getItem(this.tokenConfig.itemStorageKey)
@@ -419,7 +377,6 @@ export class Outlet {
const decodedTokens = decodeTokens(storageTokens, this.tokenConfig.tokenParser, this.tokenConfig.unsignedTokenDataName, includeSigned)
- // remove duplicates check
return filterTokens(decodedTokens, filter)
}
@@ -431,7 +388,6 @@ export class Outlet {
const redirect = this.getDataFromQuery('redirect') === 'true' ? document.location.href : false
try {
- // check if token issuer
let tokenObj = await rawTokenCheck(unsignedToken, this.tokenConfig)
let authHandler = new AuthHandler(this, evtid, this.tokenConfig, tokenObj, address, wallet, redirect, unsignedToken)
@@ -506,13 +462,14 @@ export class Outlet {
})
}
- public sendErrorResponse(evtid: any, error: string, issuer?: string) {
+ public sendErrorResponse(evtid: any, error: string, issuer?: string, type = 'error') {
if (this.redirectCallbackUrl) {
let url = this.redirectCallbackUrl
const params = new URLSearchParams(url.hash.substring(1))
params.set(URLNS + 'action', ResponseActionBase.ERROR)
- params.set(URLNS + 'issuer', issuer)
+ params.set(URLNS + 'issuer', issuer || this.tokenConfig.collectionID)
+ params.set(URLNS + 'type', type)
params.set(URLNS + 'error', error)
url.hash = '#' + params.toString()
@@ -553,32 +510,24 @@ export class Outlet {
}
public sendMessageResponse(response: ResponseInterfaceBase) {
- // dont send Message if no referrer defined
if (!document.referrer) {
return
}
let target
- // opened by JS
if (window.opener && window.opener !== window) {
target = window.opener
- // iframe
} else if (window.parent !== window) {
target = window.parent
}
- // let pUrl = new URL(document.referrer);
- // origin = pUrl.origin;
-
if (target) {
target.postMessage(response, '*')
}
// TODO: this is probably no longer needed as brave is set to always use redirect mode now
if (!this.isSameOrigin()) {
- // At least Brave iOS browser blocks close(), so user have to see the message and close tab.
- // Message appears when tokens succesully sent with postMessage
let style = `
background: #eee;
padding: 10px;
diff --git a/src/outlet/localOutlet.ts b/src/outlet/localOutlet.ts
index b750b101..56caba48 100644
--- a/src/outlet/localOutlet.ts
+++ b/src/outlet/localOutlet.ts
@@ -9,7 +9,6 @@ export class LocalOutlet {
constructor(config: OutletInterface & OffChainTokenConfig) {
this.tokenConfig = Object.assign(defaultConfig, config)
- // set default tokenReader
if (!this.tokenConfig.tokenParser) {
this.tokenConfig.tokenParser = readSignedTicket
}
@@ -26,7 +25,6 @@ export class LocalOutlet {
}
async authenticate(unsignedToken: any, address: string, wallet: string, redirectMode: false | string = false) {
- // check if token issuer
let tokenObj = await rawTokenCheck(unsignedToken, this.tokenConfig)
let authHandler = new AuthHandler(null, null, this.tokenConfig, tokenObj, address, wallet, redirectMode, unsignedToken)
diff --git a/src/theme/common.scss b/src/theme/common.scss
index e851f3a1..6354eb04 100644
--- a/src/theme/common.scss
+++ b/src/theme/common.scss
@@ -835,6 +835,9 @@ li.issuer-connect-banner-tn .fungible-token-btn {
outline: inherit;
width: 132px;
opacity: 0.8;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
}
.overlay-tn .skeleton-box {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 66b6e7d0..f5b59362 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -15,7 +15,6 @@ export const requiredParams = (item: any, msg: string) => {
if (!item) throw new Error(msg)
}
-// shallow equality comparison
export const compareObjects = (o1: any, o2: any) => {
const keys1 = Object.keys(o1)
const keys2 = Object.keys(o2)
@@ -23,7 +22,6 @@ export const compareObjects = (o1: any, o2: any) => {
return false
}
for (let key of keys1) {
- // compare commitment (array)
if (typeof o2[key] === 'object') {
if (JSON.stringify(o1[key]) !== JSON.stringify(o2[key])) {
return false
diff --git a/src/utils/support/__tests__/getBrowswerData.spec.ts b/src/utils/support/__tests__/getBrowswerData.spec.ts
index 1f3fc162..f5d9bd33 100644
--- a/src/utils/support/__tests__/getBrowswerData.spec.ts
+++ b/src/utils/support/__tests__/getBrowswerData.spec.ts
@@ -1,8 +1,7 @@
import { getBrowserData } from './../getBrowserData'
Object.defineProperty(global.navigator, 'userAgent', {
- value:
- 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.53 Safari/537.36',
+ value: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.53 Safari/537.36',
writable: true,
configurable: true,
})
diff --git a/src/utils/support/getBrowserData.ts b/src/utils/support/getBrowserData.ts
index 363b282d..a0bf08b0 100644
--- a/src/utils/support/getBrowserData.ts
+++ b/src/utils/support/getBrowserData.ts
@@ -69,7 +69,7 @@ export const getBrowserData = () => {
iOS: isIOS,
mac: isMac,
windows: isWindows,
- desktop: navigator.userAgent?.indexOf("Mobi") === -1,
+ desktop: navigator.userAgent?.indexOf('Mobi') === -1,
touchDevice: isTouchDevice,
metaMask: isMetaMask,
anyMetamask: !!windowEthereum.isMetaMask && !isTrust && !windowEthereum.isBraveWallet,
@@ -90,10 +90,7 @@ export const getBrowserData = () => {
}
export function isMacOrIOS() {
- return (
- !!window.safari ||
- /iphone|ipad|ipod|ios/.test(window.navigator.userAgent ? window.navigator.userAgent.toLowerCase() : '')
- )
+ return !!window.safari || /iphone|ipad|ipod|ios/.test(window.navigator.userAgent ? window.navigator.userAgent.toLowerCase() : '')
}
export function isBrave() {
@@ -103,12 +100,7 @@ export function isBrave() {
export function isIosSafari() {
let userAgent = window.navigator.userAgent ? window.navigator.userAgent.toLowerCase() : ''
- return (
- /ip(ad|od|hone)/i.test(userAgent) &&
- /webkit/i.test(userAgent) &&
- !/(crios|fxios|opios|mercury)/i.test(userAgent) &&
- !isBrave()
- )
+ return /ip(ad|od|hone)/i.test(userAgent) && /webkit/i.test(userAgent) && !/(crios|fxios|opios|mercury)/i.test(userAgent) && !isBrave()
}
export function isMacSafari() {
diff --git a/src/wallet/FlowProvider.ts b/src/wallet/FlowProvider.ts
index 985a3d43..313875a0 100644
--- a/src/wallet/FlowProvider.ts
+++ b/src/wallet/FlowProvider.ts
@@ -1,9 +1,5 @@
import * as fcl from '@onflow/fcl/dist/fcl.umd.min'
-// const unsubscribe = fcl.currentUser.subscribe(currentUser => {
-// console.log("The Current User", currentUser)
-// });
-
fcl.config({
'accessNode.api': 'https://rest-mainnet.onflow.org',
'discovery.wallet': 'https://fcl-discovery.onflow.org/authn',
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index 2e81e338..827b735a 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -85,12 +85,9 @@ export class Web3WalletProvider {
if (walletConnect?.wc?._connected) {
walletConnect
.disconnect()
- .then(() => {
- // console.log('WalletConnect session disconnected');
- })
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
+ .then(() => {})
.catch((error) => {
- console.error(error)
- // dirty way to remove session from local storage
localStorage.removeItem('walletconnect')
})
}
@@ -106,12 +103,9 @@ export class Web3WalletProvider {
if (universalWalletConnect.session) {
universalWalletConnect
.disconnect()
- .then(() => {
- // console.log('WalletConnect2 session disconnected');
- })
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
+ .then(() => {})
.catch((error) => {
- console.error(error)
- // dirty way to remove session from local storage
localStorage.removeItem('wc@2:client:0.3//session')
})
}
@@ -125,7 +119,6 @@ export class Web3WalletProvider {
}
localStorage.removeItem(Web3WalletProvider.LOCAL_STORAGE_KEY)
- // remove session storage for the case of flow network
sessionStorage.removeItem('CURRENT_USER')
}
@@ -144,7 +137,6 @@ export class Web3WalletProvider {
try {
await this.connectWith(connection.providerType, true)
} catch (e) {
- console.log("Wallet couldn't connect: " + e.message)
delete state[address]
this.saveConnections()
this.emitSavedConnection(address)
@@ -160,7 +152,6 @@ export class Web3WalletProvider {
// @ts-ignore
let address = await this[walletType as keyof Web3WalletProvider](checkConnectionOnly)
- // if user rejected connect to account
if (!address) throw new Error("Wallet didn't connect")
this.saveConnections()
@@ -242,47 +233,9 @@ export class Web3WalletProvider {
provider: any,
blockchain: SupportedBlockchainsParam,
) {
- // some blockchains, like solana, use addresses in base58
- // its case-sensitive, but chance to have collision
- // for single user almost zero
this.connections[address.toLowerCase()] = { address, chainId, providerType, provider, blockchain, ethers }
switch (blockchain) {
case 'solana':
- provider.on('connect', (publicKey) => {
- let newAddress = publicKey.toBase58()
- logger(2, 'connected wallet: ', newAddress)
- this.registerNewWalletAddress(newAddress, 'mainnet-beta', 'phantom', window.solana, 'solana')
- })
-
- // Forget user's public key once they disconnect
- provider.on('disconnect', () => {
- logger(2, 'disconnected wallet.')
- delete this.connections[address.toLowerCase()]
- /**
- * TODO do we need to disconnect all wallets?
- * for now user cant connect to multiple wallets
- * but do we need it for future?
- */
- this.client.disconnectWallet()
- })
-
- provider.on('accountChanged', (publicKey) => {
- delete this.connections[address.toLowerCase()]
- if (publicKey) {
- // Set new public key and continue as usual
- logger(2, `Switched to account ${publicKey.toBase58()}`)
- this.registerNewWalletAddress(publicKey.toBase58(), 'mainnet-beta', 'phantom', window.solana, 'solana')
- } else {
- logger(2, 'Disconnected from wallet')
- delete this.connections[address.toLowerCase()]
- /**
- * TODO do we need to disconnect all wallets?
- * for now user cant connect to multiple wallets
- * but do we need it for future?
- */
- this.client.disconnectWallet()
- }
- })
break
case 'flow':
provider.currentUser().subscribe((user) => {
@@ -291,55 +244,6 @@ export class Web3WalletProvider {
})
break
case 'evm':
- // @ts-ignore
- provider.on('accountsChanged', (accounts) => {
- logger(2, 'accountsChanged: ', accounts)
- if (!accounts || accounts.length === 0) {
- /**
- * TODO do we need to disconnect all wallets?
- * for now user cant connect to multiple wallets
- * but do we need it for future?
- */
- this.client.disconnectWallet()
- return
- }
-
- if (address === accounts[0]) return
-
- delete this.connections[address.toLowerCase()]
-
- address = accounts[0]
-
- this.registerNewWalletAddress(address, chainId, providerType, provider, 'evm')
-
- this.saveConnections()
-
- this.emitSavedConnection(address)
-
- this.client.getTokenStore().clearCachedTokens()
- this.client.enrichTokenLookupDataOnChainTokens()
- })
-
- // @ts-ignore
- provider.on('chainChanged', (_chainId: any) => {
- this.registerNewWalletAddress(address, _chainId, providerType, provider, 'evm')
-
- this.saveConnections()
-
- this.emitNetworkChange(_chainId)
- })
-
- // @ts-ignore
- // walletconnect
- provider.on('disconnect', (reason: any) => {
- if (reason?.message && reason.message.indexOf('MetaMask: Disconnected from chain') > -1) return
- /**
- * TODO do we need to disconnect all wallets?
- * for now user cant connect to multiple wallets
- * but do we need it for future?
- */
- this.client.disconnectWallet()
- })
break
default:
logger(2, 'Unknown blockchain, dont attach listeners')
@@ -359,14 +263,96 @@ export class Web3WalletProvider {
this.registerNewWalletAddress(curAccount, chainId, providerName, provider, 'evm')
+ // @ts-ignore
+ provider.provider.on('accountsChanged', (newAccounts) => {
+ logger(2, 'accountsChanged: ', newAccounts)
+ if (!newAccounts || newAccounts.length === 0) {
+ this.client.disconnectWallet()
+ return
+ }
+
+ if (curAccount === newAccounts[0]) return
+
+ delete this.connections[curAccount.toLowerCase()]
+ curAccount = newAccounts[0]
+
+ this.registerNewWalletAddress(curAccount, chainId, providerName, provider, 'evm')
+
+ this.saveConnections()
+
+ this.emitSavedConnection(curAccount)
+
+ this.client.getTokenStore().clearCachedTokens()
+ this.client.enrichTokenLookupDataOnChainTokens()
+ })
+
+ // @ts-ignore
+ provider.provider.on('chainChanged', (_chainId: any) => {
+ this.registerNewWalletAddress(curAccount, _chainId, providerName, provider, 'evm')
+
+ this.saveConnections()
+
+ this.emitNetworkChange(_chainId)
+ })
+
+ // @ts-ignore
+ provider.provider.on('disconnect', (reason: any) => {
+ if (reason?.message && reason.message.indexOf('MetaMask: Disconnected from chain') > -1) return
+ /**
+ * TODO do we need to disconnect all wallets?
+ * for now user cant connect to multiple wallets
+ * but do we need it for future?
+ */
+ this.client.disconnectWallet()
+ })
+
return curAccount
}
+ private async registerSolanaProvider(provider: any, providerName: string) {
+ const connection = await provider.connect()
+ const accountAddress: string = connection.publicKey.toBase58()
+
+ let curAccount = accountAddress
+ this.registerNewWalletAddress(accountAddress, 'mainnet-beta', providerName, provider, 'solana')
+
+ // event hooks
+ provider.on('connect', (publicKey) => {
+ let newAddress = publicKey.toBase58()
+ logger(2, 'connected wallet: ', newAddress)
+ this.registerNewWalletAddress(newAddress, 'mainnet-beta', 'phantom', window.solana, 'solana')
+ })
+
+ provider.on('disconnect', () => {
+ logger(2, 'disconnected wallet.')
+ this.client.disconnectWallet()
+ })
+
+ provider.on('accountChanged', (publicKey) => {
+ if (publicKey) {
+ delete this.connections[curAccount.toLowerCase()]
+ // Set new public key and continue as usual
+ const newAccountAddress = publicKey.toBase58()
+ curAccount = newAccountAddress
+ this.registerNewWalletAddress(curAccount, 'mainnet-beta', 'phantom', window.solana, 'solana')
+ this.saveConnections()
+ this.emitSavedConnection(curAccount)
+ this.client.getTokenStore().clearCachedTokens()
+ this.client.enrichTokenLookupDataOnChainTokens()
+ } else {
+ logger(2, 'disconnected wallet.')
+ this.client.disconnectWallet()
+ }
+ })
+
+ return accountAddress
+ }
+
async MetaMask(checkConnectionOnly: boolean) {
logger(2, 'connect MetaMask')
if (typeof window.ethereum !== 'undefined') {
- await window.ethereum.enable() // fall back may be needed for FF to open Extension Prompt.
+ await window.ethereum.enable()
const provider = new ethers.providers.Web3Provider(window.ethereum, 'any')
@@ -380,9 +366,9 @@ export class Web3WalletProvider {
logger(2, 'connect Wallet Connect')
const walletConnectProvider = await import('./WalletConnectProvider')
-
const walletConnect = await walletConnectProvider.getWalletConnectProviderInstance(checkConnectionOnly)
+ let connecting = true
return new Promise((resolve, reject) => {
if (checkConnectionOnly) {
walletConnect.connector.on('display_uri', (err, payload) => {
@@ -390,14 +376,26 @@ export class Web3WalletProvider {
})
}
+ // this is for the edge case when user rejects connection from wallet
+ walletConnect.connector.on('disconnect', (err, payload) => {
+ if (connecting) {
+ connecting = false
+ reject(new Error('User rejected connection'))
+ }
+ })
+
walletConnect
.enable()
.then(() => {
+ connecting = false
const provider = new ethers.providers.Web3Provider(walletConnect, 'any')
resolve(this.registerEvmProvider(provider, 'WalletConnect'))
})
- .catch((e) => reject(e))
+ .catch((e) => {
+ connecting = false
+ reject(e)
+ })
})
}
@@ -418,7 +416,6 @@ export class Web3WalletProvider {
})
})
- // Subscribe to session delete
universalWalletConnect.on('session_delete', ({ id, topic }: { id: number; topic: string }) => {
// TODO: There is currently a bug in the universal provider that prevents this handler from being called.
// After this is fixed, this should handle the event correctly
@@ -432,8 +429,6 @@ export class Web3WalletProvider {
if (checkConnectionOnly && !universalWalletConnect.session) {
reject('Not connected')
} else {
- // let pairing
-
let connect
if (universalWalletConnect.session) {
@@ -448,21 +443,18 @@ export class Web3WalletProvider {
rpcMap: preSavedWalletOptions?.walletConnectV2?.rpcMap ?? walletConnectProvider.WC_DEFAULT_RPC_MAP,
},
},
- // pairingTopic: pairing?.topic,
})
}
connect
.then(() => {
logger(2, 'WC2 connected.....')
- // in case of enable() QRCodeModal undefined
QRCodeModal?.close()
const provider = new ethers.providers.Web3Provider(universalWalletConnect, 'any')
resolve(this.registerEvmProvider(provider, 'WalletConnectV2'))
})
.catch((e) => {
logger(2, 'WC2 connect error...', e)
- // in case of enable() QRCodeModal undefined
QRCodeModal?.close()
reject(e)
})
@@ -488,14 +480,7 @@ export class Web3WalletProvider {
logger(2, 'connect Phantom')
if (typeof window.solana !== 'undefined') {
- const connection = await window.solana.connect()
-
- const accountAddress: string = connection.publicKey.toBase58()
-
- // mainnet-beta
- // TODO: Create registerSolanaProvider method to create event listeners (see registerEvmProvider)
- this.registerNewWalletAddress(accountAddress, 'mainnet-beta', 'phantom', window.solana, 'solana')
- return accountAddress
+ return await this.registerSolanaProvider(window.solana, 'phantom')
} else {
throw new Error('Phantom is not available. Please check the extension is supported and active.')
}
diff --git a/src/wallet/__test__/wallet.spec.ts b/src/wallet/__test__/wallet.spec.ts
index 273023e3..efe73a05 100644
--- a/src/wallet/__test__/wallet.spec.ts
+++ b/src/wallet/__test__/wallet.spec.ts
@@ -1,4 +1,5 @@
/* eslint-disable no-mixed-spaces-and-tabs */
+import { ethers } from 'ethers'
import { TextDecoder, TextEncoder } from 'text-encoding'
global.TextEncoder = TextEncoder
global.TextDecoder = TextDecoder
@@ -119,3 +120,40 @@ describe('wallet spec', () => {
expect(safeConnectProvider).toBeDefined()
})
})
+
+describe('Provider tests', () => {
+ let web3WalletProvider: Web3WalletProvider
+ test('web3WalletProvider method connectWith - MetaMask', async () => {
+ web3WalletProvider = new Web3WalletProvider(tokenNegotiatorClient, null, null)
+ window.ethereum = {
+ enable: () => ['0x1263b90F4e1DFe89A8f9E623FF57adb252851fC3'],
+ }
+ try {
+ await web3WalletProvider.connectWith('MetaMask')
+ } catch (err) {
+ expect(err).toEqual(new Error('unsupported provider (argument="provider", value={}, code=INVALID_ARGUMENT, version=providers/5.7.2)'))
+ }
+ })
+
+ test('web3WalletProvider connect with void method for ETH connnection register wallet address', async () => {
+ web3WalletProvider = new Web3WalletProvider(tokenNegotiatorClient, null, null)
+ window.ethereum = {
+ enable: () => ['0x1263b90F4e1DFe89A8f9E623FF57adb252851fC3'],
+ // provider: {
+ // events: {
+ // accountsChanged: () => {},
+ // chainChanged: () => {},
+ // disconnect: () => {},
+ // },
+ // },
+ }
+ web3WalletProvider.registerNewWalletAddress(
+ '0x1263b90F4e1DFe89A8f9E623FF57adb252851fC3'.toLocaleLowerCase(),
+ '1',
+ 'MetaMask',
+ window.ethereum,
+ 'evm',
+ )
+ expect(web3WalletProvider.connections['0x1263b90f4e1dfe89a8f9e623ff57adb252851fc3'].provider).toBeDefined()
+ })
+})