muerwre/orchidmap-front
1
0
Fork 0
mirror of https://github.com/muerwre/orchidmap-front.git synced 2025-04-25 11:06:40 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions

loader: error handling

Browse source
This commit is contained in:
muerwre 2018-12-11 12:44:10 +07:00
parent 71a0aed9aa
commit 1c014ec9fb
5 changed files with 102 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/redux/user/sagas.js
View file

@ -6,12 +6,10 @@ import {
checkUserToken,
getGuestToken,
getStoredMap,
getVkIframeUser,
getVkUserInfo,
postMap
} from '$utils/api';
import {
hideRenderer, iframeLoginVk,
hideRenderer,
setActiveSticker, setAddress,
setChanged, setDialogActive,
setEditing,
@ -20,7 +18,7 @@ import {
setSaveOverwrite, setSaveSuccess, setTitle,
setUser
} from '$redux/user/actions';
import { getUrlData, parseQuery, pushPath } from '$utils/history';
import { getUrlData, parseQuery, pushLoaderState, pushNetworkInitError, pushPath } from '$utils/history';
import { editor } from '$modules/Editor';
import { ACTIONS } from '$redux/user/constants';
import { MODES } from '$constants/modes';
@ -114,6 +112,8 @@ function* iframeLoginVkSaga({ viewer_id, access_token, auth_key }) {
}
function* mapInitSaga() {
pushLoaderState(90);
const { hash } = getUrlData();
if (hash && /^#map/.test(hash)) {
@ -146,25 +146,29 @@ function* mapInitSaga() {
yield call(startEmptyEditorSaga);
yield put(setReady(true));
pushLoaderState(100);
return true;
}
function* authCheckSaga() {
pushLoaderState(70);
const { id, token } = yield select(getUser);
const { ready } = yield select(getState);
if (window.location.search || true) {
const { viewer_id, auth_key } = yield parseQuery(window.location.search);
// https://alpha-map.vault48.org:3000/auth/iframe/vk?viewer_id=360004&access_token=e558a05d5cb1fcb195316703a2d5e5ec9d19b2c608844c986ec56798f8ac642379bb37fbc58270435e077&auth_key=b0ff47f659d21b6b880a1eee60b6e794
// const viewer_id = '360004';
// const auth_key = 'b0ff47f659d21b6b880a1eee60b6e794';
// console.log('Already logged in?', viewer_id, auth_key, id !== `vk:${viewer_id}`);
if (viewer_id && auth_key && id !== `vk:${viewer_id}`) {
const user = yield call(checkIframeToken, { viewer_id, auth_key });
if (user) {
yield put(setUser(user));
pushLoaderState(' ...готово');
return yield call(mapInitSaga);
}
}
@ -175,11 +179,19 @@ function* authCheckSaga() {
if (user) {
yield put(setUser(user));
pushLoaderState(' ...готово');
return yield call(mapInitSaga);
} else if (!ready) {
pushNetworkInitError();
}
}
yield call(generateGuestSaga);
pushLoaderState(80);
return yield call(mapInitSaga);
}