@@ -26,10 +26,12 @@ export function setupLoading() {
${$t('system.title')}
`;
+}
+export function setupLoading() {
const app = document.getElementById('app');
if (app) {
- app.innerHTML = loading;
+ app.innerHTML = loading();
}
}
diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts
index 8d4098cc..90a75bbc 100644
--- a/src/router/elegant/imports.ts
+++ b/src/router/elegant/imports.ts
@@ -20,6 +20,7 @@ export const views: Record
Promise import("@/views/_builtin/500/index.vue"),
"iframe-page": () => import("@/views/_builtin/iframe-page/[url].vue"),
login: () => import("@/views/_builtin/login/index.vue"),
+ "social-callback": () => import("@/views/_builtin/social-callback/index.vue"),
home: () => import("@/views/home/index.vue"),
"monitor_login-infor": () => import("@/views/monitor/login-infor/index.vue"),
"monitor_oper-log": () => import("@/views/monitor/oper-log/index.vue"),
diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts
index 5baca799..cca82f82 100644
--- a/src/router/elegant/routes.ts
+++ b/src/router/elegant/routes.ts
@@ -104,6 +104,17 @@ export const generatedRoutes: GeneratedRoute[] = [
}
]
},
+ {
+ name: 'social-callback',
+ path: '/social-callback',
+ component: 'layout.blank$view.social-callback',
+ meta: {
+ title: 'social-callback',
+ i18nKey: 'route.social-callback',
+ constant: true,
+ hideInMenu: true
+ }
+ },
{
name: 'system',
path: '/system',
diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts
index 6f73346f..dcc5979e 100644
--- a/src/router/elegant/transform.ts
+++ b/src/router/elegant/transform.ts
@@ -172,6 +172,7 @@ const routeMap: RouteMap = {
"monitor": "/monitor",
"monitor_login-infor": "/monitor/login-infor",
"monitor_oper-log": "/monitor/oper-log",
+ "social-callback": "/social-callback",
"system": "/system",
"system_client": "/system/client",
"system_config": "/system/config",
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 4a1afda8..fdc4afc0 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -100,6 +100,18 @@ const dynamicConstantRoutes: ElegantRoute[] = [
keepAlive: true,
icon: 'material-symbols:iframe-outline'
}
+ },
+ {
+ name: 'social-callback',
+ path: '/social-callback',
+ component: 'layout.blank$view.social-callback',
+ meta: {
+ title: 'social-callback',
+ i18nKey: 'route.social-callback',
+ constant: true,
+ hideInMenu: true,
+ icon: 'simple-icons:authy'
+ }
}
];
diff --git a/src/service/api/auth.ts b/src/service/api/auth.ts
index 4845a35e..2ef50b66 100644
--- a/src/service/api/auth.ts
+++ b/src/service/api/auth.ts
@@ -35,6 +35,15 @@ export function fetchLogin(data: Api.Auth.PwdLoginForm) {
});
}
+/** social login callback */
+export function fetchSocialLoginCallback(data: Api.Auth.SocialLoginForm) {
+ return request({
+ url: '/auth/social/callback',
+ method: 'post',
+ data
+ });
+}
+
/** Register */
export function fetchRegister(data: Api.Auth.RegisterForm) {
return request({
diff --git a/src/service/api/system/index.ts b/src/service/api/system/index.ts
index 8e4f2c3e..1c22d4c5 100644
--- a/src/service/api/system/index.ts
+++ b/src/service/api/system/index.ts
@@ -4,3 +4,4 @@ export * from './user';
export * from './dept';
export * from './role';
export * from './post';
+export * from './social';
diff --git a/src/service/api/system/social.ts b/src/service/api/system/social.ts
new file mode 100644
index 00000000..91683e21
--- /dev/null
+++ b/src/service/api/system/social.ts
@@ -0,0 +1,13 @@
+import { request } from '../../request';
+
+/** 绑定账户 */
+export function fetchSocialAuthBinding(source: Api.System.SocialSource, tenantId: string = '000000') {
+ return request({
+ url: `/auth/binding/${source}`,
+ method: 'get',
+ params: {
+ tenantId,
+ domain: window.location.host
+ }
+ });
+}
diff --git a/src/service/request/index.ts b/src/service/request/index.ts
index cedaea1c..e640b1d8 100644
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@@ -136,6 +136,7 @@ export const request = createFlatRequest {
*
* @param [redirect=true] Whether to redirect after login. Default is `true`
*/
- async function login(loginForm: Api.Auth.PwdLoginForm, redirect = true) {
+ async function login(loginForm: Api.Auth.PwdLoginForm | Api.Auth.SocialLoginForm, redirect = true) {
startLoading();
const { VITE_APP_CLIENT_ID } = import.meta.env;
const loginData: Api.Auth.PwdLoginForm = {
...loginForm,
+ tenantId: loginForm.tenantId ?? '000000',
clientId: VITE_APP_CLIENT_ID!,
- grantType: 'password'
+ grantType: loginForm.grantType ?? 'password'
};
const { data: loginToken, error } = await fetchLogin(loginData);
diff --git a/src/typings/api/api.d.ts b/src/typings/api/api.d.ts
index 9428781c..62cc4f75 100644
--- a/src/typings/api/api.d.ts
+++ b/src/typings/api/api.d.ts
@@ -114,6 +114,16 @@ declare namespace Api {
password?: string;
}
+ /** social login form */
+ interface SocialLoginForm extends LoginForm {
+ /** 授权码 */
+ socialCode?: string;
+ /** 授权状态 */
+ socialState?: string;
+ /** 来源 */
+ source?: string;
+ }
+
/** register form */
interface RegisterForm extends LoginForm {
/** 用户名 */
diff --git a/src/typings/api/system.api.d.ts b/src/typings/api/system.api.d.ts
index a3937313..2a39c2cd 100644
--- a/src/typings/api/system.api.d.ts
+++ b/src/typings/api/system.api.d.ts
@@ -594,5 +594,23 @@ declare namespace Api {
/** client list */
type ClientList = Api.Common.PaginatingQueryRecord;
+
+ /** social source */
+ type SocialSource =
+ | 'maxkey'
+ | 'topiam'
+ | 'qq'
+ | 'weibo'
+ | 'gitee'
+ | 'dingtalk'
+ | 'baidu'
+ | 'csdn'
+ | 'coding'
+ | 'oschina'
+ | 'alipay_wallet'
+ | 'wechat_open'
+ | 'wechat_mp'
+ | 'wechat_enterprise'
+ | 'gitlab';
}
}
diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts
index 729cc6f2..af5788cd 100644
--- a/src/typings/elegant-router.d.ts
+++ b/src/typings/elegant-router.d.ts
@@ -26,6 +26,7 @@ declare module "@elegant-router/types" {
"monitor": "/monitor";
"monitor_login-infor": "/monitor/login-infor";
"monitor_oper-log": "/monitor/oper-log";
+ "social-callback": "/social-callback";
"system": "/system";
"system_client": "/system/client";
"system_config": "/system/config";
@@ -78,6 +79,7 @@ declare module "@elegant-router/types" {
| "iframe-page"
| "login"
| "monitor"
+ | "social-callback"
| "system"
| "tool"
>;
@@ -101,6 +103,7 @@ declare module "@elegant-router/types" {
| "500"
| "iframe-page"
| "login"
+ | "social-callback"
| "home"
| "monitor_login-infor"
| "monitor_oper-log"
diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue
index 82484930..ea5543f4 100644
--- a/src/views/_builtin/login/modules/pwd-login.vue
+++ b/src/views/_builtin/login/modules/pwd-login.vue
@@ -4,6 +4,7 @@ import type { SelectOption } from 'naive-ui';
import { useLoading } from '@sa/hooks';
import { fetchCaptchaCode, fetchTenantList } from '@/service/api';
// import { fetchGetConfigDetail } from '@/service/api/system/config';
+import { fetchSocialAuthBinding } from '@/service/api/system';
import { useAuthStore } from '@/store/modules/auth';
import { useRouterPush } from '@/hooks/common/router';
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
@@ -111,8 +112,10 @@ handleLoginRember();
// handleRegister();
-function handleSocialLogin(type: string) {
- console.log(type);
+async function handleSocialLogin(type: Api.System.SocialSource) {
+ const { data, error } = await fetchSocialAuthBinding(type, model.tenantId);
+ if (error) return;
+ window.location.href = data;
}
@@ -151,7 +154,8 @@ function handleSocialLogin(type: string) {
-
+
+