Commit 16979525 authored by ganjingcun's avatar ganjingcun

reset

parent 023c059c
......@@ -168,6 +168,7 @@ export default {
message.success(messages['Your-account-has-been-successfully-activated!'], 3);
}
} catch (error) {
console.error(error);
message.error(messages[error.message] || error.message, 3);
}
},
......@@ -190,6 +191,7 @@ export default {
if (error.message === 'i_not_found') {
yield put({ type: 'check', payload: { isEmailExists: false, checkEmail: 'success' } });
} else {
console.error(error);
message.error(messages[error.message] || error.message, 3);
}
}
......@@ -210,6 +212,7 @@ export default {
yield put({ type: 'check', payload: { isUserNameExists: true, checkUsername: 'warning' } });
}
} catch (error) {
console.error(error);
if (error.message === 'i_not_found') {
yield put({ type: 'check', payload: { isUserNameExists: false, checkUsername: 'success' } });
} else {
......@@ -227,6 +230,7 @@ export default {
yield put({ type: 'user/loginSuccess', payload: { data } });
}
} catch (error) {
console.error(error);
yield put({ type: 'loginFail' });
message.error(messages[error.message] || error.message, 3);
}
......@@ -240,6 +244,7 @@ export default {
message.info(messages['A-password-reset-email-has-been-sent-to-you.'], 3);
}
} catch (error) {
console.error(error);
yield put({ type: 'forgotFail' });
message.error(messages[error.message] || error.message, 3);
}
......@@ -257,6 +262,7 @@ export default {
yield put(routerRedux.replace('/verify'));
}
} catch (error) {
console.error(error);
yield put({ type: 'registerFail' });
message.error(messages[error.message] || error.message, 3);
}
......@@ -270,6 +276,7 @@ export default {
message.info(messages.update_success, 3);
}
} catch (error) {
console.error(error);
yield put({ type: 'resetFail' });
message.error(messages[error.message] || error.message, 3);
}
......
......@@ -33,8 +33,6 @@ export default {
const language = anguageWithoutRegionCode === 'zh' ? 'zh-CN' : 'en-US';
const messages = i18n[language];
if (navigator.userAgent && navigator.userAgent.indexOf('Electron') > -1) {
client = 'electron';
}
......
import { message } from 'antd';
import { uploadImage } from '../services/upload';
window.onerror = (message, url, line,col, err ) => {
message.error(err.stack, 100)
}
// 这里这个 msg 参数原本名字为 message,跟顶上 import 的重了,我把它改名为 msg
// 下面 message.error 语法上似乎应该是指原本第一个参数 message
// 但是语义上应该是在调用 antd 的 message,我不知道之前为什么能跑,这里需要测试
// by zh99998
window.onerror = (msg, url, line, col, err) => {
console.error(err);
message.error(err.stack, 100);
};
export default {
......@@ -45,7 +52,7 @@ export default {
},
},
effects: {
*upload({ payload }, { call, put }) {
* upload({ payload }, { call, put }) {
try {
const { data } = yield call(uploadImage, payload);
......
......@@ -18,11 +18,13 @@ export const handleSSO = (user) => {
params.set(key, value);
}
params.set('return_sso_url', sso.get('return_sso_url'));
params.set('nonce', sso.get('nonce'));
if (sso.get('nonce')) {
params.set('nonce', sso.get('nonce'));
}
params.set('external_id', user.id);
params.set('avatar_url', user.avatar);
const payload = Buffer.from(params.toString()).toString('base64');
const payload = Buffer.from(params.toString()).toString('base64');
url.searchParams.set('sso', payload);
url.searchParams.set('sig', crypto.createHmac('sha256', 'zsZv6LXHDwwtUAGa').update(payload).digest('hex'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment