diff --git a/package-lock.json b/package-lock.json index f3a146b..b7bcd84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nethlink", - "version": "0.0.73", + "version": "0.0.74", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nethlink", - "version": "0.0.73", + "version": "0.0.74", "hasInstallScript": true, "license": "UNLICENSED", "devDependencies": { diff --git a/package.json b/package.json index bb7474f..a3323b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nethlink", - "version": "0.0.73", + "version": "0.0.74", "description": "NethLink app", "main": "./out/main/main.js", "license": "UNLICENSED", diff --git a/src/main/classes/controllers/AccountController.ts b/src/main/classes/controllers/AccountController.ts index 9c66e9a..36801a3 100644 --- a/src/main/classes/controllers/AccountController.ts +++ b/src/main/classes/controllers/AccountController.ts @@ -109,14 +109,21 @@ export class AccountController { } catch { //TODO: recupera la password salvata e tenta un nuovo login if (account.cryptPsw) { - const _accountData = JSON.parse(safeStorage.decryptString(account.cryptPsw)) - const password = _accountData.password - const tempAccount: Account = { - host: _accountData.password, - username: _accountData.username, - theme: 'system' + try { + const psw: Buffer = Buffer.from((account.cryptPsw as any).data) + const decryptString = safeStorage.decryptString(psw) + + const _accountData = JSON.parse(decryptString) + const password = _accountData.password + const tempAccount: Account = { + host: _accountData.host, + username: _accountData.username, + theme: 'system' + } + loggedAccount = await AccountController.instance.login(tempAccount, password) + } catch (e) { + log(e) } - loggedAccount = await AccountController.instance.login(tempAccount, password) } else { //se fallisce, il token era scaduto, lo rimuovo come ultimo utente in modo che non provi ulteriomente a loggarsi con il token this.config!.lastUser = undefined