Merge pull request #1307 from Hirobreak/fixing-70

Unable to Link device in login

Author: Erika Perugachi

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.26.6",
+  "version": "0.26.7",
   "author": {
     "name": "Criptext Inc",
     "email": "support@criptext.com",

email_composer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.26.6",
+  "version": "0.26.7",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_loading/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.26.6",
+  "version": "0.26.7",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_loading/src/components/LinkNewDeviceWrapper.js

@@ -49,6 +49,13 @@ const LINK_DEVICE_EMAIL_ADDRESS = remoteData.recipientId
     : `${remoteData.recipientId}@${appDomain}`
   : '';
 
+const getRecipientIdFromRemoteData = () => {
+  const { recipientId } = remoteData;
+  return recipientId.includes(`@${appDomain}`)
+    ? recipientId.split('@')[0]
+    : recipientId;
+};
+
 class LoadingWrapper extends Component {
   constructor(props) {
     super(props);
@@ -71,10 +78,10 @@ class LoadingWrapper extends Component {
     this.setState({ message: messages.sendingKeys, pauseAt: 10 }, async () => {
       this.incrementPercentage();
       await setTimeout(async () => {
-        const { name, recipientId, deviceType } = remoteData;
+        const { name, deviceType } = remoteData;
         await this.generateAccountAndKeys({
           deviceType,
-          recipientId,
+          recipientId: getRecipientIdFromRemoteData(),
           deviceId: 0,
           name
         });
@@ -126,6 +133,7 @@ class LoadingWrapper extends Component {
       async () => {
         try {
           this.incrementPercentage();
+          await cleanKeys();
           const keybundle = await signal.generateAccountAndKeys(params);
           if (!keybundle) {
             await cleanKeys();
@@ -157,18 +165,11 @@ class LoadingWrapper extends Component {
             this.linkingDevicesThrowError();
             return;
           }
-          let isRecipientApp = false;
-          let username = remoteData.recipientId;
-          if (remoteData.recipientId.includes(`@${appDomain}`)) {
-            isRecipientApp = true;
-            [username] = remoteData.recipientId.split('@');
-          }
           const newAccountData = {
             ...remoteData,
             ...accountData,
-            recipientId: username,
-            deviceId: remoteData.deviceId,
-            isRecipientApp
+            recipientId: getRecipientIdFromRemoteData(),
+            deviceId: remoteData.deviceId
           };
           await signal.createAccountToDB(newAccountData);
           this.setState(
@@ -274,11 +275,10 @@ class LoadingWrapper extends Component {
       async () => {
         this.incrementPercentage();
         const MESSAGE_PRE_KEY = 3;
-        const { recipientId } = remoteData;
         try {
           const decryptedKey = await signal.decryptKey({
             text: key,
-            recipientId,
+            recipientId: getRecipientIdFromRemoteData(),
             deviceId: authorizerId,
             messageType: MESSAGE_PRE_KEY
           });

email_loading/src/libs/signal.js

@@ -138,8 +138,7 @@ const createAccountWithNewDevice = async ({
   recipientId,
   deviceId,
   name,
-  deviceType,
-  isRecipientApp
+  deviceType
 }) => {
   const keybundle = await createAcountAndGetKeyBundle({
     recipientId,
@@ -169,7 +168,9 @@ const createAccountWithNewDevice = async ({
   await createSystemLabels();
   const [newAccount] = await getAccount();
   myAccount.initialize(newAccount);
-  const email = isRecipientApp ? `${recipientId}@${appDomain}` : recipientId;
+  const email = recipientId.includes(`@`)
+    ? recipientId
+    : `${recipientId}@${appDomain}`;
   await createOwnContact(name, email, newAccount.id);
   await setDefaultSettings();
   return true;

email_login/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.26.6",
+  "version": "0.26.7",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_mailbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.26.6",
+  "version": "0.26.7",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",