summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/components/Account.js4
-rw-r--r--app/components/Login.js28
-rw-r--r--app/lib/backend.js20
-rw-r--r--app/lib/ipc-facade.js18
-rw-r--r--app/redux/account/actions.js6
-rw-r--r--app/redux/account/reducers.js10
-rw-r--r--test/autologin.spec.js10
-rw-r--r--test/components/Account.spec.js6
-rw-r--r--test/components/Login.spec.js2
-rw-r--r--test/components/Settings.spec.js6
-rw-r--r--test/login.spec.js2
-rw-r--r--test/logout.spec.js2
-rw-r--r--test/mocks/ipc.js4
-rw-r--r--test/mocks/redux.js2
14 files changed, 60 insertions, 60 deletions
diff --git a/app/components/Account.js b/app/components/Account.js
index 12ef0c1938..64dc617f98 100644
--- a/app/components/Account.js
+++ b/app/components/Account.js
@@ -20,7 +20,7 @@ export default class Account extends Component {
render(): React.Element<*> {
const expiry = moment(this.props.account.expiry);
- const formattedAccountId = formatAccount(this.props.account.accountNumber || '');
+ const formattedAccountToken = formatAccount(this.props.account.accountToken || '');
const formattedExpiry = expiry.format('hA, D MMMM YYYY').toUpperCase();
const isOutOfTime = expiry.isSameOrBefore(moment());
@@ -44,7 +44,7 @@ export default class Account extends Component {
<div className="account__row">
<div className="account__row-label">Account ID</div>
- <div className="account__row-value">{ formattedAccountId }</div>
+ <div className="account__row-value">{ formattedAccountToken }</div>
</div>
<div className="account__row">
diff --git a/app/components/Login.js b/app/components/Login.js
index ea727adc22..1e1d7dbb5f 100644
--- a/app/components/Login.js
+++ b/app/components/Login.js
@@ -9,7 +9,7 @@ import type { AccountReduxState, LoginState } from '../redux/account/reducers';
export type LoginPropTypes = {
account: AccountReduxState,
- onLogin: (accountNumber: string) => void,
+ onLogin: (accountToken: string) => void,
onSettings: ?(() => void),
onFirstChangeAfterFailure: () => void,
onExternalLink: (type: string) => void,
@@ -20,18 +20,18 @@ export default class Login extends Component {
state = {
notifyOnFirstChangeAfterFailure: false,
isActive: false,
- unsubmittedAccountNumber: '',
+ unsubmittedAccountToken: '',
};
onCreateAccount = () => this.props.onExternalLink('createAccount');
onFocus = () => this.setState({ isActive: true });
onBlur = () => this.setState({ isActive: false });
onLogin = () => {
- const accountNumber = this.state.unsubmittedAccountNumber;
- if(accountNumber && accountNumber.length > 0) {
- this.props.onLogin(accountNumber);
+ const accountToken = this.state.unsubmittedAccountToken;
+ if(accountToken && accountToken.length > 0) {
+ this.props.onLogin(accountToken);
this.setState({
- unsubmittedAccountNumber: '',
+ unsubmittedAccountToken: '',
});
}
}
@@ -43,7 +43,7 @@ export default class Login extends Component {
this.props.onFirstChangeAfterFailure();
}
this.setState({
- unsubmittedAccountNumber: val,
+ unsubmittedAccountToken: val,
});
}
@@ -83,10 +83,10 @@ export default class Login extends Component {
return classes.join(' ');
}
- submitClass(s: LoginState, accountNumber: ?string): string {
+ submitClass(s: LoginState, accountToken: ?string): string {
const classes = ['login-form__submit'];
- if(accountNumber && accountNumber.length > 0) {
+ if(accountToken && accountToken.length > 0) {
classes.push('login-form__submit--active');
}
@@ -168,16 +168,16 @@ export default class Login extends Component {
_createLoginForm(): React.Element<*> {
const { status, error } = this.props.account;
- const accountNumber = status === 'logging in'
- ? this.props.account.accountNumber
- : this.state.unsubmittedAccountNumber;
+ const accountToken = status === 'logging in'
+ ? this.props.account.accountToken
+ : this.state.unsubmittedAccountToken;
const inputDisabled = status === 'logging in';
const subtitle = this.formSubtitle(status, error);
const inputWrapClass = this.inputWrapClass(status);
- const submitClass = this.submitClass(status, accountNumber);
+ const submitClass = this.submitClass(status, accountToken);
const autoFocusRef = input => {
if(status === 'failed' && input) {
@@ -195,7 +195,7 @@ export default class Login extends Component {
onBlur={ this.onBlur }
onChange={ this.onInputChange }
onEnter={ this.onLogin }
- value={ accountNumber || '' }
+ value={ accountToken || '' }
disabled={ inputDisabled }
autoFocus={ true }
ref={ autoFocusRef } />
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);
}
diff --git a/app/redux/account/actions.js b/app/redux/account/actions.js
index 78f8c2d783..30089b1d56 100644
--- a/app/redux/account/actions.js
+++ b/app/redux/account/actions.js
@@ -4,7 +4,7 @@ import type { Backend, BackendError } from '../../lib/backend';
type StartLoginAction = {
type: 'START_LOGIN',
- accountNumber?: string,
+ accountToken?: string,
};
type LoginSuccessfulAction = {
type: 'LOGIN_SUCCESSFUL',
@@ -29,10 +29,10 @@ export type AccountAction = StartLoginAction
| LoggedOutAction
| ResetLoginErrorAction;
-function startLogin(accountNumber?: string): StartLoginAction {
+function startLogin(accountToken?: string): StartLoginAction {
return {
type: 'START_LOGIN',
- accountNumber: accountNumber,
+ accountToken: accountToken,
};
}
diff --git a/app/redux/account/reducers.js b/app/redux/account/reducers.js
index 094d90fa3a..6107f08195 100644
--- a/app/redux/account/reducers.js
+++ b/app/redux/account/reducers.js
@@ -5,14 +5,14 @@ import type { BackendError } from '../../lib/backend';
export type LoginState = 'none' | 'logging in' | 'failed' | 'ok';
export type AccountReduxState = {
- accountNumber: ?string,
+ accountToken: ?string,
expiry: ?string, // ISO8601
status: LoginState,
error: ?BackendError
};
const initialState: AccountReduxState = {
- accountNumber: null,
+ accountToken: null,
expiry: null,
status: 'none',
error: null
@@ -26,7 +26,7 @@ export default function(state: AccountReduxState = initialState, action: ReduxAc
case 'START_LOGIN':
return { ...state, ...{
status: 'logging in',
- accountNumber: action.accountNumber,
+ accountToken: action.accountToken,
error: null,
}};
case 'LOGIN_SUCCESSFUL':
@@ -38,13 +38,13 @@ export default function(state: AccountReduxState = initialState, action: ReduxAc
case 'LOGIN_FAILED':
return { ...state, ...{
status: 'failed',
- accountNumber: null,
+ accountToken: null,
error: action.error,
}};
case 'LOGGED_OUT':
return { ...state, ...{
status: 'none',
- accountNumber: null,
+ accountToken: null,
expiry: null,
error: null,
}};
diff --git a/test/autologin.spec.js b/test/autologin.spec.js
index b8051d800b..734e81d479 100644
--- a/test/autologin.spec.js
+++ b/test/autologin.spec.js
@@ -9,16 +9,16 @@ describe('autologin', () => {
it('should send get_account then get_account_data if an account is set', (done) => {
const { mockIpc, backend } = setupBackendAndStore();
- const randomAccountNumber = '12345';
+ const randomAccountToken = '12345';
const chain = new IpcChain(mockIpc);
chain.require('getAccount')
- .withReturnValue(randomAccountNumber)
+ .withReturnValue(randomAccountToken)
.done();
chain.require('getAccountData')
.withInputValidation((num) => {
- expect(num).to.equal(randomAccountNumber);
+ expect(num).to.equal(randomAccountToken);
})
.done();
@@ -60,7 +60,7 @@ describe('autologin', () => {
const state = store.getState().account;
expect(state.status).to.equal('none');
- expect(state.accountNumber).to.be.null;
+ expect(state.accountToken).to.be.null;
expect(state.error).to.be.null;
});
});
@@ -91,7 +91,7 @@ describe('autologin', () => {
.then( () => {
const state = store.getState().account;
expect(state.status).to.equal('ok');
- expect(state.accountNumber).to.equal('123');
+ expect(state.accountToken).to.equal('123');
expect(state.expiry).to.equal('2001-01-01T00:00:00Z');
});
});
diff --git a/test/components/Account.spec.js b/test/components/Account.spec.js
index 6ebd4785e2..4f574ae6d7 100644
--- a/test/components/Account.spec.js
+++ b/test/components/Account.spec.js
@@ -10,7 +10,7 @@ import type { AccountProps } from '../../app/components/Account';
describe('components/Account', () => {
const state: AccountReduxState = {
- accountNumber: '1234',
+ accountToken: '1234',
expiry: (new Date('2038-01-01')).toISOString(),
status: 'none',
error: null
@@ -58,7 +58,7 @@ describe('components/Account', () => {
it('should display "out of time" message when account expired', () => {
const expiredState: AccountReduxState = {
- accountNumber: '1234',
+ accountToken: '1234',
expiry: (new Date('2001-01-01')).toISOString(),
status: 'none',
error: null
@@ -73,4 +73,4 @@ describe('components/Account', () => {
expect(domNodes.length).to.be.equal(0);
});
-}); \ No newline at end of file
+});
diff --git a/test/components/Login.spec.js b/test/components/Login.spec.js
index 3af6cb041b..d3d38be410 100644
--- a/test/components/Login.spec.js
+++ b/test/components/Login.spec.js
@@ -84,7 +84,7 @@ describe('components/Login', () => {
});
const defaultAccount = {
- accountNumber: null,
+ accountToken: null,
expiry: null,
status: 'none',
error: null,
diff --git a/test/components/Settings.spec.js b/test/components/Settings.spec.js
index fd670931e8..63087c5088 100644
--- a/test/components/Settings.spec.js
+++ b/test/components/Settings.spec.js
@@ -12,21 +12,21 @@ import type { SettingsProps } from '../../app/components/Settings';
describe('components/Settings', () => {
const loggedOutAccountState: AccountReduxState = {
- accountNumber: null,
+ accountToken: null,
expiry: null,
status: 'none',
error: null
};
const loggedInAccountState: AccountReduxState = {
- accountNumber: '1234',
+ accountToken: '1234',
expiry: (new Date('2038-01-01')).toISOString(),
status: 'ok',
error: null
};
const unpaidAccountState: AccountReduxState = {
- accountNumber: '1234',
+ accountToken: '1234',
expiry: (new Date('2001-01-01')).toISOString(),
status: 'ok',
error: null
diff --git a/test/login.spec.js b/test/login.spec.js
index 21564da822..1efe89ae38 100644
--- a/test/login.spec.js
+++ b/test/login.spec.js
@@ -38,7 +38,7 @@ describe('Logging in', () => {
.then( () => {
const state = store.getState().account;
expect(state.status).to.equal('ok');
- expect(state.accountNumber).to.equal('123');
+ expect(state.accountToken).to.equal('123');
expect(state.expiry).to.equal('2001-01-01T00:00:00Z');
});
});
diff --git a/test/logout.spec.js b/test/logout.spec.js
index a5c8b29975..9b44f83ca6 100644
--- a/test/logout.spec.js
+++ b/test/logout.spec.js
@@ -35,7 +35,7 @@ describe('logging out', () => {
const expectedLogoutState = {
status: 'none',
- accountNumber: null,
+ accountToken: null,
expiry: null,
error: null,
};
diff --git a/test/mocks/ipc.js b/test/mocks/ipc.js
index 3acdc2f76d..d28c49e6f6 100644
--- a/test/mocks/ipc.js
+++ b/test/mocks/ipc.js
@@ -15,9 +15,9 @@ export function newMockIpc() {
const mockIpc: IpcFacade & MockIpc = {
setConnectionString: (_str: string) => {},
- getAccountData: (accountNumber) => {
+ getAccountData: (accountToken) => {
return new Promise(r => r({
- accountNumber: accountNumber,
+ accountToken: accountToken,
expiry: '',
}));
},
diff --git a/test/mocks/redux.js b/test/mocks/redux.js
index 9d4759b1d3..71dafc7f1f 100644
--- a/test/mocks/redux.js
+++ b/test/mocks/redux.js
@@ -7,7 +7,7 @@ export const mockStore = configureMockStore(middlewares);
export const mockState = () => {
return {
account: {
- accountNumber: null,
+ accountToken: null,
status: 'none',
error: null
},
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.