Merge pull request #226 from chaitanyapotti/master

- Update Torus Version
- add support for enabled verifiers

Author: lnbc1QWFyb24

package.json

@@ -42,7 +42,7 @@
     "@ledgerhq/hw-app-eth": "^5.7.0",
     "@ledgerhq/hw-transport-u2f": "^5.7.0",
     "@portis/web3": "^2.0.0-beta.42",
-    "@toruslabs/torus-embed": "^0.2.11",
+    "@toruslabs/torus-embed": "^1.1.1",
     "@walletconnect/web3-provider": "^1.0.0-beta.45",
     "authereum": "^0.0.4-beta.88",
     "bignumber.js": "^9.0.0",

src/interfaces.ts

@@ -158,6 +158,16 @@ export interface TorusOptions {
   showTorusButton?: boolean
   buttonPosition?: 'top-left' | 'top-right' | 'bottom-right' | 'bottom-left'
   enableLogging?: boolean
+  enabledVerifiers: TorusVerifierStatus
+}
+
+
+interface TorusVerifierStatus {
+  google?: boolean;
+  facebook?: boolean;
+  reddit?: boolean;
+  twitch?: boolean;
+  discord?: boolean;
 }
 
 export interface AuthereumOptions {

src/modules/select/wallets/torus.ts

@@ -18,7 +18,8 @@ function torus(options: TorusOptions & CommonWalletOptions): WalletModule {
     buttonPosition,
     enableLogging,
     loginMethod,
-    showTorusButton
+    showTorusButton,
+    enabledVerifiers
   } = options
 
   return {
@@ -39,7 +40,8 @@ function torus(options: TorusOptions & CommonWalletOptions): WalletModule {
           chainId: networkId, // default: 1
           networkName: `${networkName(networkId)} Network` // default: Main Ethereum Network
         },
-        showTorusButton: showTorusButton // default: true
+        showTorusButton: showTorusButton, // default: true
+        enabledVerifiers: enabledVerifiers
       })
 
       const provider = instance.provider

src/utilities.ts

@@ -153,6 +153,11 @@ export function createLegacyProviderInterface(provider: any): WalletInterface {
 export function getProviderName(provider: any): string | undefined {
   if (!provider) return
 
+  // Torus also exports isMetamask to be true for backward compatibility
+  if (provider.isTorus) {
+    return 'Torus'
+  }
+
   if (provider.isMetaMask) {
     return 'MetaMask'
   }
@@ -177,10 +182,6 @@ export function getProviderName(provider: any): string | undefined {
     return 'Toshi'
   }
 
-  if (provider.isTorus) {
-    return 'Torus'
-  }
-
   if (provider.isCipher) {
     return 'Cipher'
   }

src/validation.ts

@@ -532,6 +532,7 @@ export function validateWalletInit(
     enableLogging,
     loginMethod,
     showTorusButton,
+    enabledVerifiers,
     disableNotifications,
     ...otherParams
   } = walletInit
@@ -554,7 +555,8 @@ export function validateWalletInit(
       'buttonPosition',
       'enableLogging',
       'loginMethod',
-      'showTorusButton'
+      'showTorusButton',
+      'enabledVerifiers'
     ],
     'walletInitObject'
   )
@@ -658,6 +660,14 @@ export function validateWalletInit(
     optional: true
   })
 
+
+  validateType({
+    name: 'walletInit.enabledVerifiers',
+    value: enabledVerifiers,
+    type: 'object',
+    optional: true
+  })
+
   validateType({
     name: 'walletInit.buttonPosition',
     value: buttonPosition,