forked from wangziqi/gongxue-base
fix: resolve tenant before SMS login
This commit is contained in:
@@ -3,7 +3,7 @@ import { Button, Input, Text, View } from '@tarojs/components';
|
|||||||
import { appEnv, ensureRuntimeConfigLoaded, type Portal } from '@/env';
|
import { appEnv, ensureRuntimeConfigLoaded, type Portal } from '@/env';
|
||||||
import { getTenantContext } from '@/services/api';
|
import { getTenantContext } from '@/services/api';
|
||||||
import { loadCurrentUser, sendSmsCode, verifySmsCode } from '@/services/auth';
|
import { loadCurrentUser, sendSmsCode, verifySmsCode } from '@/services/auth';
|
||||||
import { currentRouteParams, landingPath, redirectAfterLogin } from '@/services/routeGuard';
|
import { currentRouteParams, ensureTenantResolved, landingPath, redirectAfterLogin } from '@/services/routeGuard';
|
||||||
import '../student.css';
|
import '../student.css';
|
||||||
|
|
||||||
export default function StudentLoginPage() {
|
export default function StudentLoginPage() {
|
||||||
@@ -22,7 +22,8 @@ export default function StudentLoginPage() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
ensureRuntimeConfigLoaded()
|
ensureRuntimeConfigLoaded()
|
||||||
.then(() => {
|
.then(async () => {
|
||||||
|
await ensureTenantResolved();
|
||||||
setPortal(appEnv.portal);
|
setPortal(appEnv.portal);
|
||||||
setRuntimeReady(true);
|
setRuntimeReady(true);
|
||||||
if (params.reason) {
|
if (params.reason) {
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ export async function sendSmsCode(phone: string, purpose: 'login' | 'bind_phone'
|
|||||||
return apiRequest<ApiEnvelope<never>>('/api/auth/sms/send', {
|
return apiRequest<ApiEnvelope<never>>('/api/auth/sms/send', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: { phone, purpose },
|
body: { phone, purpose },
|
||||||
tenantId: null,
|
|
||||||
authMode: 'none',
|
authMode: 'none',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user