Merge pull request #1016 from EightMonth/sas

基于sas打通三方登录

src/api/sys/model/userModel.ts

@@ -10,6 +10,7 @@ export interface LoginParams {
 export interface ThirdLoginParams {
   token: string;
   thirdType: string;
+  grant_type: string;
 }
 
 export interface RoleInfo {

src/api/sys/user.ts

@@ -35,7 +35,7 @@ enum Api {
   //修改密码
   passwordChange = '/sys/user/passwordChange',
   //第三方登录
-  thirdLogin = '/sys/thirdLogin/getLoginUser',
+  thirdLogin = '/oauth2/token',
   //第三方登录
   getThirdCaptcha = '/sys/thirdSms',
   //获取二维码信息
@@ -172,12 +172,19 @@ export function thirdLogin(params, mode: ErrorMessageMode = 'modal') {
     tenantId = params.tenantId;
   }
   //==========end 第三方登录/auth2登录需要传递租户id===========
-  return defHttp.get<LoginResultModel>(
+  return defHttp.post<LoginResultModel>(
     {
-      url: `${Api.thirdLogin}/${params.token}/${params.thirdType}/${tenantId}`,
+      url: `${Api.thirdLogin}`,
+      params,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Authorization': 'Basic amVlY2ctY2xpZW50OnNlY3JldA=='
+      },
     },
     {
+      isTransformResponse: false,
       errorMessageMode: mode,
+      
     }
   );
 }

src/store/modules/user.ts

@@ -321,10 +321,11 @@ export const useUserStore = defineStore({
     ): Promise<any | null> {
       try {
         const { goHome = true, mode, ...ThirdLoginParams } = params;
+        ThirdLoginParams.grant_type = "social";
         const data = await thirdLogin(ThirdLoginParams, mode);
-        const { token } = data;
+        const { access_token } = data;
         // save token
-        this.setToken(token);
+        this.setToken(access_token);
         return this.afterLoginAction(goHome, data);
       } catch (error) {
         return Promise.reject(error);