ElyBy-Mirror/accounts-frontend
1
0
Fork 0
mirror of https://github.com/elyby/accounts-frontend.git synced 2024-12-28 07:50:32 +05:30
Code Issues Packages Projects Releases Wiki Activity

Доработано поведение для идентификации статичного редиректа

Browse Source
This commit is contained in:
ErickSkrauch 2016-03-20 22:36:30 +03:00
parent 9fc22211e0
commit 1e9b48bd9b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/auth/actions.js
View File

@ -192,7 +192,9 @@ export function oAuthComplete(params = {}) {
} }
}) })
.then((resp) => { .then((resp) => {
if (resp.redirectUri === 'static_page' || resp.redirectUri === 'static_page_with_code') { if (resp.redirectUri.startsWith('static_page')) {
resp.code = resp.redirectUri.match(/code=(.+)&/)[1];
resp.redirectUri = resp.redirectUri.match(/^(.+)\?/)[1];
resp.displayCode = resp.redirectUri === 'static_page_with_code'; resp.displayCode = resp.redirectUri === 'static_page_with_code';
dispatch(setOAuthCode({ dispatch(setOAuthCode({
success: resp.success, success: resp.success,

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

@ -33,14 +33,10 @@ export default class CompleteState extends AbstractState {
data.accept = this.isPermissionsAccepted; data.accept = this.isPermissionsAccepted;
} }
context.run('oAuthComplete', data).then((resp) => { context.run('oAuthComplete', data).then((resp) => {
switch (resp.redirectUri) { if (resp.redirectUri.startsWith('static_page')) {
case 'static_page': context.setState(new FinishState());
case 'static_page_with_code': } else {
context.setState(new FinishState()); location.href = resp.redirectUri;
break;
default:
location.href = resp.redirectUri;
break;
} }
}, (resp) => { }, (resp) => {
// TODO // TODO