diff --git a/src/views/auth-onboarding-view.jsx b/src/views/auth-onboarding-view.jsx index 10e7cb9e..36ca7a09 100644 --- a/src/views/auth-onboarding-view.jsx +++ b/src/views/auth-onboarding-view.jsx @@ -383,7 +383,7 @@ function VerificationButton({phone, scene = 'register', onChallenge, onError}) { // no phone-vs-username mode toggle. "Phone takes precedence" (per the spec text) is validation-only: // if a phone is filled it must be verified; the invite code is only required for a username-only // signup (matching the mock's original submit-time validation, now with real backend calls behind it). -function Register({errorText, errorLevel, onImRegisterRequest}) { +function Register({errorText, errorLevel, persist, onImRegisterRequest, onPersistenceChange}) { const [form, setForm] = React.useState({username: '', phone: '', code: '', password: '', invite: ''}); const [challengeId, setChallengeId] = React.useState(''); const [agreed, setAgreed] = React.useState(false); @@ -392,6 +392,19 @@ function Register({errorText, errorLevel, onImRegisterRequest}) { const change = key => e => setForm({...form, [key]: e.target.value}); const usingPhone = !!form.phone; + // Same silent "stay logged in" opt-in Login has (see its own copy of this effect for why there's + // no visible checkbox) -- missing here meant every account created by registering (as opposed to + // logging in) never had keep-logged-in/auth-token set, so handleLoginSuccessful() never persisted + // the session: the very next refresh silently lost myUserId with no redirect to the login page + // and no error, just a permanently empty messages-home shell. Every fresh registration hit this on + // its first reload. + React.useEffect(() => { + if (!persist) { + onPersistenceChange(true); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + // onImRegisterRequest (tinode-web.jsx's handleImRegisterRequest -> a WS connect+createAccountBasic // chain) isn't awaited and doesn't return a promise -- on the username/invite-code path (no // verifyRegisterCode await ahead of it) `submit` returns and its `finally` clears `submitting` @@ -795,7 +808,8 @@ export default function AuthOnboardingView({ errorText={errorText} errorLevel={errorLevel} onLoginRequest={onLoginRequest} onPersistenceChange={onPersistenceChange} onError={onError} />; case 'enterprise-register': return ; case 'enterprise-feedback': return ; - case 'register': return ; + case 'register': return ; case 'reset': return ; case 'identity-check': return ; case 'realname': return ; diff --git a/src/views/tinode-web.jsx b/src/views/tinode-web.jsx index 3ddab793..1651048f 100644 --- a/src/views/tinode-web.jsx +++ b/src/views/tinode-web.jsx @@ -177,7 +177,8 @@ const CTRL_ERROR_TEXT_CN = { 'authentication required': '请先登录', 'unknown authentication scheme': '登录方式不受支持,请刷新页面重试', 'policy violation': '当前操作不符合安全策略要求', - 'permission denied': '没有权限执行此操作,请重新登录' + 'permission denied': '没有权限执行此操作,请重新登录', + 'internal error': '服务器繁忙,请稍后重试' }; function translateCtrlError(err) { const raw = err && err.message; @@ -1517,7 +1518,15 @@ class TinodeWeb extends React.Component { this.handleLoginSuccessful(this); } }).catch(err => { - this.handleError(err.message, 'err'); + // Registration goes over the native WS {acc} protocol, not REST, so im-api.js's + // REASON_MESSAGES translation table (REST-only) never sees this error -- it was showing + // raw SDK text like "internal error (500)" verbatim (confirmed live: retrying a phone + // number that's already registered). CTRL_ERROR_TEXT_CN already translates this same class + // of {ctrl} error for login; reused here with a registration-appropriate fallback instead + // of loginErrorMessage's own (its 401/403 fallback is "账号或密码错误", which doesn't fit a + // failed registration). + const known = translateCtrlError(err); + this.handleError(known || (err && err.message) || '注册失败,请稍后重试', 'err'); }); }