Merge pull request #1523 from Hirobreak/launcher

fixing launch screen when signup process has not finish

Author: javiteri95

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.30.4",
+  "version": "0.31.0",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",

electron_app/src/windows/index.js

@@ -34,15 +34,20 @@ const upStepCreateDBEncrypted = async () => {
 /* eslint no-empty: ["error", { "allowEmptyCatch": true }] */
 const upStepCheckPIN = async () => {
   try {
-    const fallback = await dbManager.rawCheckPin(DEFAULT_PIN);
-    if (fallback) {
-      if (fallback.length) {
-        myAccount.initialize(fallback);
-        globalManager.pinData.set({ pinType: 'signin' });
-        pinWindow.show();
-      } else {
+    const existingAccounts = await dbManager.rawCheckPin(DEFAULT_PIN);
+    if (existingAccounts) {
+      if (
+        !existingAccounts.length ||
+        (existingAccounts.length === 1 &&
+          !existingAccounts[0].jwt &&
+          !existingAccounts[0].refreshToken)
+      ) {
         await deleteEncryptedDatabase();
         upStepNewUser();
+      } else {
+        myAccount.initialize(existingAccounts[0]);
+        globalManager.pinData.set({ pinType: 'signin' });
+        pinWindow.show();
       }
       return;
     }

email_composer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.30.4",
+  "version": "0.31.0",
   "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.30.4",
+  "version": "0.31.0",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_login/package.json

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

email_login/src/signal/signup.js

@@ -8,14 +8,18 @@ import {
   getAccountByParams,
   cleanDatabase,
   getComputerName,
+  getSettings,
+  getSystemLanguage,
+  createSettings,
   updateAccount,
   getContactByEmails,
   createContact,
   logLocal
 } from '../utils/ipc';
+import { hashPassword } from '../utils/HashUtils';
 import string from '../lang';
 
-import { myAccount } from '../utils/electronInterface';
+import { myAccount, mySettings, isFromStore } from '../utils/electronInterface';
 
 const { errors } = string.newSignUp.create;
 const recoveryErrors = string.newSignUp.recovery.recovery.errors;
@@ -117,7 +121,7 @@ const postKeyBundle = async ({
 }) => {
   const res = await postUser({
     recipientId,
-    password,
+    password: hashPassword(password),
     name,
     recoveryEmail,
     keybundle,
@@ -190,6 +194,7 @@ const prepareAccount = async ({
   }
 
   await createOwnContact(name, myAccount.email, myAccount.id);
+  await setDefaultSettings();
   return {
     recipientId,
     accountId: newAccount.id
@@ -207,3 +212,21 @@ const createOwnContact = async (name, email) => {
     logLocal(createContactDbError.stack);
   }
 };
+
+const setDefaultSettings = async () => {
+  const settings = await getSettings();
+  if (settings) {
+    mySettings.initialize({
+      ...settings,
+      isFromStore: isFromStore
+    });
+  } else {
+    const language = await getSystemLanguage();
+    const data = { language, opened: false, theme: 'light' };
+    await createSettings(data);
+    mySettings.initialize({
+      ...data,
+      isFromStore: isFromStore
+    });
+  }
+};

email_login/src/utils/electronInterface.js

@@ -90,3 +90,6 @@ export const showOpenFileDialog = () => {
 export const setLoginInformation = params => {
   return globalManager.loginData.set(params);
 };
+
+export const isFromStore =
+  globalManager.isWindowsStore.get() || globalManager.isMAS.get();

email_login/src/utils/ipc.js

@@ -48,6 +48,10 @@ export const getDefaultBackupFolder = async () => {
   return await ipc.callMain('get-default-backup-folder');
 };
 
+export const getSystemLanguage = async () => {
+  return await ipc.callMain('get-system-language');
+};
+
 export const swapMailboxAccount = params => {
   ipc.callMain('swap-account', params);
 };
@@ -76,6 +80,10 @@ export const createContact = async params => {
   return await ipc.callMain('db-create-contact', params);
 };
 
+export const createSettings = async params => {
+  return await ipc.callMain('db-create-settings', params);
+};
+
 export const getAccountByParams = async params => {
   return await ipc.callMain('db-get-account-by-params', params);
 };
@@ -88,6 +96,10 @@ export const updateAccount = async params => {
   return await ipc.callMain('db-update-account', params);
 };
 
+export const getSettings = async () => {
+  return await ipc.callMain('db-get-settings');
+};
+
 export const updateSettings = async params => {
   return await ipc.callMain('db-update-settings', params);
 };

email_mailbox/package.json

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

email_pin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_pin",
-  "version": "0.30.4",
+  "version": "0.31.0",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",