diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-09-04 13:08:44 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-09-04 13:26:11 +0200 |
| commit | 9b4ca3b9d73255ee573cf12c69893208326682fe (patch) | |
| tree | 4818423a3e26b568ba20c8b1ec484d1bf5effd2f /app/lib | |
| parent | fb1ae90a3b4fdb1601a4602929b62d706fb5192e (diff) | |
| download | mullvadvpn-9b4ca3b9d73255ee573cf12c69893208326682fe.tar.xz mullvadvpn-9b4ca3b9d73255ee573cf12c69893208326682fe.zip | |
Change accountNumber to accountToken
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/backend.js | 20 | ||||
| -rw-r--r-- | app/lib/ipc-facade.js | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/app/lib/backend.js b/app/lib/backend.js index ee11feee9d..9567c91fd7 100644 --- a/app/lib/backend.js +++ b/app/lib/backend.js @@ -148,16 +148,16 @@ export class Backend { } - login(accountNumber: string): Promise<void> { - log.info('Attempting to login with account number', accountNumber); + login(accountToken: string): Promise<void> { + log.info('Attempting to login with account number', accountToken); - this._store.dispatch(accountActions.startLogin(accountNumber)); + this._store.dispatch(accountActions.startLogin(accountToken)); - return this._ipc.getAccountData(accountNumber) + return this._ipc.getAccountData(accountToken) .then( response => { log.info('Account exists', response); - return this._ipc.setAccount(accountNumber) + return this._ipc.setAccount(accountToken) .then( () => response ); }).then( accountData => { @@ -185,14 +185,14 @@ export class Backend { this._store.dispatch(accountActions.startLogin()); return this._ipc.getAccount() - .then( accountNumber => { - if (!accountNumber) { + .then( accountToken => { + if (!accountToken) { throw new Error('No account set in the backend, failing autologin'); } - log.debug('The backend had an account number stored:', accountNumber); - this._store.dispatch(accountActions.startLogin(accountNumber)); + log.debug('The backend had an account number stored:', accountToken); + this._store.dispatch(accountActions.startLogin(accountToken)); - return this._ipc.getAccountData(accountNumber); + return this._ipc.getAccountData(accountToken); }) .then( accountData => { log.info('The stored account number still exists', accountData); diff --git a/app/lib/ipc-facade.js b/app/lib/ipc-facade.js index 3a0a4cc101..063dfd11ae 100644 --- a/app/lib/ipc-facade.js +++ b/app/lib/ipc-facade.js @@ -7,7 +7,7 @@ import { validate } from 'validated/object'; import type { Coordinate2d } from '../types'; export type AccountData = {expiry: string}; -export type AccountNumber = string; +export type AccountToken = string; export type Ip = string; export type Location = { latlong: Coordinate2d, @@ -28,9 +28,9 @@ export type BackendState = { export interface IpcFacade { setConnectionString(string): void, - getAccountData(AccountNumber): Promise<AccountData>, - getAccount(): Promise<?AccountNumber>, - setAccount(accountNumber: AccountNumber): Promise<void>, + getAccountData(AccountToken): Promise<AccountData>, + getAccount(): Promise<?AccountToken>, + setAccount(accountToken: AccountToken): Promise<void>, setCountry(address: string): Promise<void>, connect(): Promise<void>, disconnect(): Promise<void>, @@ -52,11 +52,11 @@ export class RealIpc implements IpcFacade { this._ipc.setConnectionString(str); } - getAccountData(accountNumber: AccountNumber): Promise<AccountData> { + getAccountData(accountToken: AccountToken): Promise<AccountData> { // send the IPC with 30s timeout since the backend will wait // for a HTTP request before replying - return this._ipc.send('get_account_data', accountNumber, 30000) + return this._ipc.send('get_account_data', accountToken, 30000) .then(raw => { if (typeof raw === 'object' && raw && raw.expiry) { return raw; @@ -66,7 +66,7 @@ export class RealIpc implements IpcFacade { }); } - getAccount(): Promise<?AccountNumber> { + getAccount(): Promise<?AccountToken> { return this._ipc.send('get_account') .then( raw => { if (raw === undefined || raw === null || typeof raw === 'string') { @@ -77,8 +77,8 @@ export class RealIpc implements IpcFacade { }); } - setAccount(accountNumber: AccountNumber): Promise<void> { - return this._ipc.send('set_account', accountNumber) + setAccount(accountToken: AccountToken): Promise<void> { + return this._ipc.send('set_account', accountToken) .then(this._ignoreResponse); } |
