diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-05-16 14:26:47 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-05-16 14:26:47 +0200 |
| commit | 858b44484c9cc12c364191fb89d4ec6146c8d720 (patch) | |
| tree | 7c165c4e4d0e67383fa75fca3888729abb88a9b7 | |
| parent | b6bc4e7748cf32cba8761cc2eff4f31fdfa6eb04 (diff) | |
| parent | e245295007a932e14f744932ff06dcc14c977571 (diff) | |
| download | mullvadvpn-858b44484c9cc12c364191fb89d4ec6146c8d720.tar.xz mullvadvpn-858b44484c9cc12c364191fb89d4ec6146c8d720.zip | |
Merge branch 'fix-account-token-verification'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | gui/src/renderer/app.tsx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ec6d9418bc..86cd05bb70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ Line wrap the file at 100 chars. Th ### Fixed - Stop allowing the wrong IPv6 net fe02::/16 in the firewall when allow local network was enabled. Instead allow the correct multicast nets ff02::/16 and ff05::/16. +- Fix the regression that allowed to get past the login screen using the invalid account token. #### macOS - Raise max number of open files for the daemon to 1024. Should prevent threads from panicking. diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index fba3733e94..d98c7d23e9 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -243,7 +243,7 @@ export default class AppRenderer { this.accountDataCache.fetch(accountToken, { onFinish: () => resolve({ status: 'verified' }), onError: (error): AccountFetchRetryAction => { - if (error instanceof InvalidAccountError) { + if (error.message === new InvalidAccountError().message) { reject(error); return AccountFetchRetryAction.stop; } else { |