Merge pull request #1199 from Hirobreak/link-cancel

Link Cancel and 2FA Recovery Code

Author: Erika Perugachi

electron_app/package.json

@@ -135,7 +135,7 @@
     "electron-builder": "^20.37.0"
   },
   "dependencies": {
-    "@criptext/api": "0.15.20",
+    "@criptext/api": "0.15.21",
     "@criptext/data-transfer-client": "^0.1.1",
     "@criptext/electron-better-ipc": "^0.1.2-rc5",
     "@criptext/electron-push-receiver": "^2.1.2-rc1",

electron_app/src/clientManager.js

@@ -304,6 +304,11 @@ const linkAuth = async ({ newDeviceData, jwt }) => {
   return await client.linkAuth(newDeviceData);
 };
 
+const linkCancel = async ({ newDeviceData, jwt }) => {
+  await checkClient({ optionalSessionToken: jwt });
+  return await client.linkCancel(newDeviceData);
+};
+
 const linkBegin = async ({ username, domain }) => {
   const data = {
     targetUsername: username,
@@ -421,6 +426,12 @@ const resetPassword = async params => {
     : await checkExpiredSession(res, resetPassword, params);
 };
 
+const sendRecoveryCode = async ({ newDeviceData, jwt }) => {
+  await checkClient({ optionalSessionToken: jwt });
+  const res = await client.generateCodeTwoFactorAuth(newDeviceData);
+  return res;
+};
+
 const setReadTracking = async enabled => {
   const res = await client.setReadTracking(enabled);
   return res.status === 200
@@ -458,6 +469,11 @@ const syncBegin = async () => {
     : await checkExpiredSession(res, syncBegin, null);
 };
 
+const syncCancel = async () => {
+  const res = await client.syncCancel();
+  return res.status === 200 ? res : await checkExpiredSession(res, syncCancel);
+};
+
 const syncDeny = async randomId => {
   const res = await client.syncDeny(randomId);
   return res.status === 200
@@ -536,6 +552,12 @@ const unsendEmail = async params => {
     : await checkExpiredSession(res, unsendEmail, params);
 };
 
+const validateRecoveryCode = async ({ newDeviceData, jwt }) => {
+  await checkClient({ optionalSessionToken: jwt });
+  const res = await client.validateCodeTwoFactorAuth(newDeviceData);
+  return res;
+};
+
 module.exports = {
   acknowledgeEvents,
   canLogin,
@@ -557,6 +579,7 @@ module.exports = {
   linkAccept,
   linkAuth,
   linkBegin,
+  linkCancel,
   linkDeny,
   linkStatus,
   login,
@@ -572,17 +595,20 @@ module.exports = {
   removeDevice,
   resendConfirmationEmail,
   resetPassword,
+  sendRecoveryCode,
   setReadTracking,
   setReplyTo,
   setTwoFactorAuth,
   syncAccept,
   syncBegin,
+  syncCancel,
   syncDeny,
   syncStatus,
   unlockDevice,
   updateDeviceType,
   updateName,
   updatePushToken,
   uploadAvatar,
-  unsendEmail
+  unsendEmail,
+  validateRecoveryCode
 };

electron_app/src/ipc/client.js

@@ -75,6 +75,10 @@ ipc.answerRenderer('client-link-auth', newDeviceData =>
   clientManager.linkAuth(newDeviceData)
 );
 
+ipc.answerRenderer('client-link-cancel', newDeviceData =>
+  clientManager.linkCancel(newDeviceData)
+);
+
 ipc.answerRenderer('client-link-begin', ({ username, domain }) =>
   clientManager.linkBegin({ username, domain })
 );
@@ -121,6 +125,10 @@ ipc.answerRenderer('client-reset-password', params =>
   clientManager.resetPassword(params)
 );
 
+ipc.answerRenderer('client-send-recovery-code', params =>
+  clientManager.sendRecoveryCode(params)
+);
+
 ipc.answerRenderer('client-set-read-tracking', enabled =>
   clientManager.setReadTracking(enabled)
 );
@@ -139,6 +147,8 @@ ipc.answerRenderer('client-sync-accept', randomId =>
 
 ipc.answerRenderer('client-sync-begin', () => clientManager.syncBegin());
 
+ipc.answerRenderer('client-sync-cancel', () => clientManager.syncCancel());
+
 ipc.answerRenderer('client-sync-deny', randomId =>
   clientManager.syncDeny(randomId)
 );
@@ -166,3 +176,7 @@ ipc.answerRenderer('client-update-push-token', pushToken =>
 );
 
 ipc.answerRenderer('client-upload-avatar', clientManager.uploadAvatar);
+
+ipc.answerRenderer('client-validate-recovery-code', params =>
+  clientManager.validateRecoveryCode(params)
+);