Merge pull request #373 from FleekHQ/giancarlo/20192

Type for recoverKeysByPassphrase and backupKeysByPassphrase

.env.example

@@ -12,4 +12,5 @@ REACT_APP_TORUS_TWITTER_CLIENT_ID=
 REACT_APP_TORUS_TWITTER_AUTH_DOMAIN=
 REACT_APP_TORUS_PROXY_CONTRACT=
 REACT_APP_TORUS_PROVIDERS_REDIRECT_URL=
-REACT_APP_TORUS_GOOGLE_CLIENT_ID=
+REACT_APP_TORUS_GOOGLE_CLIENT_ID=
+REACT_APP_TORUS_PASSWORDLESS_VERIFIER=

package.json

@@ -23,7 +23,7 @@
     "build-storybook": "build-storybook -s public"
   },
   "dependencies": {
-    "@fleekhq/space-client": "^1.1.5",
+    "@fleekhq/space-client": "^1.1.7",
     "@fortawesome/fontawesome-svg-core": "^1.2.28",
     "@fortawesome/free-brands-svg-icons": "^5.13.0",
     "@fortawesome/free-solid-svg-icons": "^5.13.0",

public/electron/events/account.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const get = require('lodash/get');
 const { ipcMain } = require('electron');
 
+const { getKeyBackupType } = require('../utils');
 const { spaceClient, apiClient } = require('../clients');
 
 const EVENT_PREFIX = 'account';
@@ -139,6 +140,7 @@ const registerAuthEvents = (mainWindow) => {
       await spaceClient.backupKeysByPassphrase({
         uuid: payload.uuid,
         passphrase: payload.torusRes.privateKey,
+        type: getKeyBackupType({ typeOfLogin: payload.torusRes.userInfo.typeOfLogin }),
       });
       const apiSessionRes = await spaceClient.getAPISessionTokens();
       await apiClient.identity.addEthAddress({

public/electron/events/auth.js

@@ -1,6 +1,7 @@
 const { ipcMain } = require('electron');
-const { getAddressByPublicKey } = require('../utils');
+
 const { apiClient, spaceClient } = require('../clients');
+const { getKeyBackupType, getAddressByPublicKey } = require('../utils');
 
 const EVENT_PREFIX = 'auth';
 const SIGNIN_EVENT = `${EVENT_PREFIX}:signin`;
@@ -30,6 +31,7 @@ const registerAuthEvents = (mainWindow) => {
         await spaceClient.recoverKeysByPassphrase({
           uuid: data.data.uuid,
           passphrase: payload.password,
+          type: getKeyBackupType({ typeOfLogin: 'password' }),
         });
 
         user = { ...data.data };
@@ -42,6 +44,7 @@ const registerAuthEvents = (mainWindow) => {
         await spaceClient.recoverKeysByPassphrase({
           uuid: data.data.uuid,
           passphrase: payload.torusRes.privateKey,
+          type: getKeyBackupType({ typeOfLogin: payload.torusRes.userInfo.typeOfLogin }),
         });
 
         user = { ...data.data };
@@ -98,9 +101,9 @@ const registerAuthEvents = (mainWindow) => {
           token: apiSessionRes.getServicestoken(),
         });
         await spaceClient.backupKeysByPassphrase({
-          type: 0, // 0 = PASSWORD; 1 = ETH
           uuid: data.data.uuid,
           passphrase: payload.password,
+          type: getKeyBackupType({ typeOfLogin: 'password' }),
         });
 
         user = { ...data.data };
@@ -113,9 +116,9 @@ const registerAuthEvents = (mainWindow) => {
         });
 
         await spaceClient.backupKeysByPassphrase({
-          type: 1, // 0 = PASSWORD; 1 = ETH
           uuid: data.data.uuid,
           passphrase: payload.torusRes.privateKey,
+          type: getKeyBackupType({ typeOfLogin: payload.torusRes.userInfo.typeOfLogin }),
         });
 
         await apiClient.identity.addEthAddress({

public/electron/utils/get-key-backup-type.js

@@ -0,0 +1,23 @@
+const { KeyBackupType } = require('@fleekhq/space-client/dist/definitions/space_pb');
+
+const TYPE_OF_LOGIN = {
+  google: KeyBackupType.GOOGLE,
+  twitter: KeyBackupType.TWITTER,
+  password: KeyBackupType.PASSWORD,
+  passwordless: KeyBackupType.EMAIL,
+};
+
+/**
+ * Get number based on type of login
+ * @param {Object} opts
+ * @param {String} opts.typeOfLogin
+ */
+const getKeyBackupType = ({ typeOfLogin }) => {
+  if (typeof TYPE_OF_LOGIN[typeOfLogin] === 'undefined') {
+    return '';
+  }
+
+  return TYPE_OF_LOGIN[typeOfLogin];
+};
+
+module.exports = getKeyBackupType;

public/electron/utils/index.js

@@ -3,3 +3,4 @@ module.exports.swapKeyValue = require('./swap-key-value');
 module.exports.mapNotification = require('./map-notification');
 module.exports.getAppTokenMetadata = require('./get-app-token-metadata');
 module.exports.getRedirectPath = require('./get-redirect-path');
+module.exports.getKeyBackupType = require('./get-key-backup-type');

src/config.js

@@ -1,3 +1,6 @@
+import pickBy from 'lodash/pickBy';
+import identity from 'lodash/identity';
+
 const {
   NODE_ENV,
   REACT_APP_TORUS_NETWORK,
@@ -16,14 +19,14 @@ export default {
     url: REACT_APP_WS_AUTH_CHALLENGE_URL,
   },
   torus: {
-    sdkConfig: {
+    sdkConfig: pickBy({
       enableLogging: NODE_ENV !== 'production',
       redirectToOpener: true,
       redirectPathName: 'redirect.html',
       baseUrl: REACT_APP_TORUS_PROVIDERS_REDIRECT_URL,
       proxyContractAddress: REACT_APP_TORUS_PROXY_CONTRACT, // details for test net
       network: REACT_APP_TORUS_NETWORK, // details for test net
-    },
+    }, identity),
     providers: {
       google: {
         name: 'Google',

yarn.lock

@@ -1692,10 +1692,10 @@
     "@ethersproject/properties" "^5.0.3"
     "@ethersproject/strings" "^5.0.4"
 
-"@fleekhq/space-client@^1.1.5":
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/@fleekhq/space-client/-/space-client-1.1.5.tgz#ed79f280f1d1cb1f9965289d25907c6a71c2cdf0"
-  integrity sha512-dkJseEFRCyELhdccdZwoTFQZPFCixOgRtGLWybb0fPKstQYKXU/2he5FduKVaur6G+rxXW6pNgwAqTo43wz8zA==
+"@fleekhq/space-client@^1.1.7":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@fleekhq/space-client/-/space-client-1.1.7.tgz#e38599d9b8fa331e9e551d2c6d4c786c2421eca1"
+  integrity sha512-GsvAmdg5zOxzFbFcFpiJsyb4CGzS4iR+sZ+m9rayGw87Vqkw1ythnShAzljS6Y50/vI0iZVYnFcScX+rH5v3pQ==
   dependencies:
     "@types/google-protobuf" "^3.7.2"
     google-protobuf "^3.12.2"