|
|
@@ -166,52 +166,21 @@ export function parseSSoToken(store, next, to, router) {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- //请求post地址验证Token
|
|
|
- return authSSoToken(ssoToken)
|
|
|
- .then((response) => {
|
|
|
- //alert("response="+ JSON.stringify(response) );
|
|
|
- if (response.code === '000000') {
|
|
|
- response = response.data;
|
|
|
- console.log('子系统返回=' + JSON.stringify(response));
|
|
|
- console.log('ssoToken=' + response.token);
|
|
|
- console.log('userBind对象=' + JSON.stringify(response.userBind));
|
|
|
- console.log('userBindToken=' + response.userBind.userBindToken);
|
|
|
- setPlatformToken(ssoToken);
|
|
|
- //alert("response.userBind.userBindToken=" + response.userBind.userBindToken );
|
|
|
- //写入cookie Token
|
|
|
- store
|
|
|
- .dispatch('SaveBindToken', response.userBind.userBindToken)
|
|
|
- .then(() => {
|
|
|
- //冲定向刚才的地址,后台需要带回来
|
|
|
- //alert(location.pathname)
|
|
|
- // router.replace(to.path);
|
|
|
-
|
|
|
- next({
|
|
|
- path: to.path,
|
|
|
- query: omit(to.query, ['token']),
|
|
|
- replace: true
|
|
|
- });
|
|
|
- });
|
|
|
-
|
|
|
- return true;
|
|
|
- } else {
|
|
|
- //可能token失效
|
|
|
- // alert('可能token失效');
|
|
|
- return false;
|
|
|
- }
|
|
|
- })
|
|
|
- .catch((error) => {
|
|
|
- console.error(error);
|
|
|
- goUrl(`${ssoConfig.ssoLoginUrl}${ssoConfig.appRedirectUrl}&noToken=`); // 否则全部重定向到登录页
|
|
|
- return false;
|
|
|
+ return store.dispatch('SaveBindToken', ssoToken).then(() => {
|
|
|
+ router.replace({
|
|
|
+ path: to.path,
|
|
|
+ query: omit(to.query, ['token', 'siblingToken', 'subid'])
|
|
|
});
|
|
|
+
|
|
|
+ return true;
|
|
|
+ });
|
|
|
}
|
|
|
} else if (siblingToken) {
|
|
|
//
|
|
|
return store.dispatch('SaveSiblingToken', siblingToken).then(() => {
|
|
|
router.replace({
|
|
|
path: to.path,
|
|
|
- query: omit(to.query, ['siblingToken', 'subid']),
|
|
|
+ query: omit(to.query, ['token', 'siblingToken', 'subid']),
|
|
|
replace: true
|
|
|
});
|
|
|
|