-
+
@@ -528,6 +529,14 @@
loginType = 'username';
redirect = $router.query.redirect || '/';
+ smsEnabled = false;
+ emailEnabled = false;
+ regRequireEmail = false;
+ regRequirePhone = false;
+ codePlaceholder = $t('auth.email_or_phone');
+ countDown = 0;
+ timer = null;
+
signInForm = {
username: '',
password: '',
@@ -538,6 +547,7 @@
signUpForm = {
username: '',
email: '',
+ phone: '',
password: '',
confirmPassword: ''
};
@@ -547,6 +557,7 @@
signInLoading = false;
signUpLoading = false;
bubbles = [];
+ providers = [];
// Create background bubbles
createBubbles = () => {
@@ -597,8 +608,94 @@
};
// Handle OAuth login
- handleOAuth = (provider) => {
- $message.warning($t('auth.oauth_not_ready', { provider: provider }));
+ handleOAuth = async (provider) => {
+ try {
+ const res = await $axios.get('/api/auth/authorize/thirdparty', {
+ params: {
+ provider: provider,
+ redirect: redirect
+ }
+ });
+ if (res && res.auth_url) {
+ window.location.href = res.auth_url;
+ }
+ } catch (e) {
+ $message.error(e.message || $t('auth.oauth_failed'));
+ }
+ };
+
+ // Load configuration
+ loadConfig = async () => {
+ try {
+ const res = await $axios.get('/api/info');
+ if (res) {
+ if (res.oauth_providers) {
+ providers = res.oauth_providers;
+ }
+
+ // Update feature flags
+ smsEnabled = res.sms_enabled;
+ emailEnabled = res.email_enabled;
+ regRequireEmail = res.reg_require_email;
+ regRequirePhone = res.reg_require_phone;
+
+ // Update placeholder
+ if (smsEnabled && emailEnabled) {
+ codePlaceholder = $t('auth.email_or_phone');
+ } else if (smsEnabled) {
+ codePlaceholder = $t('auth.phone_placeholder');
+ } else if (emailEnabled) {
+ codePlaceholder = $t('auth.email');
+ }
+ }
+ } catch (e) {
+ console.error("Failed to load config:", e);
+ }
+ };
+// Send verification code
+ sendCode = async () => {
+ if (countDown > 0) return;
+
+ if (!signInForm.target) {
+ signInError = $t('auth.target_required');
+ return;
+ }
+
+ // Determine type
+ const type = /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(signInForm.target) ? 'email' : 'sms';
+
+ // Check if enabled
+ if (type === 'email' && !emailEnabled) {
+ signInError = $t('auth.email_disabled');
+ return;
+ }
+ if (type === 'sms' && !smsEnabled) {
+ signInError = $t('auth.sms_disabled');
+ return;
+ }
+
+ try {
+ await $env.$vbase.request('POST', '/api/verification/send', {
+ type: type,
+ target: signInForm.target,
+ purpose: 'login'
+ });
+
+ signInError = '';
+ $message.success($t('auth.code_sent'));
+ countDown = 60;
+ if (timer) clearInterval(timer);
+ timer = setInterval(() => {
+ countDown--;
+ if (countDown <= 0) {
+ clearInterval(timer);
+ timer = null;
+ }
+ }, 1000);
+
+ } catch (e) {
+ signInError = e.message || 'Failed to send code';
+ }
};
// Handle Sign In
@@ -610,48 +707,43 @@
signInLoading = true;
try {
- let loginData = {};
+ // Code login
+ if (loginType === 'code') {
+ if (!signInForm.target || !signInForm.code) {
+ throw new Error($t('auth.target_and_code_required'));
+ }
- if (loginType === 'username') {
- if (!signInForm.username || !signInForm.password) {
- signInError = $t('auth.fill_all_fields');
- signInLoading = false;
- return;
+ const type = /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(signInForm.target) ? 'email' : 'phone';
+ const data = await $env.$vbase.request('POST', '/api/auth/login/code', {
+ type: type,
+ target: signInForm.target,
+ code: signInForm.code
+ });
+
+ if (data && data.access_token) {
+ $env.$vbase.token = data.access_token;
+ if (data.refresh_token) $env.$vbase.refreshToken = data.refresh_token;
+ if (data.user) $env.$vbase.user = data.user;
+
+ $message.success($t('auth.login_success'));
+ $router.push(redirect);
+ } else {
+ throw new Error('Login failed: no token received');
}
- loginData = {
- username: signInForm.username,
- password: signInForm.password
- };
} else {
- if (!signInForm.target || !signInForm.code) {
- signInError = $t('auth.fill_all_fields');
- signInLoading = false;
- return;
+ // Username/Password login
+ if (!signInForm.username || !signInForm.password) {
+ throw new Error($t('auth.fill_all_fields'));
}
- const type = signInForm.target.includes('@') ? 'email' : 'phone';
- loginData = {
- type: type,
- target: signInForm.target,
- code: signInForm.code
- };
- }
- const response = await $axios.post('/api/auth/login', loginData);
+ const success = await $env.$vbase.login(signInForm.username, signInForm.password);
- if (response && response.access_token) {
- // Use vbase to handle login
- $env.$vbase.token = response.access_token;
- if (response.refresh_token) {
- $env.$vbase.refreshToken = response.refresh_token;
+ if (success) {
+ $message.success($t('auth.login_success'));
+ $router.push(redirect);
+ } else {
+ throw new Error($t('auth.login_failed'));
}
- if (response.user) {
- $env.$vbase.user = response.user;
- }
-
- $message.success($t('auth.login_success'));
- $router.push(redirect);
- } else {
- signInError = $t('auth.invalid_response');
}
} catch (error) {
signInError = error.message || $t('auth.login_failed');
@@ -691,20 +783,22 @@
signUpLoading = true;
try {
- const response = await $axios.post('/api/auth/register', {
+ // Use vbase.request for consistent API handling
+ const data = await $env.$vbase.request('POST', '/api/auth/register', {
username: signUpForm.username,
email: signUpForm.email || undefined,
+ phone: signUpForm.phone || undefined,
password: signUpForm.password
});
- if (response && response.access_token) {
- // Auto login after register
- $env.$vbase.token = response.access_token;
- if (response.refresh_token) {
- $env.$vbase.refreshToken = response.refresh_token;
+ if (data && data.access_token) {
+ // Auto login after register using vbase setters
+ $env.$vbase.token = data.access_token;
+ if (data.refresh_token) {
+ $env.$vbase.refreshToken = data.refresh_token;
}
- if (response.user) {
- $env.$vbase.user = response.user;
+ if (data.user) {
+ $env.$vbase.user = data.user;
}
$message.success($t('auth.register_success'));
@@ -722,6 +816,7 @@
// Initialize
createBubbles();
+ loadConfig();