ElyBy-Mirror/accounts-frontend
1
0
Fork 0
mirror of https://github.com/elyby/accounts-frontend.git synced 2024-11-30 10:42:34 +05:30
Code Issues Packages Projects Releases Wiki Activity

Decouple auth states from routing redux state

Browse Source
This commit is contained in:
SleepWalker 2016-06-15 09:02:12 +03:00
parent 0b1a50f788
commit baacadad31
9 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/authFlow/ActivationState.js
View File

@ -4,13 +4,13 @@ import ResendActivationState from './ResendActivationState';
export default class ActivationState extends AbstractState {
enter(context) {
const {user, routing} = context.getState();
const {user} = context.getState();
if (user.isActive) {
context.setState(new CompleteState());
} else {
const url = routing.location.pathname.includes('/activation')
? routing.location.pathname
const url = context.getCurrentPath().includes('/activation')
? context.getCurrentPath()
: '/activation';
context.navigate(url);
}

12
src/services/authFlow/AuthFlow.js
View File

@ -25,9 +25,7 @@ export default class AuthFlow {
setStore(store) {
this.navigate = (route) => {
const {routing} = this.getState();
if (routing.location.pathname !== route) {
if (this.currentPath !== route) {
this.currentPath = route;
if (this.replace) {
@ -91,6 +89,14 @@ export default class AuthFlow {
}
}
getCurrentPath() {
return this.currentPath;
}
getQuery() {
return this.getState().routing.location.query;
}
/**
* This should be called from onEnter prop of react-router Route component
*

2
src/services/authFlow/OAuthState.js
View File

@ -3,7 +3,7 @@ import CompleteState from './CompleteState';
export default class OAuthState extends AbstractState {
enter(context) {
const query = context.getState().routing.location.query;
const query = context.getQuery();
return context.run('oAuthValidate', {
clientId: query.client_id,

6
src/services/authFlow/RecoverPasswordState.js
View File

@ -4,11 +4,11 @@ import CompleteState from './CompleteState';
export default class RecoverPasswordState extends AbstractState {
enter(context) {
const {user, routing} = context.getState();
const {user} = context.getState();
if (user.isGuest) {
const url = routing.location.pathname.includes('/recover-password')
? routing.location.pathname
const url = context.getCurrentPath().includes('/recover-password')
? context.getCurrentPath()
: '/recover-password';
context.navigate(url);
} else {

10
tests/services/authFlow/ActivationState.test.js
View File

@ -27,12 +27,11 @@ describe('ActivationState', () => {
context.getState.returns({
user: {
isActive: false
},
routing: {
location: {pathname: expectedPath}
}
});
context.getCurrentPath.returns(expectedPath);
expectNavigate(mock, '/activation');
state.enter(context);
@ -43,12 +42,11 @@ describe('ActivationState', () => {
context.getState.returns({
user: {
isActive: false
},
routing: {
location: {pathname: expectedPath}
}
});
context.getCurrentPath.returns(expectedPath);
expectNavigate(mock, expectedPath);
state.enter(context);

4
tests/services/authFlow/AuthFlow.functional.test.js
View File

@ -30,10 +30,6 @@ describe('AuthFlow.functional', () => {
flow.setStore(store);
navigate = function navigate(url) { // emulates router behaviour
state.routing = state.routing || {};
state.routing.location = state.routing.location || {};
state.routing.location.pathname = url;
if (navigate.lastUrl !== url) {
navigate.lastUrl = url;
flow.handleRequest(url, navigate);

8
tests/services/authFlow/OAuthState.test.js
View File

@ -30,9 +30,7 @@ describe('OAuthState', () => {
state: 'state'
};
context.getState.returns({
routing: {location: {query}}
});
context.getQuery.returns(query);
expectRun(
mock,
@ -52,9 +50,7 @@ describe('OAuthState', () => {
it('should transition to complete state on success', () => {
const promise = Promise.resolve();
context.getState.returns({
routing: {location: {query: {}}}
});
context.getQuery.returns({});
mock.expects('run').returns(promise);
expectState(mock, CompleteState);

14
tests/services/authFlow/RecoverPasswordState.test.js
View File

@ -25,12 +25,11 @@ describe('RecoverPasswordState', () => {
it('should navigate to /recover-password', () => {
const expectedPath = '/recover-password';
context.getState.returns({
user: {isGuest: true},
routing: {
location: {pathname: expectedPath}
}
user: {isGuest: true}
});
context.getCurrentPath.returns(expectedPath);
expectNavigate(mock, expectedPath);
state.enter(context);
@ -39,12 +38,11 @@ describe('RecoverPasswordState', () => {
it('should navigate to /recover-password/key', () => {
const expectedPath = '/recover-password/sasx5AS4d61';
context.getState.returns({
user: {isGuest: true},
routing: {
location: {pathname: expectedPath}
}
user: {isGuest: true}
});
context.getCurrentPath.returns(expectedPath);
expectNavigate(mock, expectedPath);
state.enter(context);

2
tests/services/authFlow/helpers.js
View File

@ -7,6 +7,8 @@ export function bootstrap() {
getState: sinon.stub(),
run() {},
setState() {},
getCurrentPath: sinon.stub(),
getQuery: sinon.stub(),
navigate() {}
};