From d62afc35d6021908d09b79c6830169d34078284d Mon Sep 17 00:00:00 2001
From: Sasha Ilieva <sasha.ilieva@vereign.com>
Date: Tue, 21 Apr 2020 17:54:35 +0300
Subject: [PATCH] Clear code
---
javascript/src/iframe/viamapi-iframe.js | 44 +++++++++++++------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index c6cdcc6..fa36da6 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -992,8 +992,6 @@ const connection = Penpal.connectToParent({
} = restoreAccessIdentity.authentication;
window.loadedIdentities[publicKey] = restoreAccessIdentity;
window.viamAnonymousApi.setIdentity(publicKey);
- viamApi.setSessionData("", "");
- viamApi.setIdentity(publicKey);
const timeout = ms => new Promise(resolve => setTimeout(resolve, ms));
@@ -1004,28 +1002,32 @@ const connection = Penpal.connectToParent({
viamApi.contactsCheckAccountRecoveryStatus,
null
);
- if (response.data === 1) {
- const deviceHash = await createDeviceHash(publicKey);
- window.viamApi.setDeviceHash(deviceHash);
- const identityLoginResponse = await executeRestfulFunction(
- "public",
- window.viamApi,
- window.viamApi.identityLogin,
- null,
- "previousaddeddevice"
- );
- console.log({ identityLoginResponse });
- const { code, data } = identityLoginResponse;
- if (code === "200") {
- handleIdentityLogin(restoreAccessIdentity, data.Uuid, data.Session);
- await getProfileData(restoreAccessIdentity);
- await setIdentityInLocalStorage(restoreAccessIdentity);
- }
+ if (response.data === 0) {
+ await timeout(1000);
+ await checkAccountRecoveryStatus();
+ return;
}
- await timeout(1000);
- await checkAccountRecoveryStatus();
+ const deviceHash = await createDeviceHash(publicKey);
+ window.viamApi.setDeviceHash(deviceHash);
+ window.viamApi.setSessionData("", "");
+ window.viamApi.setIdentity(publicKey);
+
+ const identityLoginResponse = await executeRestfulFunction(
+ "public",
+ window.viamApi,
+ window.viamApi.identityLogin,
+ null,
+ "previousaddeddevice"
+ );
+
+ const { code, data } = identityLoginResponse;
+ if (code === "200") {
+ handleIdentityLogin(restoreAccessIdentity, data.Uuid, data.Session);
+ await getProfileData(restoreAccessIdentity);
+ await setIdentityInLocalStorage(restoreAccessIdentity);
+ }
}
await checkAccountRecoveryStatus();
--
GitLab