Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat: implement email code login and reset password (#20036)
ecmadao82de99fca5d0
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex b1dca7f91d..1ee323b8d6 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -14035,6 +14035,17 @@ components:description: |-6-digit code from email for passwordless login/signup.Pairs with `email`. Mutually exclusive with `password` and `idp_name`.+ workspace:+ type:+ - string+ - "null"+ title: workspace+ description: |-+ Preferred workspace to land in after login. If the user is a member of this+ workspace, the token is issued for it; otherwise falls back to the default+ resolution (last login workspace → first membership). Typically populated+ from the ?workspace= query parameter in invite links.+ Format: workspaces/{workspace}title: LoginRequestadditionalProperties: falsebytebase.v1.LoginResponse:@@ -16070,6 +16081,12 @@ components:type: booleantitle: allow_email_code_signindescription: Whether email + 6-digit code signin is enabled for this workspace.+ passwordResetEnabled:+ type: boolean+ title: password_reset_enabled+ description: |-+ Whether password reset via email is available for this workspace.+ True when the workspace (or deployment) has an email setting configured.title: RestrictionadditionalProperties: falsebytebase.v1.ReviewConfig:diff --git a/backend/api/v1/audit.go b/backend/api/v1/audit.goindex 1c551b1f16..8f019903ed 100644--- a/backend/api/v1/audit.go+++ b/backend/api/v1/audit.go@@ -557,6 +557,9 @@ func redactLoginRequest(r *v1pb.LoginRequest) *v1pb.LoginRequest {if r.MfaTempToken != nil {r.MfaTempToken = &maskedString}+ if r.EmailCode != nil {+ r.EmailCode = &maskedString+ }if r.IdpContext != nil {r.IdpContext = nil}diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex 26c1747152..1d972481c9 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -2,7 +2,11 @@ package v1import ("context"+ "crypto/hmac"+ "crypto/rand"+ "crypto/sha256""crypto/subtle"+ "encoding/hex""fmt""log/slog""os"@@ -31,11 +35,17 @@ import ("github.com/bytebase/bytebase/backend/plugin/idp/oauth2""github.com/bytebase/bytebase/backend/plugin/idp/oidc""github.com/bytebase/bytebase/backend/plugin/idp/wif"+ "github.com/bytebase/bytebase/backend/plugin/mailer""github.com/bytebase/bytebase/backend/store""github.com/bytebase/bytebase/backend/utils")const (+ emailCodeLength = 6+ emailCodeExpiry = 10 * time.Minute+ emailCodeMaxAttempts = 5+ emailCodeResendCooldown = 60 * time.Second+// mfaTempTokenDuration is the duration for MFA temporary tokens.// Following industry standards (Okta: 5 minutes, Auth0: 10 minutes, AWS Cognito: 3 minutes).// A short duration reduces the attack window for TOTP brute-force attempts.@@ -97,7 +107,8 @@ func (s *AuthService) Login(ctx context.Context, req *connect.Request[v1pb.Login// 2. Resolve workspace early so all subsequent checks can use it.// Login is allow_without_credential, so workspace is NOT in the context from auth middleware.- workspaceID, err := s.resolveWorkspaceForLogin(ctx, loginUser)+ preferredWS, _ := parseOptionalWorkspace(request.Workspace)+ workspaceID, err := s.resolveWorkspaceForLogin(ctx, loginUser, preferredWS)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to resolve workspace"))}@@ -132,10 +143,6 @@ func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMesreturn false}- if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_PASSWORD_RESTRICTIONS); err != nil {- return false- }-restriction, err := getAccountRestriction(ctx,s.store,@@ -148,16 +155,25 @@ func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMesreturn false}+ // Don't need to reset password if password signin is not allowed.+ if restriction.DisallowPasswordSignin {+ return false+ }+if user.Profile.LastLoginTime == nil {if !restriction.PasswordRestriction.GetRequireResetPasswordForFirstLogin() {return false}iamPolicy, err := s.store.GetWorkspaceIamPolicy(ctx, workspaceID)if err != nil {- slog.Error("failed to get workspace IAM policy", log.BBError(err))+ slog.Error("failed to get workspace IAM policy", log.BBError(err), slog.String("workspace", workspaceID))+ return false+ }+ count, err := countUsersInIamPolicy(ctx, s.store, workspaceID, iamPolicy.Policy, s.profile.SaaS)+ if err != nil {+ slog.Error("failed to count users in workspace IAM policy", log.BBError(err), slog.String("workspace", workspaceID))return false}- count, _ := countUsersInIamPolicy(ctx, s.store, workspaceID, iamPolicy.Policy, s.profile.SaaS)// The 1st workspace admin login don't need to reset the passwordreturn count > 1}@@ -203,56 +219,39 @@ func (s *AuthService) Signup(ctx context.Context, req *connect.Request[v1pb.Signreturn nil, connect.NewError(connect.CodeAlreadyExists, errors.Errorf("email %s is already registered", request.Email))}- // Step 1: Resolve workspace — check if user belongs to an existing workspace.- existingWS, err := s.store.FindWorkspace(ctx, &store.FindWorkspaceMessage{- Email: request.Email,- IncludeAllUser: !s.profile.SaaS,- })+ // Resolve the target workspace (read-only) so we can check restrictions BEFORE+ // any write — otherwise a rejected signup would leave an orphan user/workspace behind.+ targetWorkspaceID, _, err := s.resolveWorkspaceIDByEmail(ctx, request.Email)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspaces"))- }-- var workspaceID string- // Announce the workspace on every exit path so early-failure cases- // (DisallowSignup, password restriction, CreateUser failure, …) still- // produce audit entries for invited/self-hosted signups where the- // workspace is already resolved. The setter no-ops on empty input, so- // SaaS new-workspace signups that fail before workspace creation stay- // (correctly) unaudited — there's genuinely no workspace to attribute- // them to.- defer func() { common.SetAuditWorkspaceID(ctx, workspaceID) }()-- isMember := existingWS != nil- if isMember {- workspaceID = existingWS.ResourceID- } else if !s.profile.SaaS {- // Self-hosted: join the existing workspace (will be added as member in step 3).- // No workspace membership found. Check if any workspace exists.- existingWsID, err := s.store.GetWorkspaceID(ctx)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check workspace"))- }-- workspaceID = existingWsID+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to resolve target workspace"))}+ // Announce the workspace on every exit path so denied signups (DisallowSignup,+ // password restriction) still produce audit entries. Uses targetWorkspaceID (resolved+ // before any writes) rather than the provisioned workspaceID.+ defer func() { common.SetAuditWorkspaceID(ctx, targetWorkspaceID) }()restriction, err := getAccountRestriction(ctx,s.store,s.licenseService,s.profile.SaaS,- workspaceID,+ targetWorkspaceID,)if err != nil {return nil, err}if restriction.DisallowSignup {- return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("sign up is disallowed for this workspace %v", workspaceID))+ return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("sign up is disallowed for this workspace %v", targetWorkspaceID))}if err := validatePasswordWithRestriction(request.Password, convertToStorePasswordRestriction(restriction.PasswordRestriction)); err != nil {return nil, err}+ workspaceID, err := s.provisionWorkspaceForNewUser(ctx, request.Email)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to provision workspace"))+ }+passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.Password), bcrypt.DefaultCost)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to generate password hash"))@@ -269,34 +268,7 @@ func (s *AuthService) Signup(ctx context.Context, req *connect.Request[v1pb.Signreturn nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create user"))}- // Step 3: Resolve workspace if not yet assigned.- if workspaceID == "" {- // Create a new workspace with the user as admin.- wsID, err := common.RandomString(16)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to generate workspace ID"))- }- ws, err := s.store.CreateWorkspace(ctx, &store.WorkspaceMessage{- ResourceID: wsID,- Payload: &storepb.WorkspacePayload{Title: "Default workspace"},- AdditionalSettings: s.getAdditionalWorkspaceSettings(),- }, request.Email)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create workspace"))- }- workspaceID = ws.ResourceID- } else if !isMember {- // Self-hosted: add user as workspace member to the existing workspace.- if _, err := s.store.PatchWorkspaceIamPolicy(ctx, &store.PatchIamPolicyMessage{- Workspace: workspaceID,- Member: common.FormatUserEmail(request.Email),- Roles: []string{common.FormatRole(store.WorkspaceMemberRole)},- }); err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to add user to workspace"))- }- }-- // Step 4: Generate token and finalize login.+ // Step 3: Generate token and finalize login.tokenDuration := auth.GetAccessTokenDuration(ctx, s.store, s.licenseService, workspaceID)token, err := auth.GenerateAccessToken(user.Email, workspaceID, s.secret, tokenDuration)if err != nil {@@ -347,6 +319,97 @@ func (s *AuthService) Signup(ctx context.Context, req *connect.Request[v1pb.Signreturn resp, nil}+// resolveWorkspaceIDByEmail determines which workspace a signing-up email would+// land in WITHOUT mutating anything. Used by signup/signup-via-code to look up the+// applicable workspace restriction before creating a user or provisioning workspaces, so+// a rejected signup doesn't leave orphan state behind. Returns empty for SaaS brand-new+// signup (no pre-invite, no workspace) — the caller should apply default restriction.+// resolveWorkspaceIDByEmail returns (workspaceID, isMember).+// isMember is true when the user already has an IAM binding in the returned workspace.+// When false, the returned workspaceID is the self-host singleton (user needs to be added).+func (s *AuthService) resolveWorkspaceIDByEmail(ctx context.Context, email string) (string, bool, error) {+ existingWS, err := s.store.FindWorkspace(ctx, &store.FindWorkspaceMessage{+ Email: email,+ IncludeAllUser: !s.profile.SaaS,+ })+ if err != nil {+ return "", false, errors.Wrapf(err, "failed to find workspaces")+ }+ if existingWS != nil {+ return existingWS.ResourceID, true, nil+ }+ if !s.profile.SaaS {+ singletonID, err := s.store.GetWorkspaceID(ctx)+ if err != nil {+ return "", false, errors.Wrapf(err, "failed to resolve singleton workspace")+ }+ return singletonID, false, nil+ }+ return "", false, nil+}++// provisionWorkspaceForNewUser returns a workspace ID for a freshly-created user.+// If the email was pre-invited to existing workspaces (via IAM), returns the first one.+// Otherwise creates a new workspace (SaaS: per-user; self-hosted: joins the singleton).+// Called by both the Signup RPC and the email-code signup branch of Login.+func (s *AuthService) provisionWorkspaceForNewUser(ctx context.Context, email string) (string, error) {+ // Step 1: Resolve the target workspace. isMember indicates whether the user already has+ // an IAM binding. For pre-invited users we must NOT patch IAM — PatchWorkspaceIamPolicy+ // is a set-replacement that would downgrade an admin to member.+ workspaceID, isMember, err := s.resolveWorkspaceIDByEmail(ctx, email)+ if err != nil {+ return "", err+ }++ if workspaceID != "" {+ if !s.profile.SaaS && !isMember {+ // Self-hosted, new user joining the singleton workspace — add as member.+ if _, err := s.store.PatchWorkspaceIamPolicy(ctx, &store.PatchIamPolicyMessage{+ Workspace: workspaceID,+ Member: common.FormatUserEmail(email),+ Roles: []string{common.FormatRole(store.WorkspaceMemberRole)},+ }); err != nil {+ return "", errors.Wrapf(err, "failed to add user to workspace")+ }+ }+ return workspaceID, nil+ }++ // Step 2: No existing workspace — create a new one with the user as admin.+ wsID, err := common.RandomString(16)+ if err != nil {+ return "", errors.Wrap(err, "failed to generate workspace ID")+ }+ ws, err := s.store.CreateWorkspace(ctx, &store.WorkspaceMessage{+ ResourceID: wsID,+ Payload: &storepb.WorkspacePayload{Title: "Default workspace"},+ AdditionalSettings: s.getAdditionalWorkspaceSettings(),+ }, email)+ if err != nil {+ return "", errors.Wrapf(err, "failed to create workspace")+ }++ // TODO(ed): check this later.+ // When EMAIL_CONFIG is set, enable email code signin for the new workspace.+ if os.Getenv("EMAIL_CONFIG") != "" {+ profile, err := s.store.GetWorkspaceProfileSetting(ctx, ws.ResourceID)+ if err != nil {+ slog.Warn("failed to get workspace profile for email code signin patch", log.BBError(err))+ } else {+ profile.AllowEmailCodeSignin = true+ if _, err := s.store.UpsertSetting(ctx, &store.SettingMessage{+ Name: storepb.SettingName_WORKSPACE_PROFILE,+ Workspace: ws.ResourceID,+ Value: profile,+ }); err != nil {+ slog.Warn("failed to enable allow_email_code_signin for new workspace", log.BBError(err))+ }+ }+ }++ return ws.ResourceID, nil+}+// Logout is the auth logout method.func (s *AuthService) Logout(ctx context.Context, req *connect.Request[v1pb.LogoutRequest]) (*connect.Response[emptypb.Empty], error) {// Delete refresh token from database if present@@ -603,7 +666,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.}// User login through global SSO, then we should auth-resolve the workspace id.if user != nil && workspaceID == "" {- wsID, err := s.resolveWorkspaceForLogin(ctx, user)+ wsID, err := s.resolveWorkspaceForLogin(ctx, user, "")if err != nil {slog.Warn("failed to resolve workspace", slog.String("user", user.Email), log.BBError(err))}@@ -881,6 +944,10 @@ func (s *AuthService) authenticateLogin(ctx context.Context, request *v1pb.Loginreturn s.getOrCreateUserWithIDP(ctx, request)}+ if request.EmailCode != nil && *request.EmailCode != "" {+ return s.authenticateEmailCodeLogin(ctx, request)+ }+return s.getAndVerifyUser(ctx, request)}@@ -938,20 +1005,26 @@ func (s *AuthService) validateLoginPermissions(ctx context.Context, user *store.return nil}- // Check disallow password signin when not through IDP+ restriction, err := getAccountRestriction(+ ctx,+ s.store,+ s.licenseService,+ s.profile.SaaS,+ workspaceID,+ )+ if err != nil {+ return err+ }if request.GetIdpName() == "" {- restriction, err := getAccountRestriction(- ctx,- s.store,- s.licenseService,- s.profile.SaaS,- workspaceID,- )- if err != nil {- return err+ if request.Password != "" {+ if restriction.DisallowPasswordSignin {+ return connect.NewError(connect.CodePermissionDenied, errors.Errorf("password signin is disallowed"))+ }}- if restriction.DisallowPasswordSignin {- return connect.NewError(connect.CodePermissionDenied, errors.Errorf("password signin is disallowed"))+ if request.EmailCode != nil && *request.EmailCode != "" {+ if !restriction.AllowEmailCodeSignin {+ return connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("email code login is not enabled for this workspace"))+ }}}@@ -1004,9 +1077,13 @@ func (s *AuthService) generateLoginToken(ctx context.Context, user *store.UserMe// resolveWorkspaceForLogin determines the workspace for a login token.// For SA/WI: looks up the account record to get workspace.-// For END_USER: prefers the last login workspace (from user profile) if still valid,-// otherwise falls back to the first workspace from IAM membership.-func (s *AuthService) resolveWorkspaceForLogin(ctx context.Context, user *store.UserMessage) (string, error) {+// For END_USER: resolution order:+// 1. preferredWorkspaceID (from the login request's ?workspace= hint, e.g. invite links)+// 2. Last login workspace (from user profile)+// 3. First workspace from IAM membership+//+// Each candidate is validated for membership before use.+func (s *AuthService) resolveWorkspaceForLogin(ctx context.Context, user *store.UserMessage, preferredWorkspaceID string) (string, error) {// Determine member name format based on user type.switch user.Type {case storepb.PrincipalType_SERVICE_ACCOUNT:@@ -1022,6 +1099,22 @@ func (s *AuthService) resolveWorkspaceForLogin(ctx context.Context, user *store.case storepb.PrincipalType_END_USER:includeAllUser := !s.profile.SaaS+ // Prefer the workspace from the login request hint (e.g. invite link).+ if preferredWorkspaceID != "" {+ ws, err := s.store.FindWorkspace(ctx, &store.FindWorkspaceMessage{+ WorkspaceID: &preferredWorkspaceID,+ Email: user.Email,+ IncludeAllUser: includeAllUser,+ })+ if err != nil {+ return "", errors.Wrap(err, "failed to find workspace")+ }+ if ws != nil {+ return ws.ResourceID, nil+ }+ // Not a member of preferred workspace — fall through.+ }+// Prefer the last login workspace if it's still valid.if lastWS := user.Profile.GetLastLoginWorkspace(); lastWS != "" {ws, err := s.store.FindWorkspace(ctx, &store.FindWorkspaceMessage{@@ -1369,9 +1462,16 @@ func getAccountRestriction(restriction := &v1pb.Restriction{DisallowSignup: false,DisallowPasswordSignin: false,+ AllowEmailCodeSignin: false,+ PasswordResetEnabled: false,PasswordRestriction: defaultPasswordRestriction,}+ emailSetting, err := resolvePreLoginEmailSetting(ctx, stores, workspaceID)+ if err != nil {+ return nil, err+ }+if workspaceID != "" {setting, err := stores.GetWorkspaceProfileSetting(ctx, workspaceID)if err != nil {@@ -1382,6 +1482,7 @@ func getAccountRestriction(PasswordRestriction: convertToV1PasswordRestriction(setting.GetPasswordRestriction()),DisallowSignup: setting.DisallowSignup,DisallowPasswordSignin: setting.DisallowPasswordSignin,+ AllowEmailCodeSignin: setting.AllowEmailCodeSignin,}// Override if features are not enabled@@ -1400,11 +1501,420 @@ func getAccountRestriction(if saas {restriction.DisallowSignup = truerestriction.DisallowPasswordSignin = true+ restriction.AllowEmailCodeSignin = true+ }++ if !restriction.DisallowPasswordSignin {+ restriction.PasswordResetEnabled = emailSetting != nil+ }+ if emailSetting == nil {+ restriction.AllowEmailCodeSignin = false}return restriction, nil}+// RequestPasswordReset sends a password reset email. Always returns success to avoid leaking email existence.+func (s *AuthService) RequestPasswordReset(ctx context.Context, req *connect.Request[v1pb.RequestPasswordResetRequest]) (*connect.Response[emptypb.Empty], error) {+ email := strings.ToLower(strings.TrimSpace(req.Msg.Email))+ if email == "" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("email is required"))+ }++ // Send synchronously, but swallow errors to avoid email enumeration — a fast silent+ // "success" for unknown emails must be indistinguishable from an SMTP failure for+ // known ones. Errors are logged server-side for operator visibility.+ if err := s.sendEmailVerificationCode(+ ctx,+ req.Msg.Workspace,+ email,+ storepb.EmailVerificationCodePurpose_PASSWORD_RESET,+ "[Bytebase] Reset your password",+ "Hi,\n\nYour password reset code is: %s\n\nThis code expires in %d minutes. If you didn't request this, you can safely ignore this email.\n\n— Bytebase",+ ); err != nil {+ slog.Warn("failed to send password reset email", slog.String("to", email), log.BBError(err))+ }++ return connect.NewResponse(&emptypb.Empty{}), nil+}++// ResetPassword verifies the 6-digit code and updates the user's password.+// Also revokes all refresh tokens to force re-login.+func (s *AuthService) ResetPassword(ctx context.Context, req *connect.Request[v1pb.ResetPasswordRequest]) (*connect.Response[emptypb.Empty], error) {+ email := strings.ToLower(strings.TrimSpace(req.Msg.Email))+ if email == "" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("email is required"))+ }+ if req.Msg.Code == "" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("code is required"))+ }+ if req.Msg.NewPassword == "" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("new_password is required"))+ }++ codeRow, err := s.verifyEmailCode(ctx, email, storepb.EmailVerificationCodePurpose_PASSWORD_RESET, req.Msg.Code)+ if err != nil {+ return nil, err+ }++ user, err := s.store.GetUserByEmail(ctx, email)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find user"))+ }+ if user == nil {+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("user not found"))+ }++ // Validate the user is a member of the workspace captured at send time.+ // Reject if forged — prevents bypassing password policy via a weaker workspace.+ if codeRow.Workspace != "" {+ ws, err := s.store.FindWorkspace(ctx, &store.FindWorkspaceMessage{+ WorkspaceID: &codeRow.Workspace,+ Email: email,+ IncludeAllUser: !s.profile.SaaS,+ })+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to verify workspace membership"))+ }+ if ws == nil {+ return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("user is not a member of the workspace"))+ }+ }+ restriction, err := getAccountRestriction(ctx, s.store, s.licenseService, s.profile.SaaS, codeRow.Workspace)+ if err != nil {+ return nil, err+ }+ if err := validatePasswordWithRestriction(req.Msg.NewPassword, convertToStorePasswordRestriction(restriction.PasswordRestriction)); err != nil {+ return nil, err+ }++ passwordHash, err := bcrypt.GenerateFromPassword([]byte(req.Msg.NewPassword), bcrypt.DefaultCost)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to hash password"))+ }+ passwordHashStr := string(passwordHash)+ if _, err := s.store.UpdateUser(ctx, user, &store.UpdateUserMessage{+ Email: &user.Email,+ PasswordHash: &passwordHashStr,+ }); err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to update password"))+ }++ if err := s.store.DeleteWebRefreshTokensByUser(ctx, user.Email); err != nil {+ slog.Warn("failed to revoke refresh tokens after password reset", log.BBError(err))+ }++ return connect.NewResponse(&emptypb.Empty{}), nil+}++// parseOptionalWorkspace extracts the workspace ID from an optional "workspaces/{id}"+// resource name. Returns empty when the caller has no workspace context yet+// (SaaS brand-new signup flow).+func parseOptionalWorkspace(name *string) (string, error) {+ if name == nil || *name == "" {+ return "", nil+ }+ return common.GetWorkspaceID(*name)+}++// generateEmailCode returns a cryptographically-random 6-digit numeric code.+func generateEmailCode() (string, error) {+ const digits = "0123456789"+ b := make([]byte, emailCodeLength)+ if _, err := rand.Read(b); err != nil {+ return "", err+ }+ for i := range b {+ b[i] = digits[int(b[i])%len(digits)]+ }+ return string(b), nil+}++// hashEmailCode returns HMAC-SHA256(code) hex-encoded, keyed with the server's auth secret.+// HMAC with a server-side secret (vs. bare SHA-256) prevents offline brute force of the+// 10^6-size code space if the DB is ever compromised — the attacker would also need the+// auth secret to verify candidate codes.+func (s *AuthService) hashEmailCode(code string) string {+ mac := hmac.New(sha256.New, []byte(s.secret))+ mac.Write([]byte(code))+ return hex.EncodeToString(mac.Sum(nil))+}++// SendEmailLoginCode sends a 6-digit verification code. Always returns success+// (no email enumeration). Rate limit: 60-sec resend cooldown enforced atomically+// via the store — effective cap ≈ 60 sends/hour/email.+func (s *AuthService) SendEmailLoginCode(ctx context.Context, req *connect.Request[v1pb.SendEmailLoginCodeRequest]) (*connect.Response[emptypb.Empty], error) {+ email := strings.ToLower(strings.TrimSpace(req.Msg.Email))+ if email == "" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("email is required"))+ }+ workspaceID, err := parseOptionalWorkspace(req.Msg.Workspace)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }++ // Gate on AllowEmailCodeSignin — no point emailing a code the workspace won't accept.+ // getAccountRestriction handles all cases (including empty workspace for brand-new SaaS+ // signup, where it resolves via EMAIL_CONFIG + SaaS override).+ restriction, err := getAccountRestriction(ctx, s.store, s.licenseService, s.profile.SaaS, workspaceID)+ if err != nil {+ return nil, err+ }+ if !restriction.AllowEmailCodeSignin {+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("email code login is not enabled for this workspace"))+ }++ // Send synchronously so the caller learns about actionable failures (missing EMAIL+ // setting, SMTP unreachable, etc.). No enumeration risk here: LOGIN always attempts to+ // send regardless of whether the email exists (sign-up is handled on verify).+ if err := s.sendEmailVerificationCode(+ ctx,+ req.Msg.Workspace,+ email,+ storepb.EmailVerificationCodePurpose_LOGIN,+ "[Bytebase] Your sign-in code",+ "Hi,\n\nYour sign-in code is: %s\n\nThis code expires in %d minutes. If you didn't request this, you can safely ignore this email.\n\n— Bytebase",+ ); err != nil {+ return nil, connect.NewError(connect.CodeInternal, err)+ }++ return connect.NewResponse(&emptypb.Empty{}), nil+}++// resolvePreLoginEmailSetting returns the EMAIL setting to use for unauthenticated flows+// (email-code sign-in, password reset). Resolution order:+// 1. If `workspaceID` is provided, use that workspace's EMAIL setting. The frontend+// resolves the workspace (from the route query or actuator context) and always passes+// it when one exists — self-host, multi-workspace SaaS, and pre-invited emails all+// flow through this path.+// 2. EMAIL_CONFIG env var — deployment-wide fallback for SaaS brand-new signup, where+// the caller has no workspace context yet (no pre-invite, no workspace in the URL).+func resolvePreLoginEmailSetting(+ ctx context.Context,+ stores *store.Store,+ workspaceID string,+) (*storepb.EmailSetting, error) {+ if workspaceID != "" {+ emailSettingMsg, err := stores.GetSetting(ctx, workspaceID, storepb.SettingName_EMAIL)+ if err != nil {+ return nil, errors.Wrap(err, "failed to load email setting")+ }+ if emailSettingMsg == nil {+ return nil, nil+ }+ es, ok := emailSettingMsg.Value.(*storepb.EmailSetting)+ if !ok {+ return nil, nil+ }+ return es, nil+ }++ if raw := os.Getenv("EMAIL_CONFIG"); raw != "" {+ emailSetting := &storepb.EmailSetting{}+ if err := common.ProtojsonUnmarshaler.Unmarshal([]byte(raw), emailSetting); err != nil {+ return nil, errors.Wrap(err, "failed to parse EMAIL_CONFIG")+ }+ return emailSetting, nil+ }++ return nil, nil+}++// sendEmailVerificationCode generates a code, atomically stores its hash (subject to cooldown),+// and emails the plain code. Returns nil on a successful send as well as on silent-skip paths+// (cooldown active, or PASSWORD_RESET for an unknown email) — both are intentionally+// indistinguishable to the caller, since both correspond to "no new email was delivered".+// Returns an error only on actionable failures (missing EMAIL setting, SMTP failure, DB error).+// Callers decide whether to propagate the error: `SendEmailLoginCode` surfaces it (users need+// to know email delivery failed), `RequestPasswordReset` swallows it to avoid revealing that+// the account exists. `bodyFmt` must contain one %s for the 6-digit code.+func (s *AuthService) sendEmailVerificationCode(ctx context.Context, workspaceName *string, email string, purpose storepb.EmailVerificationCodePurpose, subject, bodyFmt string) error {+ // For password reset, only send to existing principals — no upsert, no email for unknown addresses.+ // Prevents arbitrary email spam. LOGIN intentionally skips this check (also covers signup).+ if purpose == storepb.EmailVerificationCodePurpose_PASSWORD_RESET {+ account, err := s.store.GetAccountByEmail(ctx, email)+ if err != nil {+ return errors.Wrap(err, "failed to look up account for password reset")+ }+ if account == nil || account.Type != storepb.PrincipalType_END_USER {+ return nil // silent: account doesn't exist+ }+ }++ workspaceID, err := parseOptionalWorkspace(workspaceName)+ if err != nil {+ return errors.Wrap(err, "failed to parse workspace id")+ }++ // Resolve the EMAIL setting FIRST — fail fast if misconfigured so we don't write a+ // verification row we can't actually deliver.+ emailSetting, err := resolvePreLoginEmailSetting(ctx, s.store, workspaceID)+ if err != nil {+ return err+ }+ if emailSetting == nil {+ return errors.Errorf("cannot found email config for workspace %v", workspaceID)+ }++ code, err := generateEmailCode()+ if err != nil {+ return errors.Wrap(err, "failed to generate code")+ }++ now := time.Now()+ sent, err := s.store.UpsertEmailVerificationCodeIfCooldownExpired(ctx, &store.EmailVerificationCodeMessage{+ Email: email,+ Purpose: purpose,+ CodeHash: s.hashEmailCode(code),+ ExpiresAt: now.Add(emailCodeExpiry),+ LastSentAt: now,+ Workspace: workspaceID,+ }, emailCodeResendCooldown)+ if err != nil {+ return errors.Wrap(err, "failed to upsert verification code")+ }+ if !sent {+ return nil // cooldown active — silent skip+ }++ sender, err := mailer.NewSender(emailSetting)+ if err != nil {+ return errors.Wrap(err, "failed to create mail sender")+ }++ body := fmt.Sprintf(bodyFmt, code, int(emailCodeExpiry.Minutes()))+ if err := sender.Send(ctx, &mailer.SendRequest{+ To: []string{email},+ Subject: subject,+ TextBody: body,+ }); err != nil {+ // Delete the row so the cooldown doesn't block an immediate retry.+ // Match on code_hash to avoid wiping a newer code from a concurrent request.+ _ = s.store.DeleteEmailVerificationCodeIfMatch(ctx, email, purpose, s.hashEmailCode(code))+ return errors.Wrap(err, "failed to send email")+ }+ return nil+}++// verifyEmailCode checks a submitted code against the stored row.+// Enforces expiry, attempt limit (5), and constant-time hash compare.+// On successful match, deletes the row (one-time use) and returns it so the+// caller can use its captured workspace context (e.g. for gate checks and+// workspace assignment on the email-code signup path).+func (s *AuthService) verifyEmailCode(ctx context.Context, email string, purpose storepb.EmailVerificationCodePurpose, submittedCode string) (*store.EmailVerificationCodeMessage, error) {+ row, err := s.store.GetEmailVerificationCode(ctx, email, purpose)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get email verification code"))+ }+ if row == nil {+ return nil, connect.NewError(connect.CodeUnauthenticated, errors.Errorf("invalid or expired code"))+ }+ if time.Now().After(row.ExpiresAt) {+ _ = s.store.DeleteEmailVerificationCodeIfMatch(ctx, email, purpose, row.CodeHash)+ return nil, connect.NewError(connect.CodeUnauthenticated, errors.Errorf("invalid or expired code"))+ }+ if row.Attempts >= emailCodeMaxAttempts {+ _ = s.store.DeleteEmailVerificationCodeIfMatch(ctx, email, purpose, row.CodeHash)+ return nil, connect.NewError(connect.CodeUnauthenticated, errors.Errorf("too many attempts"))+ }+ if subtle.ConstantTimeCompare([]byte(s.hashEmailCode(submittedCode)), []byte(row.CodeHash)) != 1 {+ _ = s.store.IncrementEmailVerificationCodeAttempts(ctx, email, purpose)+ return nil, connect.NewError(connect.CodeUnauthenticated, errors.Errorf("invalid or expired code"))+ }+ _ = s.store.DeleteEmailVerificationCodeIfMatch(ctx, email, purpose, row.CodeHash)+ return row, nil+}++// authenticateEmailCodeLogin handles the email + 6-digit code flow.+// Existing users: verify code → return user (downstream pipeline handles workspace-level gates).+// Unknown emails: verify code → gate checks on pre-invited workspace → create user + provision workspace.+func (s *AuthService) authenticateEmailCodeLogin(ctx context.Context, request *v1pb.LoginRequest) (*store.UserMessage, error) {+ if request.Password != "" || request.GetIdpName() != "" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("email_code is mutually exclusive with password and idp_name"))+ }+ email := strings.ToLower(strings.TrimSpace(request.Email))+ if email == "" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("email is required"))+ }++ codeRow, err := s.verifyEmailCode(ctx, email, storepb.EmailVerificationCodePurpose_LOGIN, *request.EmailCode)+ if err != nil {+ return nil, err+ }++ // Existing user → return. allow_email_code_signin is checked later in validateLoginPermissions+ // against the actually-resolved login workspace (which may not match the send-time workspace+ // for multi-workspace users — resolveWorkspaceForLogin prefers LastLoginWorkspace).+ user, err := s.store.GetUserByEmail(ctx, email)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find user"))+ }+ if user != nil {+ return user, nil+ }++ // Unknown email → signup path. Validate email format to prevent reserved-namespace collisions.+ if err := validateEndUserEmail(email); err != nil {+ return nil, err+ }++ // Gate checks run BEFORE user creation to prevent orphan accounts.+ // We only consult AllowEmailCodeSignin here: DisallowSignup governs password self-service+ // signup (the Signup RPC), not email-code onboarding — the two paths are independent.+ // Admins who want to block new users via email-code set AllowEmailCodeSignin=false.+ restriction, err := getAccountRestriction(ctx, s.store, s.licenseService, s.profile.SaaS, codeRow.Workspace)+ if err != nil {+ return nil, err+ }+ if !restriction.AllowEmailCodeSignin {+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("email code login is not enabled for this workspace"))+ }+ // Signup is always allowed for SaaS+ if !s.profile.SaaS {+ if restriction.DisallowSignup {+ return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("sign up is disallowed for this workspace"))+ }+ }++ // Provision workspace BEFORE creating the user so retries are self-healing: if user+ // creation fails, the next attempt's FindWorkspace(email) finds the already-provisioned+ // workspace via its IAM binding and returns it. The reverse order would leave a user+ // without a workspace, and subsequent retries would early-return via GetUserByEmail and+ // never re-run provisioning — permanently stuck. Matches the Signup RPC's ordering.+ if _, err := s.provisionWorkspaceForNewUser(ctx, email); err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to provision workspace"))+ }++ // Create principal with random bcrypt password.+ randomBytes := make([]byte, 32)+ if _, err := rand.Read(randomBytes); err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to generate random password"))+ }+ passwordHash, err := bcrypt.GenerateFromPassword(randomBytes, bcrypt.DefaultCost)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to hash password"))+ }++ // Derive display name from email local-part.+ name := email+ if i := strings.Index(email, "@"); i > 0 {+ name = email[:i]+ }++ newUser, err := s.store.CreateUser(ctx, &store.UserMessage{+ Email: email,+ Name: name,+ Type: storepb.PrincipalType_END_USER,+ PasswordHash: string(passwordHash),+ Profile: &storepb.UserProfile{},+ })+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create user"))+ }++ return newUser, nil+}+// getAdditionalWorkspaceSettings returns extra settings to inject during workspace creation.// In SaaS mode with Gemini API key configured, injects AI settings.func (*AuthService) getAdditionalWorkspaceSettings() []store.AdditionalSetting {diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.goindex f5198752ff..0a2d41807c 100644--- a/backend/api/v1/setting_service.go+++ b/backend/api/v1/setting_service.go@@ -66,7 +66,7 @@ func (s *SettingService) ListSettings(ctx context.Context, _ *connect.Request[v1response := &v1pb.ListSettingsResponse{}for _, setting := range settings {- if isSettingDisallowed(setting.Name) {+ if s.isSettingDisallowed(setting.Name) {continue}settingMessage, err := convertToSettingMessage(setting)@@ -92,7 +92,7 @@ func (s *SettingService) GetSetting(ctx context.Context, request *connect.Requesif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid setting name: %v", err))}- if isSettingDisallowed(storeSettingName) {+ if s.isSettingDisallowed(storeSettingName) {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("setting is not available"))}@@ -142,7 +142,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid setting name: %v", err))}- if isSettingDisallowed(storeSettingName) {+ if s.isSettingDisallowed(storeSettingName) {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("setting is not available"))}if s.profile.IsFeatureUnavailable(settingName) {@@ -286,6 +286,20 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.ReqoldSetting.EnforceIdentityDomain = payload.EnforceIdentityDomaincase "value.workspace_profile.database_change_mode":oldSetting.DatabaseChangeMode = payload.DatabaseChangeMode+ case "value.workspace_profile.allow_email_code_signin":+ if s.profile.SaaS {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("allow_email_code_signin cannot be changed in SaaS mode"))+ }+ if payload.AllowEmailCodeSignin {+ emailSetting, err := s.store.GetSetting(ctx, workspaceID, storepb.SettingName_EMAIL)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to load email setting"))+ }+ if emailSetting == nil {+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("cannot enable email code signin without an EMAIL setting"))+ }+ }+ oldSetting.AllowEmailCodeSignin = payload.AllowEmailCodeSignincase "value.workspace_profile.disallow_password_signin":if s.profile.SaaS {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("the disallow_password_signin cannot be changed in SaaS mode"))@@ -819,10 +833,18 @@ var disallowedDomains = map[string]bool{"yeah.net": true,}-func isSettingDisallowed(name storepb.SettingName) bool {+func (s *SettingService) isSettingDisallowed(name storepb.SettingName) bool {// Backend-only settings that should never be exposed via the API.- // SYSTEM: Internal system settings (auth secret, workspace ID, enterprise license)- return name == storepb.SettingName_SYSTEM+ switch name {+ case storepb.SettingName_SYSTEM:+ // SYSTEM: Internal system settings (auth secret, workspace ID, enterprise license)+ return true+ case storepb.SettingName_EMAIL:+ // EMAIL: not exposed in the SaaS mode.+ return s.profile.SaaS+ default:+ return false+ }}func validateApprovalTemplate(template *v1pb.ApprovalTemplate) error {diff --git a/backend/api/v1/setting_service_converter.go b/backend/api/v1/setting_service_converter.goindex ab792e7cb5..7acbd6f88e 100644--- a/backend/api/v1/setting_service_converter.go+++ b/backend/api/v1/setting_service_converter.go@@ -262,6 +262,7 @@ func convertWorkspaceProfileSetting(v1Setting *v1pb.WorkspaceProfileSetting) *stEnforceIdentityDomain: v1Setting.EnforceIdentityDomain,DatabaseChangeMode: storepb.WorkspaceProfileSetting_DatabaseChangeMode(v1Setting.DatabaseChangeMode),DisallowPasswordSignin: v1Setting.DisallowPasswordSignin,+ AllowEmailCodeSignin: v1Setting.AllowEmailCodeSignin,EnableMetricCollection: v1Setting.EnableMetricCollection,EnableAuditLogStdout: v1Setting.EnableAuditLogStdout,Watermark: v1Setting.Watermark,@@ -334,6 +335,7 @@ func convertToWorkspaceProfileSetting(storeSetting *storepb.WorkspaceProfileSettEnforceIdentityDomain: storeSetting.EnforceIdentityDomain,DatabaseChangeMode: v1pb.DatabaseChangeMode(storeSetting.DatabaseChangeMode),DisallowPasswordSignin: storeSetting.DisallowPasswordSignin,+ AllowEmailCodeSignin: storeSetting.AllowEmailCodeSignin,EnableMetricCollection: storeSetting.EnableMetricCollection,EnableAuditLogStdout: storeSetting.EnableAuditLogStdout,Watermark: storeSetting.Watermark,diff --git a/backend/enterprise/license.go b/backend/enterprise/license.goindex d8371d9e19..ba32dbb1d3 100644--- a/backend/enterprise/license.go+++ b/backend/enterprise/license.go@@ -252,6 +252,7 @@ func (s *LicenseService) loadSubscriptionFromDB(ctx context.Context, workspaceIDslog.Debug("Load valid license",+ slog.String("workspace", workspaceID),slog.String("plan", subscription.Plan.String()),slog.Time("expiresAt", subscription.ExpiresTime.AsTime()),slog.Int("activeInstances", int(subscription.ActiveInstances)),diff --git a/backend/generated-go/v1/actuator_service.pb.go b/backend/generated-go/v1/actuator_service.pb.goindex 88d5e6d0a1..b59c6808af 100644--- a/backend/generated-go/v1/actuator_service.pb.go+++ b/backend/generated-go/v1/actuator_service.pb.go@@ -157,6 +157,9 @@ type Restriction struct {PasswordRestriction *WorkspaceProfileSetting_PasswordRestriction `protobuf:"bytes,3,opt,name=password_restriction,json=passwordRestriction,proto3" json:"password_restriction,omitempty"`// Whether email + 6-digit code signin is enabled for this workspace.AllowEmailCodeSignin bool `protobuf:"varint,4,opt,name=allow_email_code_signin,json=allowEmailCodeSignin,proto3" json:"allow_email_code_signin,omitempty"`+ // Whether password reset via email is available for this workspace.+ // True when the workspace (or deployment) has an email setting configured.+ PasswordResetEnabled bool `protobuf:"varint,5,opt,name=password_reset_enabled,json=passwordResetEnabled,proto3" json:"password_reset_enabled,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -219,6 +222,13 @@ func (x *Restriction) GetAllowEmailCodeSignin() bool {return false}+func (x *Restriction) GetPasswordResetEnabled() bool {+ if x != nil {+ return x.PasswordResetEnabled+ }+ return false+}+// System information and configuration for the Bytebase instance.// Actuator concept is similar to the Spring Boot Actuator.type ActuatorInfo struct {@@ -456,12 +466,13 @@ const file_v1_actuator_service_proto_rawDesc = "" +"\x16GetActuatorInfoRequest\x12/\n" +"\x04name\x18\x01 \x01(\tB\x1b\xfaA\x18\n" +"\x16bytebase.com/WorkspaceR\x04name\"\x14\n" +- "\x12DeleteCacheRequest\"\xa8\x02\n" ++ "\x12DeleteCacheRequest\"\xe3\x02\n" +"\vRestriction\x12,\n" +"\x0fdisallow_signup\x18\x01 \x01(\bB\x03\xe0A\x03R\x0edisallowSignup\x12=\n" +"\x18disallow_password_signin\x18\x02 \x01(\bB\x03\xe0A\x03R\x16disallowPasswordSignin\x12p\n" +"\x14password_restriction\x18\x03 \x01(\v28.bytebase.v1.WorkspaceProfileSetting.PasswordRestrictionB\x03\xe0A\x03R\x13passwordRestriction\x12:\n" +- "\x17allow_email_code_signin\x18\x04 \x01(\bB\x03\xe0A\x03R\x14allowEmailCodeSignin\"\xbd\a\n" ++ "\x17allow_email_code_signin\x18\x04 \x01(\bB\x03\xe0A\x03R\x14allowEmailCodeSignin\x129\n" ++ "\x16password_reset_enabled\x18\x05 \x01(\bB\x03\xe0A\x03R\x14passwordResetEnabled\"\xbd\a\n" +"\fActuatorInfo\x12\x1d\n" +"\aversion\x18\x01 \x01(\tB\x03\xe0A\x03R\aversion\x12\"\n" +"\n" +diff --git a/backend/generated-go/v1/actuator_service_equal.pb.go b/backend/generated-go/v1/actuator_service_equal.pb.goindex c65a466159..5a6cd1baee 100644--- a/backend/generated-go/v1/actuator_service_equal.pb.go+++ b/backend/generated-go/v1/actuator_service_equal.pb.go@@ -55,6 +55,9 @@ func (x *Restriction) Equal(y *Restriction) bool {if x.AllowEmailCodeSignin != y.AllowEmailCodeSignin {return false}+ if x.PasswordResetEnabled != y.PasswordResetEnabled {+ return false+ }return true}diff --git a/backend/generated-go/v1/auth_service.pb.go b/backend/generated-go/v1/auth_service.pb.goindex 6805bc1ec5..44f1461439 100644--- a/backend/generated-go/v1/auth_service.pb.go+++ b/backend/generated-go/v1/auth_service.pb.go@@ -45,7 +45,13 @@ type LoginRequest struct {MfaTempToken *string `protobuf:"bytes,8,opt,name=mfa_temp_token,json=mfaTempToken,proto3,oneof" json:"mfa_temp_token,omitempty"`// 6-digit code from email for passwordless login/signup.// Pairs with `email`. Mutually exclusive with `password` and `idp_name`.- EmailCode *string `protobuf:"bytes,9,opt,name=email_code,json=emailCode,proto3,oneof" json:"email_code,omitempty"`+ EmailCode *string `protobuf:"bytes,9,opt,name=email_code,json=emailCode,proto3,oneof" json:"email_code,omitempty"`+ // Preferred workspace to land in after login. If the user is a member of this+ // workspace, the token is issued for it; otherwise falls back to the default+ // resolution (last login workspace → first membership). Typically populated+ // from the ?workspace= query parameter in invite links.+ // Format: workspaces/{workspace}+ Workspace *string `protobuf:"bytes,10,opt,name=workspace,proto3,oneof" json:"workspace,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -143,6 +149,13 @@ func (x *LoginRequest) GetEmailCode() string {return ""}+func (x *LoginRequest) GetWorkspace() string {+ if x != nil && x.Workspace != nil {+ return *x.Workspace+ }+ return ""+}+// Context for identity provider authentication.type IdentityProviderContext struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -930,7 +943,7 @@ var File_v1_auth_service_proto protoreflect.FileDescriptorconst file_v1_auth_service_proto_rawDesc = "" +"\n" +- "\x15v1/auth_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x13v1/annotation.proto\x1a\x15v1/user_service.proto\"\x8e\x03\n" ++ "\x15v1/auth_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x13v1/annotation.proto\x1a\x15v1/user_service.proto\"\xbf\x03\n" +"\fLoginRequest\x12\x14\n" +"\x05email\x18\x01 \x01(\tR\x05email\x12\x1a\n" +"\bpassword\x18\x02 \x01(\tR\bpassword\x12\x10\n" +@@ -942,11 +955,15 @@ const file_v1_auth_service_proto_rawDesc = "" +"\rrecovery_code\x18\a \x01(\tH\x01R\frecoveryCode\x88\x01\x01\x12)\n" +"\x0emfa_temp_token\x18\b \x01(\tH\x02R\fmfaTempToken\x88\x01\x01\x12\"\n" +"\n" +- "email_code\x18\t \x01(\tH\x03R\temailCode\x88\x01\x01B\v\n" ++ "email_code\x18\t \x01(\tH\x03R\temailCode\x88\x01\x01\x12!\n" ++ "\tworkspace\x18\n" ++ " \x01(\tH\x04R\tworkspace\x88\x01\x01B\v\n" +"\t_otp_codeB\x10\n" +"\x0e_recovery_codeB\x11\n" +"\x0f_mfa_temp_tokenB\r\n" +- "\v_email_code\"\xc8\x01\n" ++ "\v_email_codeB\f\n" ++ "\n" ++ "_workspace\"\xc8\x01\n" +"\x17IdentityProviderContext\x12S\n" +"\x0eoauth2_context\x18\x01 \x01(\v2*.bytebase.v1.OAuth2IdentityProviderContextH\x00R\roauth2Context\x12M\n" +"\foidc_context\x18\x02 \x01(\v2(.bytebase.v1.OIDCIdentityProviderContextH\x00R\voidcContextB\t\n" +diff --git a/backend/generated-go/v1/auth_service_equal.pb.go b/backend/generated-go/v1/auth_service_equal.pb.goindex 6981560a00..c945552612 100644--- a/backend/generated-go/v1/auth_service_equal.pb.go+++ b/backend/generated-go/v1/auth_service_equal.pb.go@@ -37,6 +37,9 @@ func (x *LoginRequest) Equal(y *LoginRequest) bool {if p, q := x.EmailCode, y.EmailCode; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {return false}+ if p, q := x.Workspace, y.Workspace; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {+ return false+ }return true}diff --git a/backend/store/email_verification_code.go b/backend/store/email_verification_code.goindex dfd5f88919..4068565a2f 100644--- a/backend/store/email_verification_code.go+++ b/backend/store/email_verification_code.go@@ -115,12 +115,13 @@ func (s *Store) IncrementEmailVerificationCodeAttempts(ctx context.Context, emaireturn nil}-// DeleteEmailVerificationCode deletes the verification code record for the given email and purpose.-func (s *Store) DeleteEmailVerificationCode(ctx context.Context, email string, purpose storepb.EmailVerificationCodePurpose) error {+// DeleteEmailVerificationCodeIfMatch deletes the row only if it still has the given code hash.+// Used to roll back on SMTP failure without wiping a newer code from a concurrent request.+func (s *Store) DeleteEmailVerificationCodeIfMatch(ctx context.Context, email string, purpose storepb.EmailVerificationCodePurpose, codeHash string) error {q := qb.Q().Space(`DELETE FROM email_verification_code- WHERE email = ? AND purpose = ?- `, email, purpose.String())+ WHERE email = ? AND purpose = ? AND code_hash = ?+ `, email, purpose.String(), codeHash)query, args, err := q.ToSQL()if err != nil {diff --git a/frontend/src/components/EmailCodeSigninForm.vue b/frontend/src/components/EmailCodeSigninForm.vuenew file mode 100644index 0000000000..1f66246c71--- /dev/null+++ b/frontend/src/components/EmailCodeSigninForm.vue@@ -0,0 +1,191 @@+<template>+ <form class="flex flex-col gap-y-6 px-1" @submit.prevent="handleSubmit">+ <div>+ <label+ for="email-code-email"+ class="block text-sm font-medium leading-5 text-control"+ >+ {{ $t("common.email") }}+ <RequiredStar />+ </label>+ <div class="mt-1 rounded-md shadow-xs">+ <BBTextField+ v-model:value="state.email"+ required+ :input-props="{+ id: 'email-code-email',+ autocomplete: 'email',+ type: 'email',+ }"+ placeholder="[email protected]"+ :disabled="step === 'code' || emailFromQuery"+ />+ </div>+ </div>++ <div v-if="step === 'code'" class="flex flex-col gap-y-2">+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("auth.sign-in.verification-code") }}+ <RequiredStar />+ </label>+ <div class="text-sm text-control-light">+ {{ $t("auth.sign-in.code-sent-hint", { email: state.email }) }}+ </div>+ <NInputOtp+ v-model:value="state.codeParts"+ :length="6"+ class="email-code-otp w-full"+ @finish="handleSubmit"+ />+ <div class="flex items-center justify-end">+ <NButton text :disabled="resendCountdown > 0" @click="sendCode">+ {{+ resendCountdown > 0+ ? $t("auth.sign-in.resend-in", { seconds: resendCountdown })+ : $t("auth.sign-in.resend-code")+ }}+ </NButton>+ </div>+ </div>++ <div class="w-full">+ <NButton+ v-if="step === 'email'"+ attr-type="button"+ type="primary"+ :disabled="!isValidEmail(state.email) || state.sending"+ :loading="state.sending"+ size="large"+ style="width: 100%"+ @click="sendCode"+ >+ {{ $t("auth.sign-in.send-code") }}+ </NButton>+ <NButton+ v-else+ attr-type="submit"+ type="primary"+ :disabled="!allowSignin"+ :loading="props.loading"+ size="large"+ style="width: 100%"+ >+ {{ $t("common.sign-in") }}+ </NButton>+ </div>+ </form>+</template>++<script setup lang="ts">+import { create } from "@bufbuild/protobuf";+import { NButton, NInputOtp } from "naive-ui";+import { computed, onMounted, onUnmounted, reactive, ref } from "vue";+import { useI18n } from "vue-i18n";+import { BBTextField } from "@/bbkit";+import RequiredStar from "@/components/RequiredStar.vue";+import { pushNotification, useAuthStore } from "@/store";+import {+ type LoginRequest,+ LoginRequestSchema,+} from "@/types/proto-es/v1/auth_service_pb";+import { isValidEmail, resolveWorkspaceName } from "@/utils";++interface LocalState {+ email: string;+ codeParts: string[];+ sending: boolean;+}++const props = defineProps<{+ loading: boolean;+}>();++const emit = defineEmits<{+ (event: "signin", payload: LoginRequest): void;+}>();++const { t } = useI18n();+const authStore = useAuthStore();++const step = ref<"email" | "code">("email");+const resendCountdown = ref(0);+let countdownTimer: ReturnType<typeof setInterval> | null = null;++const state = reactive<LocalState>({+ email: "",+ codeParts: [],+ sending: false,+});++const emailFromQuery = ref(false);++onMounted(() => {+ const url = new URL(window.location.href);+ const params = new URLSearchParams(url.search);+ const queryEmail = params.get("email") ?? "";+ if (queryEmail) {+ state.email = queryEmail;+ emailFromQuery.value = true;+ }+});++onUnmounted(() => {+ if (countdownTimer) clearInterval(countdownTimer);+});++const allowSignin = computed(() => {+ return state.email && state.codeParts.join("").length === 6;+});++const startCountdown = () => {+ resendCountdown.value = 60;+ if (countdownTimer) clearInterval(countdownTimer);+ countdownTimer = setInterval(() => {+ resendCountdown.value -= 1;+ if (resendCountdown.value <= 0 && countdownTimer) {+ clearInterval(countdownTimer);+ countdownTimer = null;+ }+ }, 1000);+};++const sendCode = async () => {+ if (!isValidEmail(state.email) || state.sending || resendCountdown.value > 0)+ return;+ state.sending = true;+ try {+ await authStore.sendEmailLoginCode(state.email, resolveWorkspaceName());+ step.value = "code";+ startCountdown();+ } catch (e) {+ pushNotification({+ module: "bytebase",+ style: "CRITICAL",+ title: t("auth.sign-in.failed-to-send-code", {+ error: e,+ }),+ });+ } finally {+ state.sending = false;+ }+};++const handleSubmit = async () => {+ const code = state.codeParts.join("");+ if (!state.email || code.length !== 6) return;+ emit(+ "signin",+ create(LoginRequestSchema, {+ email: state.email,+ emailCode: code,+ workspace: resolveWorkspaceName(),+ })+ );+};+</script>++<style scoped>+.email-code-otp :deep(.n-input) {+ flex: 1;+}+</style>diff --git a/frontend/src/components/PasswordSigninForm.vue b/frontend/src/components/PasswordSigninForm.vueindex 04a69e6338..b9e2bad182 100644--- a/frontend/src/components/PasswordSigninForm.vue+++ b/frontend/src/components/PasswordSigninForm.vue@@ -96,6 +96,7 @@ import {type LoginRequest,LoginRequestSchema,} from "@/types/proto-es/v1/auth_service_pb";+import { resolveWorkspaceName } from "@/utils";interface LocalState {email: string;@@ -142,6 +143,7 @@ const trySignin = async () => {create(LoginRequestSchema, {email: state.email,password: state.password,+ workspace: resolveWorkspaceName(),}));};diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex eddde24fe0..0e9210b710 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -109,22 +109,32 @@"title": "You have logged in as another user"},"password-forget": {- "contact-us": "Please contact us at {email} for help.",+ "failed-to-send-code": "Failed to send password reset code. Please try again.","return-to-sign-in": "Return to Sign in","selfhost": "Please contact your Bytebase Admin to reset your password.",+ "send-reset-code": "Send reset code","title": "Forgot your password?"},"password-forgot": "Forgot Password","password-reset": {+ "code-label": "Verification code","content": "You need to reset your password according to the password restriction policy.",+ "invalid-or-expired-code": "Invalid or expired code. Please request a new one.","title": "Reset your password"},"sign-in": {+ "code-sent-hint": "A verification code was sent to {email}.","demo-account": "Demo Account",+ "email-code-tab": "Email Code",+ "failed-to-send-code": "Failed to send verification code. {error}","forget-password": "Forgot your password?","invited-email": "You've been invited. Please sign in with {email}","new-user": "New to Bytebase?",- "sign-in-with-idp": "Sign in with {idp}"+ "resend-code": "Resend code",+ "resend-in": "Resend in {seconds}s",+ "send-code": "Send code",+ "sign-in-with-idp": "Sign in with {idp}",+ "verification-code": "Verification code"},"sign-up": {"accept-terms-and-policy": "I accept Bytebase's {terms} and {policy}",@@ -2012,6 +2022,11 @@"description": "When enabled, users can choose between admin and read-only data sources. When disabled, users are forced to use read-only data sources if configured, otherwise fall back to admin data sources.","self": "Allow querying the admin data source"},+ "allow-email-code-signin": {+ "description": "Users can sign in or sign up by entering a 6-digit code delivered to their email address.",+ "enable": "Allow signin with email code",+ "require-email-setting": "An email (SMTP) setting must be configured first before enabling this."+ },"announcement": {"self": "Announcement"},diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex d5a7de8b4e..41484b0c20 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -109,22 +109,32 @@"title": "Has iniciado sesión como otro usuario"},"password-forget": {- "contact-us": "Contáctenos en {email} para obtener ayuda.",+ "failed-to-send-code": "No se pudo enviar el código de restablecimiento de contraseña. Inténtalo de nuevo.","return-to-sign-in": "Volver a iniciar sesión","selfhost": "Póngase en contacto con su administrador de Bytebase para restablecer su contraseña.",+ "send-reset-code": "Enviar código de restablecimiento","title": "¿Olvidaste tu contraseña?"},"password-forgot": "Contraseña olvidada","password-reset": {+ "code-label": "Código de verificación","content": "Debe restablecer su contraseña de acuerdo con la política de restricción de contraseña.",+ "invalid-or-expired-code": "Código inválido o caducado. Por favor solicita uno nuevo.","title": "Restablecer su contraseña"},"sign-in": {+ "code-sent-hint": "Se ha enviado un código de verificación a {email}.","demo-account": "Demo Account",+ "email-code-tab": "Código por email",+ "failed-to-send-code": "No se pudo enviar el código de verificación. Inténtalo de nuevo.","forget-password": "¿Olvidaste tu contraseña?","invited-email": "Has sido invitado. Inicia sesión con {email}","new-user": "¿Nuevo en Bytebase?",- "sign-in-with-idp": "Iniciar sesión con {idp}"+ "resend-code": "Reenviar código",+ "resend-in": "Reenviar en {seconds}s",+ "send-code": "Enviar código",+ "sign-in-with-idp": "Iniciar sesión con {idp}",+ "verification-code": "Código de verificación"},"sign-up": {"accept-terms-and-policy": "Acepto los {terms} y {policy} de Bytebase",@@ -2012,6 +2022,11 @@"description": "Cuando está habilitado, los usuarios pueden elegir entre fuentes de datos de administración y de solo lectura. Cuando está deshabilitado, los usuarios se ven obligados a usar fuentes de datos de solo lectura si están configuradas; de lo contrario, vuelven a usar fuentes de datos de administración.","self": "Permitir consultar la fuente de datos de administración"},+ "allow-email-code-signin": {+ "description": "Los usuarios pueden iniciar sesión o registrarse introduciendo un código de 6 dígitos enviado a su correo electrónico.",+ "enable": "Permitir inicio de sesión con código por email",+ "require-email-setting": "Primero se debe configurar el ajuste de correo (SMTP) antes de habilitar esto."+ },"announcement": {"self": "Anuncio"},diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 9f3d99c849..ed9c4754ad 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -109,22 +109,32 @@"title": "別のユーザーとしてログインしています"},"password-forget": {- "contact-us": "{email} までお問い合わせください。",+ "failed-to-send-code": "パスワードリセットコードの送信に失敗しました。もう一度お試しください。","return-to-sign-in": "ログインに戻る","selfhost": "Bytebase 管理者に連絡してパスワードをリセットしてください",+ "send-reset-code": "リセットコードを送信","title": "パスワードをお忘れですか?"},"password-forgot": "パスワードを忘れる","password-reset": {+ "code-label": "認証コード","content": "パスワード制限ポリシーに従ってパスワードをリセットする必要があります。",+ "invalid-or-expired-code": "コードが無効または期限切れです。新しいコードをリクエストしてください。","title": "あなたのパスワードをリセット"},"sign-in": {+ "code-sent-hint": "{email} に認証コードを送信しました。","demo-account": "Demo Account",+ "email-code-tab": "メール認証コード",+ "failed-to-send-code": "認証コードの送信に失敗しました。もう一度お試しください。","forget-password": "パスワードを忘れましたか?","invited-email": "招待されました。{email} でログインしてください","new-user": "Bytebase を初めて使用しますか?",- "sign-in-with-idp": "{idp} 経由でログイン"+ "resend-code": "コードを再送信",+ "resend-in": "{seconds}秒後に再送信可能",+ "send-code": "コードを送信",+ "sign-in-with-idp": "{idp} 経由でログイン",+ "verification-code": "認証コード"},"sign-up": {"accept-terms-and-policy": "Bytebase の {terms} と {policy} に同意します",@@ -2012,6 +2022,11 @@"description": "有効にすると、ユーザーは管理データソースと読み取り専用データソースのどちらかを選択できます。無効にすると、読み取り専用データソースが設定されている場合は強制的に読み取り専用データソースを使用し、設定されていない場合は管理データソースにフォールバックします。","self": "管理データソースのクエリを許可する"},+ "allow-email-code-signin": {+ "description": "ユーザーはメールアドレスに送信された6桁のコードを入力してサインインまたはサインアップできます。",+ "enable": "メール認証コードによるサインインを許可する",+ "require-email-setting": "有効にする前に、メール (SMTP) 設定を構成する必要があります。"+ },"announcement": {"self": "お知らせ"},diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 3a6377baf7..449d480e21 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -109,22 +109,32 @@"title": "Bạn đã đăng nhập với tư cách người dùng khác"},"password-forget": {- "contact-us": "Vui lòng liên hệ {email} để được hỗ trợ.",+ "failed-to-send-code": "Không gửi được mã đặt lại mật khẩu. Vui lòng thử lại.","return-to-sign-in": "Quay lại Đăng nhập","selfhost": "Vui lòng liên hệ với Quản trị viên Bytebase của bạn để đặt lại mật khẩu của bạn.",+ "send-reset-code": "Gửi mã đặt lại","title": "Quên mật khẩu?"},"password-forgot": "Quên mật khẩu","password-reset": {+ "code-label": "Mã xác minh","content": "Bạn cần đặt lại mật khẩu của mình theo chính sách hạn chế mật khẩu.",+ "invalid-or-expired-code": "Mã không hợp lệ hoặc đã hết hạn. Vui lòng yêu cầu mã mới.","title": "Đặt lại mật khẩu của bạn"},"sign-in": {+ "code-sent-hint": "Mã xác minh đã được gửi đến {email}.","demo-account": "Demo Account",+ "email-code-tab": "Mã qua email",+ "failed-to-send-code": "Không gửi được mã xác minh. Vui lòng thử lại.","forget-password": "Quên mật khẩu?","invited-email": "Bạn đã được mời. Vui lòng đăng nhập bằng {email}","new-user": "Mới sử dụng Bytebase?",- "sign-in-with-idp": "Đăng nhập bằng {idp}"+ "resend-code": "Gửi lại mã",+ "resend-in": "Gửi lại sau {seconds}s",+ "send-code": "Gửi mã",+ "sign-in-with-idp": "Đăng nhập bằng {idp}",+ "verification-code": "Mã xác minh"},"sign-up": {"accept-terms-and-policy": "Tôi chấp nhận {terms} và {policy} của Bytebase",@@ -2012,6 +2022,11 @@"description": "Khi được bật, người dùng có thể chọn giữa nguồn dữ liệu quản trị và nguồn dữ liệu chỉ đọc. Khi bị tắt, người dùng buộc phải sử dụng nguồn dữ liệu chỉ đọc nếu được cấu hình, nếu không sẽ quay lại sử dụng nguồn dữ liệu quản trị.","self": "Cho phép truy vấn nguồn dữ liệu quản trị"},+ "allow-email-code-signin": {+ "description": "Người dùng có thể đăng nhập hoặc đăng ký bằng cách nhập mã 6 chữ số được gửi đến email của họ.",+ "enable": "Cho phép đăng nhập bằng mã qua email",+ "require-email-setting": "Phải cấu hình cài đặt email (SMTP) trước khi bật tùy chọn này."+ },"announcement": {"self": "Thông báo"},diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex cf9584dea4..97c2b0eeb7 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -109,22 +109,32 @@"title": "您已以其他用户身份登录"},"password-forget": {- "contact-us": "请联系 {email} 获取帮助。",+ "failed-to-send-code": "发送密码重置验证码失败,请重试。","return-to-sign-in": "返回登录","selfhost": "请联系您的 Bytebase 管理员重置密码",+ "send-reset-code": "发送重置验证码","title": "忘记了您的密码?"},"password-forgot": "忘记密码","password-reset": {+ "code-label": "验证码","content": "依据密码限制策略,您需要重置登录密码。",+ "invalid-or-expired-code": "验证码无效或已过期,请重新申请。","title": "重置您的密码"},"sign-in": {+ "code-sent-hint": "验证码已发送至 {email}。","demo-account": "Demo Account",+ "email-code-tab": "邮箱验证码",+ "failed-to-send-code": "发送验证码失败,请重试。","forget-password": "忘记密码?","invited-email": "您已被邀请,请使用 {email} 登录","new-user": "第一次使用 Bytebase?",- "sign-in-with-idp": "通过 {idp} 登录"+ "resend-code": "重新发送验证码",+ "resend-in": "{seconds} 秒后重新发送",+ "send-code": "发送验证码",+ "sign-in-with-idp": "通过 {idp} 登录",+ "verification-code": "验证码"},"sign-up": {"accept-terms-and-policy": "我接受 Bytebase 的{terms}和{policy}",@@ -2012,6 +2022,11 @@"description": "启用时,用户可以在主数据源和只读数据源之间进行选择。禁用时,如果配置了只读数据源,则强制用户使用只读数据源,否则回退到使用主数据源。","self": "允许查询主数据源"},+ "allow-email-code-signin": {+ "description": "用户可以通过输入发送到邮箱的 6 位验证码进行登录或注册。",+ "enable": "允许使用邮箱验证码登录",+ "require-email-setting": "必须先配置邮件 (SMTP) 设置后才能启用。"+ },"announcement": {"self": "公告"},diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.jsonindex 2c26cfddd1..0ff3d27b5c 100644--- a/frontend/src/react/locales/en-US.json+++ b/frontend/src/react/locales/en-US.json@@ -1638,6 +1638,11 @@"description": "When enabled, users can choose between admin and read-only data sources. When disabled, users are forced to use read-only data sources if configured, otherwise fall back to admin data sources.","self": "Allow querying the admin data source"},+ "allow-email-code-signin": {+ "description": "Users can sign in or sign up by entering a 6-digit code delivered to their email address.",+ "enable": "Allow signin with email code",+ "require-email-setting": "An email (SMTP) setting must be configured first before enabling this."+ },"announcement": {"self": "Announcement"},diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.jsonindex 44872ca164..6423c0ad62 100644--- a/frontend/src/react/locales/es-ES.json+++ b/frontend/src/react/locales/es-ES.json@@ -1638,6 +1638,11 @@"description": "Cuando está habilitado, los usuarios pueden elegir entre fuentes de datos de administración y de solo lectura. Cuando está deshabilitado, los usuarios se ven obligados a usar fuentes de datos de solo lectura si están configuradas; de lo contrario, vuelven a usar fuentes de datos de administración.","self": "Permitir consultar la fuente de datos de administración"},+ "allow-email-code-signin": {+ "description": "Los usuarios pueden iniciar sesión o registrarse introduciendo un código de 6 dígitos enviado a su correo electrónico.",+ "enable": "Permitir inicio de sesión con código por email",+ "require-email-setting": "Primero se debe configurar el ajuste de correo (SMTP) antes de habilitar esto."+ },"announcement": {"self": "Anuncio"},diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.jsonindex aa84ac1715..7e6e169e23 100644--- a/frontend/src/react/locales/ja-JP.json+++ b/frontend/src/react/locales/ja-JP.json@@ -1638,6 +1638,11 @@"description": "有効にすると、ユーザーは管理データソースと読み取り専用データソースのどちらかを選択できます。無効にすると、読み取り専用データソースが設定されている場合は強制的に読み取り専用データソースを使用し、設定されていない場合は管理データソースにフォールバックします。","self": "管理データソースのクエリを許可する"},+ "allow-email-code-signin": {+ "description": "ユーザーはメールアドレスに送信された6桁のコードを入力してサインインまたはサインアップできます。",+ "enable": "メール認証コードによるサインインを許可する",+ "require-email-setting": "有効にする前に、メール (SMTP) 設定を構成する必要があります。"+ },"announcement": {"self": "お知らせ"},diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.jsonindex f0ba0a4229..c45161cb93 100644--- a/frontend/src/react/locales/vi-VN.json+++ b/frontend/src/react/locales/vi-VN.json@@ -1638,6 +1638,11 @@"description": "Khi được bật, người dùng có thể chọn giữa nguồn dữ liệu quản trị và nguồn dữ liệu chỉ đọc. Khi bị tắt, người dùng buộc phải sử dụng nguồn dữ liệu chỉ đọc nếu được cấu hình, nếu không sẽ quay lại sử dụng nguồn dữ liệu quản trị.","self": "Cho phép truy vấn nguồn dữ liệu quản trị"},+ "allow-email-code-signin": {+ "description": "Người dùng có thể đăng nhập hoặc đăng ký bằng cách nhập mã 6 chữ số được gửi đến email của họ.",+ "enable": "Cho phép đăng nhập bằng mã qua email",+ "require-email-setting": "Phải cấu hình cài đặt email (SMTP) trước khi bật tùy chọn này."+ },"announcement": {"self": "Thông báo"},diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.jsonindex 0f482d5a21..282c99b214 100644--- a/frontend/src/react/locales/zh-CN.json+++ b/frontend/src/react/locales/zh-CN.json@@ -1638,6 +1638,11 @@"description": "启用时,用户可以在主数据源和只读数据源之间进行选择。禁用时,如果配置了只读数据源,则强制用户使用只读数据源,否则回退到使用主数据源。","self": "允许查询主数据源"},+ "allow-email-code-signin": {+ "description": "用户可以通过输入发送到邮箱的 6 位验证码进行登录或注册。",+ "enable": "允许使用邮箱验证码登录",+ "require-email-setting": "必须先配置邮件 (SMTP) 设置后才能启用。"+ },"announcement": {"self": "公告"},diff --git a/frontend/src/react/pages/settings/general/AccountSection.tsx b/frontend/src/react/pages/settings/general/AccountSection.tsxindex cfa85aabcf..10ea4274e2 100644--- a/frontend/src/react/pages/settings/general/AccountSection.tsx+++ b/frontend/src/react/pages/settings/general/AccountSection.tsx@@ -29,9 +29,16 @@ import {defaultAccessTokenDurationInHours,defaultRefreshTokenDurationInHours,} from "@/types";-import type { WorkspaceProfileSetting_PasswordRestriction } from "@/types/proto-es/v1/setting_service_pb";-import { WorkspaceProfileSetting_PasswordRestrictionSchema } from "@/types/proto-es/v1/setting_service_pb";+import type {+ WorkspaceProfileSetting,+ WorkspaceProfileSetting_PasswordRestriction,+} from "@/types/proto-es/v1/setting_service_pb";+import {+ Setting_SettingName,+ WorkspaceProfileSetting_PasswordRestrictionSchema,+} from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";+import { isDev } from "@/utils";import type { SectionHandle } from "./useSettingSection";const DEFAULT_MIN_LENGTH = 8;@@ -40,6 +47,7 @@ interface ToggleState {disallowSignup: boolean;require2fa: boolean;disallowPasswordSignin: boolean;+ allowEmailCodeSignin: boolean;}interface TokenState {@@ -93,11 +101,20 @@ export const AccountSection = forwardRef<SectionHandle, AccountSectionProps>(() => idpStore.identityProviderList.length > 0);- // Fetch identity providers on mount+ // Track whether the EMAIL setting is configured (required to enable email-code signin).+ // Reactively reads from the Vue store so the value updates when EMAIL is (un)configured.+ const hasEmailSetting = useVueState(+ () => !!settingV1Store.getSettingByName(Setting_SettingName.EMAIL)+ );++ // Fetch identity providers and EMAIL setting on mount.useEffect(() => {idpStore.fetchIdentityProviderList(useActuatorV1Store().workspaceResourceName);+ // Populate the EMAIL setting into the store cache; useVueState above+ // picks up the change reactively.+ settingV1Store.getOrFetchSettingByName(Setting_SettingName.EMAIL, true);}, []);// --- Toggle state ---@@ -107,6 +124,8 @@ export const AccountSection = forwardRef<SectionHandle, AccountSectionProps>(require2fa: settingV1Store.workspaceProfile.require2fa,disallowPasswordSignin:settingV1Store.workspaceProfile.disallowPasswordSignin,+ allowEmailCodeSignin:+ settingV1Store.workspaceProfile.allowEmailCodeSignin,};}, []);@@ -220,19 +239,16 @@ export const AccountSection = forwardRef<SectionHandle, AccountSectionProps>(// --- Update ---const handleUpdate = useCallback(async () => {+ const updateMaskPaths: string[] = [];+ const payload: Partial<WorkspaceProfileSetting> = {};+// Password restrictionif (!isEqual(passwordState, getInitialPasswordRestriction())) {- await settingV1Store.updateWorkspaceProfile({- payload: {- passwordRestriction: create(- WorkspaceProfileSetting_PasswordRestrictionSchema,- { ...passwordState }- ),- },- updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile.password_restriction"],- }),- });+ payload.passwordRestriction = create(+ WorkspaceProfileSetting_PasswordRestrictionSchema,+ { ...passwordState }+ );+ updateMaskPaths.push("value.workspace_profile.password_restriction");}// Token durations@@ -245,17 +261,11 @@ export const AccountSection = forwardRef<SectionHandle, AccountSectionProps>(tokenState.accessTokenTimeFormat === "MINUTES"? tokenState.accessTokenDuration * 60: tokenState.accessTokenDuration * 60 * 60;- await settingV1Store.updateWorkspaceProfile({- payload: {- accessTokenDuration: create(DurationSchema, {- seconds: BigInt(seconds),- nanos: 0,- }),- },- updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile.access_token_duration"],- }),+ payload.accessTokenDuration = create(DurationSchema, {+ seconds: BigInt(seconds),+ nanos: 0,});+ updateMaskPaths.push("value.workspace_profile.access_token_duration");}if (@@ -266,59 +276,60 @@ export const AccountSection = forwardRef<SectionHandle, AccountSectionProps>(tokenState.refreshTokenTimeFormat === "HOURS"? tokenState.refreshTokenDuration * 60 * 60: tokenState.refreshTokenDuration * 24 * 60 * 60;- await settingV1Store.updateWorkspaceProfile({- payload: {- refreshTokenDuration: create(DurationSchema, {- seconds: BigInt(seconds),- nanos: 0,- }),- },- updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile.refresh_token_duration"],- }),+ payload.refreshTokenDuration = create(DurationSchema, {+ seconds: BigInt(seconds),+ nanos: 0,});+ updateMaskPaths.push("value.workspace_profile.refresh_token_duration");}if (initToken.inactiveTimeout !== tokenState.inactiveTimeout) {- await settingV1Store.updateWorkspaceProfile({- payload: {- inactiveSessionTimeout: create(DurationSchema, {- seconds: BigInt(tokenState.inactiveTimeout * 60 * 60),- nanos: 0,- }),- },- updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile.inactive_session_timeout"],- }),+ payload.inactiveSessionTimeout = create(DurationSchema, {+ seconds: BigInt(tokenState.inactiveTimeout * 60 * 60),+ nanos: 0,});+ updateMaskPaths.push(+ "value.workspace_profile.inactive_session_timeout"+ );}// Toggle fieldsconst initToggle = getInitialToggleState();- const updateMaskPaths: string[] = [];if (toggleState.disallowSignup !== initToggle.disallowSignup) {+ payload.disallowSignup = toggleState.disallowSignup;updateMaskPaths.push("value.workspace_profile.disallow_signup");}if (toggleState.require2fa !== initToggle.require2fa) {+ payload.require2fa = toggleState.require2fa;updateMaskPaths.push("value.workspace_profile.require_2fa");}if (toggleState.disallowPasswordSignin !== initToggle.disallowPasswordSignin) {+ payload.disallowPasswordSignin = toggleState.disallowPasswordSignin;updateMaskPaths.push("value.workspace_profile.disallow_password_signin");}- if (updateMaskPaths.length > 0) {- await settingV1Store.updateWorkspaceProfile({- payload: {- disallowSignup: toggleState.disallowSignup,- require2fa: toggleState.require2fa,- disallowPasswordSignin: toggleState.disallowPasswordSignin,- },- updateMask: create(FieldMaskSchema, { paths: updateMaskPaths }),- });+ if (+ toggleState.allowEmailCodeSignin !== initToggle.allowEmailCodeSignin+ ) {+ payload.allowEmailCodeSignin = toggleState.allowEmailCodeSignin;+ updateMaskPaths.push("value.workspace_profile.allow_email_code_signin");}++ if (updateMaskPaths.length === 0) return;++ await settingV1Store.updateWorkspaceProfile({+ payload,+ updateMask: create(FieldMaskSchema, { paths: updateMaskPaths }),+ });++ // Reset local state from the (now-updated) Vue store so isDirty clears+ // and the parent's bottom bar disappears.+ setToggleState(getInitialToggleState());+ setPasswordState(getInitialPasswordRestriction());+ setTokenState(getInitialTokenState());}, [toggleState,passwordState,@@ -655,6 +666,49 @@ export const AccountSection = forwardRef<SectionHandle, AccountSectionProps>(</div></div>)}++ {/* Sub-section 5: Allow email-code signin (non-SaaS only; requires EMAIL setting).+ Hidden in production until the email configuration UI is built. */}+ {!isSaaSMode && isDev() && (+ <div className="lg:mt-0">+ <div className="flex items-center gap-x-2">+ <input+ type="checkbox"+ checked={toggleState.allowEmailCodeSignin}+ disabled={+ disabled ||+ (!toggleState.allowEmailCodeSignin && !hasEmailSetting)+ }+ onChange={(e) =>+ setToggleState((s) => ({+ ...s,+ allowEmailCodeSignin: e.target.checked,+ }))+ }+ />+ <span className="text-base font-semibold flex items-center gap-x-2">+ {t(+ "settings.general.workspace.allow-email-code-signin.enable"+ )}+ {!toggleState.allowEmailCodeSignin &&+ !hasEmailSetting && (+ <span+ title={t(+ "settings.general.workspace.allow-email-code-signin.require-email-setting"+ )}+ >+ <TriangleAlert className="w-4 text-warning" />+ </span>+ )}+ </span>+ </div>+ <div className="mt-1 text-sm text-gray-400">+ {t(+ "settings.general.workspace.allow-email-code-signin.description"+ )}+ </div>+ </div>+ )}</div><hr className="my-6" />diff --git a/frontend/src/store/modules/v1/auth.ts b/frontend/src/store/modules/v1/auth.tsindex 66f03d9acb..b4225309e2 100644--- a/frontend/src/store/modules/v1/auth.ts+++ b/frontend/src/store/modules/v1/auth.ts@@ -14,11 +14,17 @@ import {} from "@/router/auth";import { SETUP_MODULE } from "@/router/setup";import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";-import { useActuatorV1Store, useAppFeature, useUserStore } from "@/store";+import {+ useActuatorV1Store,+ useAppFeature,+ useUserStore,+ useWorkspaceV1Store,+} from "@/store";import { UNKNOWN_USER_NAME, unknownUser } from "@/types";import {type LoginRequest,LoginRequestSchema,+ SendEmailLoginCodeRequestSchema,SignupRequestSchema,} from "@/types/proto-es/v1/auth_service_pb";import { DatabaseChangeMode } from "@/types/proto-es/v1/setting_service_pb";@@ -117,6 +123,10 @@ export const useAuthStore = defineStore("auth_v1", () => {setRequireResetPassword(resp.requireResetPassword);await actuatorStore.fetchServerInfo(user?.workspace);+ // Re-fetch the current workspace now that we're authenticated — the+ // workspace store watcher may have tried (and failed) pre-login when+ // workspaceResourceName was already set from the signin page's actuator fetch.+ await useWorkspaceV1Store().fetchCurrentWorkspace();// After user login, we need to reset the auth session key.authSessionKey.value = uniqueId();@@ -216,6 +226,12 @@ export const useAuthStore = defineStore("auth_v1", () => {}};+ const sendEmailLoginCode = async (email: string, workspace?: string) => {+ await authServiceClientConnect.sendEmailLoginCode(+ create(SendEmailLoginCodeRequestSchema, { email, workspace })+ );+ };+// Update currentUserName after self email change.// Sets flag to suppress "logged in as another user" notification.const updateCurrentUserNameForEmailChange = (newName: string) => {@@ -235,6 +251,7 @@ export const useAuthStore = defineStore("auth_v1", () => {logout,fetchCurrentUser,setRequireResetPassword,+ sendEmailLoginCode,updateCurrentUserNameForEmailChange,};});diff --git a/frontend/src/store/modules/v1/workspace.ts b/frontend/src/store/modules/v1/workspace.tsindex d10d48636d..8990136064 100644--- a/frontend/src/store/modules/v1/workspace.ts+++ b/frontend/src/store/modules/v1/workspace.ts@@ -215,6 +215,15 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {return specificRoles;};+ const fetchCurrentWorkspace = async () => {+ const name =+ actuatorStore.workspaceResourceName || `${workspaceNamePrefix}-`;+ const workspace = await workspaceServiceClientConnect.getWorkspace({+ name,+ });+ currentWorkspace.value = workspace;+ };+const fetchWorkspaceList = async () => {const resp = await workspaceServiceClientConnect.listWorkspaces({});workspaceList.value = resp.workspaces;@@ -244,6 +253,7 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {workspaceList,currentWorkspace,updateWorkspace,+ fetchCurrentWorkspace,fetchWorkspaceList,switchWorkspace,};diff --git a/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts b/frontend/src/types/proto-es/v1/actuator_service_pb.d.tsindex 0140de6421..c8f5bdceff 100644--- a/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts@@ -94,6 +94,14 @@ export declare type Restriction = Message<"bytebase.v1.Restriction"> & {* @generated from field: bool allow_email_code_signin = 4;*/allowEmailCodeSignin: boolean;++ /**+ * Whether password reset via email is available for this workspace.+ * True when the workspace (or deployment) has an email setting configured.+ *+ * @generated from field: bool password_reset_enabled = 5;+ */+ passwordResetEnabled: boolean;};/**diff --git a/frontend/src/types/proto-es/v1/actuator_service_pb.js b/frontend/src/types/proto-es/v1/actuator_service_pb.jsindex 1aab3e981c..f6850a96e5 100644--- a/frontend/src/types/proto-es/v1/actuator_service_pb.js+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.js@@ -15,7 +15,7 @@ import { file_v1_setting_service } from "./setting_service_pb";* Describes the file v1/actuator_service.proto.*/export const file_v1_actuator_service = /*@__PURE__*/- fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIUChJTZXR1cFNhbXBsZVJlcXVlc3QiQwoWR2V0QWN0dWF0b3JJbmZvUmVxdWVzdBIpCgRuYW1lGAEgASgJQhv6QRgKFmJ5dGViYXNlLmNvbS9Xb3Jrc3BhY2UiFAoSRGVsZXRlQ2FjaGVSZXF1ZXN0ItUBCgtSZXN0cmljdGlvbhIcCg9kaXNhbGxvd19zaWdudXAYASABKAhCA+BBAxIlChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YAiABKAhCA+BBAxJbChRwYXNzd29yZF9yZXN0cmljdGlvbhgDIAEoCzI4LmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nLlBhc3N3b3JkUmVzdHJpY3Rpb25CA+BBAxIkChdhbGxvd19lbWFpbF9jb2RlX3NpZ25pbhgEIAEoCEID4EEDIqUFCgxBY3R1YXRvckluZm8SFAoHdmVyc2lvbhgBIAEoCUID4EEDEhcKCmdpdF9jb21taXQYAiABKAlCA+BBAxIVCghyZWFkb25seRgDIAEoCEID4EEDEhEKBHNhYXMYBCABKAhCA+BBAxIRCgRkZW1vGAUgASgIQgPgQQMSEQoEaG9zdBgGIAEoCUID4EEDEhEKBHBvcnQYByABKAlCA+BBAxIZCgxleHRlcm5hbF91cmwYCCABKAlCA+BBAxI5ChBsYXN0X2FjdGl2ZV90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhYKCXdvcmtzcGFjZRgNIAEoCUID4EEDEiAKE3VubGljZW5zZWRfZmVhdHVyZXMYDyADKAlCA+BBAxITCgZkb2NrZXIYEiABKAhCA+BBAxIhChRhY3RpdmF0ZWRfdXNlcl9jb3VudBgTIAEoBUID4EEDEiUKGGFjdGl2YXRlZF9pbnN0YW5jZV9jb3VudBgUIAEoBUID4EEDEiEKFHRvdGFsX2luc3RhbmNlX2NvdW50GBUgASgFQgPgQQMSGgoNZW5hYmxlX3NhbXBsZRgWIAEoCEID4EEDEiMKFmV4dGVybmFsX3VybF9mcm9tX2ZsYWcYFyABKAhCA+BBAxIaCg1yZXBsaWNhX2NvdW50GBggASgFQgPgQQMSMgoLcmVzdHJpY3Rpb24YGSABKAsyGC5ieXRlYmFzZS52MS5SZXN0cmljdGlvbkID4EEDEhwKD2RlZmF1bHRfcHJvamVjdBgaIAEoCUID4EEDEh4KEXVzZXJfY291bnRfaW5faWFtGBsgASgFQgPgQQNKBAgJEApKBAgKEAtKBAgMEA1KBAgQEBFKBAgREBJKBAgOEA8ynQMKD0FjdHVhdG9yU2VydmljZRKcAQoPR2V0QWN0dWF0b3JJbmZvEiMuYnl0ZWJhc2UudjEuR2V0QWN0dWF0b3JJbmZvUmVxdWVzdBoZLmJ5dGViYXNlLnYxLkFjdHVhdG9ySW5mbyJJ2kEAgOowAYLT5JMCPFonEiUvdjEve25hbWU9d29ya3NwYWNlcy8qfS9hY3R1YXRvci9pbmZvEhEvdjEvYWN0dWF0b3IvaW5mbxKCAQoLU2V0dXBTYW1wbGUSHy5ieXRlYmFzZS52MS5TZXR1cFNhbXBsZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiOorqMBJiYi5wcm9qZWN0cy5jcmVhdGWQ6jABgtPkkwIaIhgvdjEvYWN0dWF0b3I6c2V0dXBTYW1wbGUSZgoLRGVsZXRlQ2FjaGUSHy5ieXRlYmFzZS52MS5EZWxldGVDYWNoZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiHoDqMAGC0+STAhQqEi92MS9hY3R1YXRvci9jYWNoZUKqAQoPY29tLmJ5dGViYXNlLnYxQhRBY3R1YXRvclNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_timestamp, file_v1_annotation, file_v1_setting_service]);+ fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIUChJTZXR1cFNhbXBsZVJlcXVlc3QiQwoWR2V0QWN0dWF0b3JJbmZvUmVxdWVzdBIpCgRuYW1lGAEgASgJQhv6QRgKFmJ5dGViYXNlLmNvbS9Xb3Jrc3BhY2UiFAoSRGVsZXRlQ2FjaGVSZXF1ZXN0IvoBCgtSZXN0cmljdGlvbhIcCg9kaXNhbGxvd19zaWdudXAYASABKAhCA+BBAxIlChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YAiABKAhCA+BBAxJbChRwYXNzd29yZF9yZXN0cmljdGlvbhgDIAEoCzI4LmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nLlBhc3N3b3JkUmVzdHJpY3Rpb25CA+BBAxIkChdhbGxvd19lbWFpbF9jb2RlX3NpZ25pbhgEIAEoCEID4EEDEiMKFnBhc3N3b3JkX3Jlc2V0X2VuYWJsZWQYBSABKAhCA+BBAyKlBQoMQWN0dWF0b3JJbmZvEhQKB3ZlcnNpb24YASABKAlCA+BBAxIXCgpnaXRfY29tbWl0GAIgASgJQgPgQQMSFQoIcmVhZG9ubHkYAyABKAhCA+BBAxIRCgRzYWFzGAQgASgIQgPgQQMSEQoEZGVtbxgFIAEoCEID4EEDEhEKBGhvc3QYBiABKAlCA+BBAxIRCgRwb3J0GAcgASgJQgPgQQMSGQoMZXh0ZXJuYWxfdXJsGAggASgJQgPgQQMSOQoQbGFzdF9hY3RpdmVfdGltZRgLIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIWCgl3b3Jrc3BhY2UYDSABKAlCA+BBAxIgChN1bmxpY2Vuc2VkX2ZlYXR1cmVzGA8gAygJQgPgQQMSEwoGZG9ja2VyGBIgASgIQgPgQQMSIQoUYWN0aXZhdGVkX3VzZXJfY291bnQYEyABKAVCA+BBAxIlChhhY3RpdmF0ZWRfaW5zdGFuY2VfY291bnQYFCABKAVCA+BBAxIhChR0b3RhbF9pbnN0YW5jZV9jb3VudBgVIAEoBUID4EEDEhoKDWVuYWJsZV9zYW1wbGUYFiABKAhCA+BBAxIjChZleHRlcm5hbF91cmxfZnJvbV9mbGFnGBcgASgIQgPgQQMSGgoNcmVwbGljYV9jb3VudBgYIAEoBUID4EEDEjIKC3Jlc3RyaWN0aW9uGBkgASgLMhguYnl0ZWJhc2UudjEuUmVzdHJpY3Rpb25CA+BBAxIcCg9kZWZhdWx0X3Byb2plY3QYGiABKAlCA+BBAxIeChF1c2VyX2NvdW50X2luX2lhbRgbIAEoBUID4EEDSgQICRAKSgQIChALSgQIDBANSgQIEBARSgQIERASSgQIDhAPMp0DCg9BY3R1YXRvclNlcnZpY2USnAEKD0dldEFjdHVhdG9ySW5mbxIjLmJ5dGViYXNlLnYxLkdldEFjdHVhdG9ySW5mb1JlcXVlc3QaGS5ieXRlYmFzZS52MS5BY3R1YXRvckluZm8iSdpBAIDqMAGC0+STAjxaJxIlL3YxL3tuYW1lPXdvcmtzcGFjZXMvKn0vYWN0dWF0b3IvaW5mbxIRL3YxL2FjdHVhdG9yL2luZm8SggEKC1NldHVwU2FtcGxlEh8uYnl0ZWJhc2UudjEuU2V0dXBTYW1wbGVSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjqK6jASYmIucHJvamVjdHMuY3JlYXRlkOowAYLT5JMCGiIYL3YxL2FjdHVhdG9yOnNldHVwU2FtcGxlEmYKC0RlbGV0ZUNhY2hlEh8uYnl0ZWJhc2UudjEuRGVsZXRlQ2FjaGVSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5Ih6A6jABgtPkkwIUKhIvdjEvYWN0dWF0b3IvY2FjaGVCqgEKD2NvbS5ieXRlYmFzZS52MUIUQWN0dWF0b3JTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_timestamp, file_v1_annotation, file_v1_setting_service]);/*** Describes the message bytebase.v1.SetupSampleRequest.diff --git a/frontend/src/types/proto-es/v1/auth_service_pb.d.ts b/frontend/src/types/proto-es/v1/auth_service_pb.d.tsindex 8f7a5ace64..a000bf55c0 100644--- a/frontend/src/types/proto-es/v1/auth_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/auth_service_pb.d.ts@@ -81,6 +81,17 @@ export declare type LoginRequest = Message<"bytebase.v1.LoginRequest"> & {* @generated from field: optional string email_code = 9;*/emailCode?: string;++ /**+ * Preferred workspace to land in after login. If the user is a member of this+ * workspace, the token is issued for it; otherwise falls back to the default+ * resolution (last login workspace → first membership). Typically populated+ * from the ?workspace= query parameter in invite links.+ * Format: workspaces/{workspace}+ *+ * @generated from field: optional string workspace = 10;+ */+ workspace?: string;};/**diff --git a/frontend/src/types/proto-es/v1/auth_service_pb.js b/frontend/src/types/proto-es/v1/auth_service_pb.jsindex 1c02fdbaab..40313353dd 100644--- a/frontend/src/types/proto-es/v1/auth_service_pb.js+++ b/frontend/src/types/proto-es/v1/auth_service_pb.js@@ -12,7 +12,7 @@ import { file_v1_user_service } from "./user_service_pb";* Describes the file v1/auth_service.proto.*/export const file_v1_auth_service = /*@__PURE__*/- fileDesc("ChV2MS9hdXRoX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIrMCCgxMb2dpblJlcXVlc3QSDQoFZW1haWwYASABKAkSEAoIcGFzc3dvcmQYAiABKAkSCwoDd2ViGAMgASgIEhAKCGlkcF9uYW1lGAQgASgJEjkKC2lkcF9jb250ZXh0GAUgASgLMiQuYnl0ZWJhc2UudjEuSWRlbnRpdHlQcm92aWRlckNvbnRleHQSFQoIb3RwX2NvZGUYBiABKAlIAIgBARIaCg1yZWNvdmVyeV9jb2RlGAcgASgJSAGIAQESGwoObWZhX3RlbXBfdG9rZW4YCCABKAlIAogBARIXCgplbWFpbF9jb2RlGAkgASgJSAOIAQFCCwoJX290cF9jb2RlQhAKDl9yZWNvdmVyeV9jb2RlQhEKD19tZmFfdGVtcF90b2tlbkINCgtfZW1haWxfY29kZSKsAQoXSWRlbnRpdHlQcm92aWRlckNvbnRleHQSRAoOb2F1dGgyX2NvbnRleHQYASABKAsyKi5ieXRlYmFzZS52MS5PQXV0aDJJZGVudGl0eVByb3ZpZGVyQ29udGV4dEgAEkAKDG9pZGNfY29udGV4dBgCIAEoCzIoLmJ5dGViYXNlLnYxLk9JRENJZGVudGl0eVByb3ZpZGVyQ29udGV4dEgAQgkKB2NvbnRleHQiLQodT0F1dGgySWRlbnRpdHlQcm92aWRlckNvbnRleHQSDAoEY29kZRgBIAEoCSIrChtPSURDSWRlbnRpdHlQcm92aWRlckNvbnRleHQSDAoEY29kZRgBIAEoCSKPAQoNTG9naW5SZXNwb25zZRINCgV0b2tlbhgBIAEoCRIbCg5tZmFfdGVtcF90b2tlbhgCIAEoCUgAiAEBEh4KFnJlcXVpcmVfcmVzZXRfcGFzc3dvcmQYAyABKAgSHwoEdXNlchgEIAEoCzIRLmJ5dGViYXNlLnYxLlVzZXJCEQoPX21mYV90ZW1wX3Rva2VuIg8KDUxvZ291dFJlcXVlc3QiNAoURXhjaGFuZ2VUb2tlblJlcXVlc3QSDQoFdG9rZW4YASABKAkSDQoFZW1haWwYAiABKAkiLQoVRXhjaGFuZ2VUb2tlblJlc3BvbnNlEhQKDGFjY2Vzc190b2tlbhgBIAEoCSI/Cg1TaWdudXBSZXF1ZXN0Eg0KBWVtYWlsGAEgASgJEhAKCHBhc3N3b3JkGAIgASgJEg0KBXRpdGxlGAMgASgJIhAKDlJlZnJlc2hSZXF1ZXN0IhEKD1JlZnJlc2hSZXNwb25zZSJSChtSZXF1ZXN0UGFzc3dvcmRSZXNldFJlcXVlc3QSDQoFZW1haWwYASABKAkSFgoJd29ya3NwYWNlGAIgASgJSACIAQFCDAoKX3dvcmtzcGFjZSJJChRSZXNldFBhc3N3b3JkUmVxdWVzdBINCgVlbWFpbBgBIAEoCRIMCgRjb2RlGAIgASgJEhQKDG5ld19wYXNzd29yZBgDIAEoCSJQChlTZW5kRW1haWxMb2dpbkNvZGVSZXF1ZXN0Eg0KBWVtYWlsGAEgASgJEhYKCXdvcmtzcGFjZRgCIAEoCUgAiAEBQgwKCl93b3Jrc3BhY2UiugEKFlN3aXRjaFdvcmtzcGFjZVJlcXVlc3QSEQoJd29ya3NwYWNlGAEgASgJEgsKA3dlYhgCIAEoCBIVCghvdHBfY29kZRgDIAEoCUgAiAEBEhoKDXJlY292ZXJ5X2NvZGUYBCABKAlIAYgBARIbCg5tZmFfdGVtcF90b2tlbhgFIAEoCUgCiAEBQgsKCV9vdHBfY29kZUIQCg5fcmVjb3ZlcnlfY29kZUIRCg9fbWZhX3RlbXBfdG9rZW4yowgKC0F1dGhTZXJ2aWNlEmEKBUxvZ2luEhkuYnl0ZWJhc2UudjEuTG9naW5SZXF1ZXN0GhouYnl0ZWJhc2UudjEuTG9naW5SZXNwb25zZSIhgOowAZjqMAGC0+STAhM6ASoiDi92MS9hdXRoL2xvZ2luEmAKBkxvZ291dBIaLmJ5dGViYXNlLnYxLkxvZ291dFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiIoDqMAGY6jABgtPkkwIUOgEqIg8vdjEvYXV0aC9sb2dvdXQSgQEKDUV4Y2hhbmdlVG9rZW4SIS5ieXRlYmFzZS52MS5FeGNoYW5nZVRva2VuUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkV4Y2hhbmdlVG9rZW5SZXNwb25zZSIpgOowAZjqMAGC0+STAhs6ASoiFi92MS9hdXRoOmV4Y2hhbmdlVG9rZW4SZAoGU2lnbnVwEhouYnl0ZWJhc2UudjEuU2lnbnVwUmVxdWVzdBoaLmJ5dGViYXNlLnYxLkxvZ2luUmVzcG9uc2UiIoDqMAGY6jABgtPkkwIUOgEqIg8vdjEvYXV0aC9zaWdudXASZQoHUmVmcmVzaBIbLmJ5dGViYXNlLnYxLlJlZnJlc2hSZXF1ZXN0GhwuYnl0ZWJhc2UudjEuUmVmcmVzaFJlc3BvbnNlIh+A6jABgtPkkwIVOgEqIhAvdjEvYXV0aC9yZWZyZXNoEnsKD1N3aXRjaFdvcmtzcGFjZRIjLmJ5dGViYXNlLnYxLlN3aXRjaFdvcmtzcGFjZVJlcXVlc3QaGi5ieXRlYmFzZS52MS5Mb2dpblJlc3BvbnNlIieQ6jACgtPkkwIdOgEqIhgvdjEvYXV0aDpzd2l0Y2hXb3Jrc3BhY2UShgEKFFJlcXVlc3RQYXNzd29yZFJlc2V0EiguYnl0ZWJhc2UudjEuUmVxdWVzdFBhc3N3b3JkUmVzZXRSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IiyA6jABgtPkkwIiOgEqIh0vdjEvYXV0aDpyZXF1ZXN0UGFzc3dvcmRSZXNldBJxCg1SZXNldFBhc3N3b3JkEiEuYnl0ZWJhc2UudjEuUmVzZXRQYXNzd29yZFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiJYDqMAGC0+STAhs6ASoiFi92MS9hdXRoOnJlc2V0UGFzc3dvcmQShAEKElNlbmRFbWFpbExvZ2luQ29kZRImLmJ5dGViYXNlLnYxLlNlbmRFbWFpbExvZ2luQ29kZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiLoDqMAGY6jABgtPkkwIgOgEqIhsvdjEvYXV0aDpzZW5kRW1haWxMb2dpbkNvZGVCpgEKD2NvbS5ieXRlYmFzZS52MUIQQXV0aFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_protobuf_empty, file_v1_annotation, file_v1_user_service]);+ fileDesc("ChV2MS9hdXRoX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxItkCCgxMb2dpblJlcXVlc3QSDQoFZW1haWwYASABKAkSEAoIcGFzc3dvcmQYAiABKAkSCwoDd2ViGAMgASgIEhAKCGlkcF9uYW1lGAQgASgJEjkKC2lkcF9jb250ZXh0GAUgASgLMiQuYnl0ZWJhc2UudjEuSWRlbnRpdHlQcm92aWRlckNvbnRleHQSFQoIb3RwX2NvZGUYBiABKAlIAIgBARIaCg1yZWNvdmVyeV9jb2RlGAcgASgJSAGIAQESGwoObWZhX3RlbXBfdG9rZW4YCCABKAlIAogBARIXCgplbWFpbF9jb2RlGAkgASgJSAOIAQESFgoJd29ya3NwYWNlGAogASgJSASIAQFCCwoJX290cF9jb2RlQhAKDl9yZWNvdmVyeV9jb2RlQhEKD19tZmFfdGVtcF90b2tlbkINCgtfZW1haWxfY29kZUIMCgpfd29ya3NwYWNlIqwBChdJZGVudGl0eVByb3ZpZGVyQ29udGV4dBJECg5vYXV0aDJfY29udGV4dBgBIAEoCzIqLmJ5dGViYXNlLnYxLk9BdXRoMklkZW50aXR5UHJvdmlkZXJDb250ZXh0SAASQAoMb2lkY19jb250ZXh0GAIgASgLMiguYnl0ZWJhc2UudjEuT0lEQ0lkZW50aXR5UHJvdmlkZXJDb250ZXh0SABCCQoHY29udGV4dCItCh1PQXV0aDJJZGVudGl0eVByb3ZpZGVyQ29udGV4dBIMCgRjb2RlGAEgASgJIisKG09JRENJZGVudGl0eVByb3ZpZGVyQ29udGV4dBIMCgRjb2RlGAEgASgJIo8BCg1Mb2dpblJlc3BvbnNlEg0KBXRva2VuGAEgASgJEhsKDm1mYV90ZW1wX3Rva2VuGAIgASgJSACIAQESHgoWcmVxdWlyZV9yZXNldF9wYXNzd29yZBgDIAEoCBIfCgR1c2VyGAQgASgLMhEuYnl0ZWJhc2UudjEuVXNlckIRCg9fbWZhX3RlbXBfdG9rZW4iDwoNTG9nb3V0UmVxdWVzdCI0ChRFeGNoYW5nZVRva2VuUmVxdWVzdBINCgV0b2tlbhgBIAEoCRINCgVlbWFpbBgCIAEoCSItChVFeGNoYW5nZVRva2VuUmVzcG9uc2USFAoMYWNjZXNzX3Rva2VuGAEgASgJIj8KDVNpZ251cFJlcXVlc3QSDQoFZW1haWwYASABKAkSEAoIcGFzc3dvcmQYAiABKAkSDQoFdGl0bGUYAyABKAkiEAoOUmVmcmVzaFJlcXVlc3QiEQoPUmVmcmVzaFJlc3BvbnNlIlIKG1JlcXVlc3RQYXNzd29yZFJlc2V0UmVxdWVzdBINCgVlbWFpbBgBIAEoCRIWCgl3b3Jrc3BhY2UYAiABKAlIAIgBAUIMCgpfd29ya3NwYWNlIkkKFFJlc2V0UGFzc3dvcmRSZXF1ZXN0Eg0KBWVtYWlsGAEgASgJEgwKBGNvZGUYAiABKAkSFAoMbmV3X3Bhc3N3b3JkGAMgASgJIlAKGVNlbmRFbWFpbExvZ2luQ29kZVJlcXVlc3QSDQoFZW1haWwYASABKAkSFgoJd29ya3NwYWNlGAIgASgJSACIAQFCDAoKX3dvcmtzcGFjZSK6AQoWU3dpdGNoV29ya3NwYWNlUmVxdWVzdBIRCgl3b3Jrc3BhY2UYASABKAkSCwoDd2ViGAIgASgIEhUKCG90cF9jb2RlGAMgASgJSACIAQESGgoNcmVjb3ZlcnlfY29kZRgEIAEoCUgBiAEBEhsKDm1mYV90ZW1wX3Rva2VuGAUgASgJSAKIAQFCCwoJX290cF9jb2RlQhAKDl9yZWNvdmVyeV9jb2RlQhEKD19tZmFfdGVtcF90b2tlbjKjCAoLQXV0aFNlcnZpY2USYQoFTG9naW4SGS5ieXRlYmFzZS52MS5Mb2dpblJlcXVlc3QaGi5ieXRlYmFzZS52MS5Mb2dpblJlc3BvbnNlIiGA6jABmOowAYLT5JMCEzoBKiIOL3YxL2F1dGgvbG9naW4SYAoGTG9nb3V0EhouYnl0ZWJhc2UudjEuTG9nb3V0UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIigOowAZjqMAGC0+STAhQ6ASoiDy92MS9hdXRoL2xvZ291dBKBAQoNRXhjaGFuZ2VUb2tlbhIhLmJ5dGViYXNlLnYxLkV4Y2hhbmdlVG9rZW5SZXF1ZXN0GiIuYnl0ZWJhc2UudjEuRXhjaGFuZ2VUb2tlblJlc3BvbnNlIimA6jABmOowAYLT5JMCGzoBKiIWL3YxL2F1dGg6ZXhjaGFuZ2VUb2tlbhJkCgZTaWdudXASGi5ieXRlYmFzZS52MS5TaWdudXBSZXF1ZXN0GhouYnl0ZWJhc2UudjEuTG9naW5SZXNwb25zZSIigOowAZjqMAGC0+STAhQ6ASoiDy92MS9hdXRoL3NpZ251cBJlCgdSZWZyZXNoEhsuYnl0ZWJhc2UudjEuUmVmcmVzaFJlcXVlc3QaHC5ieXRlYmFzZS52MS5SZWZyZXNoUmVzcG9uc2UiH4DqMAGC0+STAhU6ASoiEC92MS9hdXRoL3JlZnJlc2gSewoPU3dpdGNoV29ya3NwYWNlEiMuYnl0ZWJhc2UudjEuU3dpdGNoV29ya3NwYWNlUmVxdWVzdBoaLmJ5dGViYXNlLnYxLkxvZ2luUmVzcG9uc2UiJ5DqMAKC0+STAh06ASoiGC92MS9hdXRoOnN3aXRjaFdvcmtzcGFjZRKGAQoUUmVxdWVzdFBhc3N3b3JkUmVzZXQSKC5ieXRlYmFzZS52MS5SZXF1ZXN0UGFzc3dvcmRSZXNldFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiLIDqMAGC0+STAiI6ASoiHS92MS9hdXRoOnJlcXVlc3RQYXNzd29yZFJlc2V0EnEKDVJlc2V0UGFzc3dvcmQSIS5ieXRlYmFzZS52MS5SZXNldFBhc3N3b3JkUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIlgOowAYLT5JMCGzoBKiIWL3YxL2F1dGg6cmVzZXRQYXNzd29yZBKEAQoSU2VuZEVtYWlsTG9naW5Db2RlEiYuYnl0ZWJhc2UudjEuU2VuZEVtYWlsTG9naW5Db2RlUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIugOowAZjqMAGC0+STAiA6ASoiGy92MS9hdXRoOnNlbmRFbWFpbExvZ2luQ29kZUKmAQoPY29tLmJ5dGViYXNlLnYxQhBBdXRoU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_protobuf_empty, file_v1_annotation, file_v1_user_service]);/*** Describes the message bytebase.v1.LoginRequest.diff --git a/frontend/src/utils/auth.ts b/frontend/src/utils/auth.tsindex 513a3709ee..fc4001d9a1 100644--- a/frontend/src/utils/auth.ts+++ b/frontend/src/utils/auth.ts@@ -1,3 +1,4 @@+import { router } from "@/router";import {AUTH_MFA_MODULE,AUTH_OAUTH_CALLBACK_MODULE,@@ -8,6 +9,7 @@ import {AUTH_SIGNIN_MODULE,AUTH_SIGNUP_MODULE,} from "@/router/auth";+import { useActuatorV1Store } from "@/store";export const isAuthRelatedRoute = (routeName: string) => {return [@@ -21,3 +23,14 @@ export const isAuthRelatedRoute = (routeName: string) => {AUTH_OIDC_CALLBACK_MODULE,].includes(routeName);};++export const resolveWorkspaceName = (): string | undefined => {+ const actuatorStore = useActuatorV1Store();+ const route = router.currentRoute.value;++ const workspaceID = route.query["workspace"] as string | undefined;+ const workspaceNameFromQuery = workspaceID+ ? `workspaces/${workspaceID}`+ : undefined;+ return actuatorStore.workspaceResourceName || workspaceNameFromQuery;+};diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.tsindex b4ae2ca79a..5e9a33039c 100644--- a/frontend/src/utils/index.ts+++ b/frontend/src/utils/index.ts@@ -20,6 +20,7 @@ export * from "./TinyTimer";export * from "./sheet";export * from "./naive-ui";export * from "./workloadIdentity";+export * from "./auth";export * from "./v1";export * from "./iam";diff --git a/frontend/src/views/OAuthCallback.vue b/frontend/src/views/OAuthCallback.vueindex 267be81b6b..32e3a11ede 100644--- a/frontend/src/views/OAuthCallback.vue+++ b/frontend/src/views/OAuthCallback.vue@@ -34,6 +34,7 @@ import { AUTH_SIGNIN_MODULE } from "@/router/auth";import { useAuthStore } from "@/store";import { LoginRequestSchema } from "@/types/proto-es/v1/auth_service_pb";import { IdentityProviderType } from "@/types/proto-es/v1/idp_service_pb";+import { resolveWorkspaceName } from "@/utils";import { clearOAuthState, retrieveOAuthState } from "@/utils/sso";import type { OAuthState, OAuthWindowEventPayload } from "../types";@@ -194,6 +195,7 @@ const triggerAuthCallback = async () => {},},},+ workspace: resolveWorkspaceName(),}),redirect: true,redirectUrl: oAuthState.redirect,diff --git a/frontend/src/views/auth/MultiFactor.vue b/frontend/src/views/auth/MultiFactor.vueindex d895747794..23a5e896b6 100644--- a/frontend/src/views/auth/MultiFactor.vue+++ b/frontend/src/views/auth/MultiFactor.vue@@ -73,6 +73,7 @@ import { useRoute } from "vue-router";import { BBTextField } from "@/bbkit";import { useAuthStore } from "@/store";import { LoginRequestSchema } from "@/types/proto-es/v1/auth_service_pb";+import { resolveWorkspaceName } from "@/utils";type MFAType = "OTP" | "RECOVERY_CODE";@@ -113,6 +114,7 @@ const onOtpCodeFinish = async (value: string[]) => {const challenge = async () => {const request = create(LoginRequestSchema, {mfaTempToken: mfaTempToken.value,+ workspace: resolveWorkspaceName(),});if (state.selectedMFAType === "OTP") {request.otpCode = state.otpCodes.join("");diff --git a/frontend/src/views/auth/PasswordForgot.vue b/frontend/src/views/auth/PasswordForgot.vueindex 6569fd67e8..92aa6e24a2 100644--- a/frontend/src/views/auth/PasswordForgot.vue+++ b/frontend/src/views/auth/PasswordForgot.vue@@ -8,26 +8,45 @@</div><div class="mt-8">- <div class="mt-6">- <!-- TODO(ed): support self-service reset password -->- <BBAttention type="warning" :title="hint">- <template v-if="actuatorStore.isSaaSMode && !hint">- <i18n-t- tag="h3"- class="text-sm font-medium text-yellow-800"- keypath="auth.password-forget.contact-us"+ <div class="mt-6 flex flex-col gap-y-4">+ <BBAttention+ v-if="!passwordResetEnabled"+ type="warning"+ :title="$t('auth.password-forget.selfhost')"+ />+ <template v-else>+ <div>+ <label+ for="forgot-email"+ class="block text-sm font-medium leading-5 text-control">- <template #email>- <a- href="mailto:[email protected]"- class="normal-link"- >- </a>- </template>- </i18n-t>- </template>- </BBAttention>+ {{ $t("common.email") }}+ </label>+ <div class="mt-1">+ <BBTextField+ v-model:value="email"+ required+ :input-props="{+ id: 'forgot-email',+ autocomplete: 'email',+ type: 'email',+ }"+ placeholder="[email protected]"+ @keyup.enter="onSubmit"+ />+ </div>+ </div>+ <NButton+ type="primary"+ size="large"+ style="width: 100%"+ :disabled="!isValidEmail(email) || isLoading"+ :loading="isLoading"+ @click="onSubmit"+ >+ {{ $t("auth.password-forget.send-reset-code") }}+ </NButton>+ </template></div></div>@@ -48,26 +67,54 @@</template><script lang="ts" setup>-import { computed } from "vue";+import { NButton } from "naive-ui";+import { computed, onMounted, ref } from "vue";import { useI18n } from "vue-i18n";-import { useRoute } from "vue-router";-import { BBAttention } from "@/bbkit";-import { AUTH_SIGNIN_MODULE } from "@/router/auth";-import { useActuatorV1Store } from "@/store";+import { useRoute, useRouter } from "vue-router";+import { BBAttention, BBTextField } from "@/bbkit";+import { authServiceClientConnect } from "@/connect";+import { AUTH_PASSWORD_RESET_MODULE, AUTH_SIGNIN_MODULE } from "@/router/auth";+import { pushNotification, useActuatorV1Store } from "@/store";+import { isValidEmail, resolveWorkspaceName } from "@/utils";+const actuatorStore = useActuatorV1Store();+const router = useRouter();const route = useRoute();const { t } = useI18n();-const actuatorStore = useActuatorV1Store();-const hint = computed(() => {- const hint = route.query.hint as string;- if (hint) {- return hint;- }- if (!actuatorStore.isSaaSMode) {- return t("auth.password-forget.selfhost");- }+const passwordResetEnabled = computed(+ () => actuatorStore.serverInfo?.restriction?.passwordResetEnabled ?? false+);- return "";+onMounted(() => {+ if (actuatorStore.serverInfo?.restriction?.disallowPasswordSignin) {+ router.replace({ name: AUTH_SIGNIN_MODULE, query: route.query });+ }});++const email = ref("");+const isLoading = ref(false);++const onSubmit = async () => {+ if (!isValidEmail(email.value) || isLoading.value) return;+ isLoading.value = true;+ try {+ await authServiceClientConnect.requestPasswordReset({+ email: email.value,+ workspace: resolveWorkspaceName(),+ });+ router.push({+ name: AUTH_PASSWORD_RESET_MODULE,+ query: { ...route.query, email: email.value },+ });+ } catch {+ pushNotification({+ module: "bytebase",+ style: "CRITICAL",+ title: t("auth.password-forget.failed-to-send-code"),+ });+ } finally {+ isLoading.value = false;+ }+};</script>diff --git a/frontend/src/views/auth/PasswordReset.vue b/frontend/src/views/auth/PasswordReset.vueindex b16fc7285a..46b6b2a26c 100644--- a/frontend/src/views/auth/PasswordReset.vue+++ b/frontend/src/views/auth/PasswordReset.vue@@ -1,46 +1,105 @@<template><div class="mx-auto w-full max-w-sm">- <div>- <img class="h-12 w-auto" src="@/assets/logo-full.svg" alt="Bytebase" />- <h2 class="mt-6 text-3xl leading-9 font-extrabold text-main">- {{ $t("auth.password-reset.title") }}- </h2>- <p class="textinfo mt-2">- {{ $t("auth.password-reset.content") }}- </p>+ <img class="h-12 w-auto" src="@/assets/logo-full.svg" alt="Bytebase" />+ <h2 class="mt-6 text-3xl leading-9 font-extrabold text-main">+ {{ $t("auth.password-reset.title") }}+ </h2>+ <p class="textinfo mt-2">+ {{ $t("auth.password-reset.content") }}+ </p>++ <div class="mt-8 flex flex-col gap-y-6">+ <!-- Code-based mode: email + code fields -->+ <template v-if="codeMode">+ <div>+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("common.email") }}+ <RequiredStar />+ </label>+ <BBTextField+ v-model:value="state.email"+ required+ :input-props="{+ autocomplete: 'email',+ type: 'email',+ }"+ class="mt-1"+ disabled+ />+ </div>+ <div>+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("auth.password-reset.code-label") }}+ <RequiredStar />+ </label>+ <NInputOtp+ v-model:value="state.codeParts"+ :length="6"+ class="mt-1 w-full email-code-otp"+ />+ <div class="mt-2 flex items-center justify-end">+ <NButton+ text+ :disabled="resendCountdown > 0"+ @click="resendCode"+ >+ {{+ resendCountdown > 0+ ? $t("auth.sign-in.resend-in", { seconds: resendCountdown })+ : $t("auth.sign-in.resend-code")+ }}+ </NButton>+ </div>+ </div>+ </template>++ <UserPassword+ ref="userPasswordRef"+ v-model:password="state.password"+ v-model:password-confirm="state.passwordConfirm"+ :show-learn-more="false"+ :password-restriction="passwordRestrictionSetting"+ />++ <NButton+ type="primary"+ size="large"+ style="width: 100%"+ :disabled="!allowConfirm"+ @click="onConfirm"+ >+ {{ $t("common.confirm") }}+ </NButton></div>- <div class="mt-8">- <div class="mt-6 flex flex-col gap-y-6">- <UserPassword- ref="userPasswordRef"- v-model:password="state.password"- v-model:password-confirm="state.passwordConfirm"- :show-learn-more="false"- :password-restriction="passwordRestrictionSetting"- />- <NButton- type="primary"- size="large"- style="width: 100%"- :disabled="!allowConfirm"- @click="onConfirm"+ <div v-if="codeMode" class="mt-6 relative">+ <div class="absolute inset-0 flex items-center" aria-hidden="true">+ <div class="w-full border-t border-control-border"></div>+ </div>+ <div class="relative flex justify-center text-sm">+ <router-link+ :to="{ name: AUTH_SIGNIN_MODULE, query: $route.query }"+ class="accent-link bg-white px-2">- {{ $t("common.confirm") }}- </NButton>+ {{ $t("auth.password-forget.return-to-sign-in") }}+ </router-link></div></div></div></template><script lang="ts" setup>-import { create as createProto } from "@bufbuild/protobuf";+import { create, create as createProto } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";-import { NButton } from "naive-ui";-import { computed, onMounted, reactive, ref } from "vue";+import { NButton, NInputOtp } from "naive-ui";+import { computed, onMounted, onUnmounted, reactive, ref } from "vue";import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";+import { useRoute, useRouter } from "vue-router";+import { BBTextField } from "@/bbkit";+import RequiredStar from "@/components/RequiredStar.vue";import UserPassword from "@/components/User/Settings/UserPassword.vue";+import { authServiceClientConnect } from "@/connect";+import { AUTH_SIGNIN_MODULE } from "@/router/auth";import {pushNotification,useActuatorV1Store,@@ -48,25 +107,74 @@ import {useCurrentUserV1,useUserStore,} from "@/store";+import {+ LoginRequestSchema,+ ResetPasswordRequestSchema,+} from "@/types/proto-es/v1/auth_service_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";import { UpdateUserRequestSchema } from "@/types/proto-es/v1/user_service_pb";+import { resolveWorkspaceName } from "@/utils";interface LocalState {+ email: string;+ codeParts: string[];password: string;passwordConfirm: string;}-const state = reactive<LocalState>({- password: "",- passwordConfirm: "",-});-const { t } = useI18n();+const route = useRoute();+const router = useRouter();const me = useCurrentUserV1();const userStore = useUserStore();const authStore = useAuthStore();const userPasswordRef = ref<InstanceType<typeof UserPassword>>();-const router = useRouter();++const state = reactive<LocalState>({+ email: "",+ codeParts: [],+ password: "",+ passwordConfirm: "",+});++const codeMode = computed(() => !!route.query.email);++// Resend cooldown — starts at 60s (code was just sent from PasswordForgot).+const resendCountdown = ref(60);+let countdownTimer: ReturnType<typeof setInterval> | null = null;++const startCountdown = () => {+ resendCountdown.value = 60;+ if (countdownTimer) clearInterval(countdownTimer);+ countdownTimer = setInterval(() => {+ resendCountdown.value -= 1;+ if (resendCountdown.value <= 0 && countdownTimer) {+ clearInterval(countdownTimer);+ countdownTimer = null;+ }+ }, 1000);+};++const resendCode = async () => {+ if (resendCountdown.value > 0 || !state.email) return;+ try {+ await authServiceClientConnect.requestPasswordReset({+ email: state.email,+ workspace: resolveWorkspaceName(),+ });+ startCountdown();+ } catch {+ pushNotification({+ module: "bytebase",+ style: "CRITICAL",+ title: t("auth.password-forget.failed-to-send-code"),+ });+ }+};++onUnmounted(() => {+ if (countdownTimer) clearInterval(countdownTimer);+});const passwordRestrictionSetting = computed(() => useActuatorV1Store().serverInfo?.restriction?.passwordRestriction@@ -77,17 +185,27 @@ const redirectQuery = computed(() => {return query.get("redirect") || "/";});-onMounted(async () => {+onMounted(() => {+ if (codeMode.value) {+ // If password signin is disabled, resetting a password is pointless.+ if (useActuatorV1Store().serverInfo?.restriction?.disallowPasswordSignin) {+ router.replace({ name: AUTH_SIGNIN_MODULE, query: route.query });+ return;+ }+ state.email = route.query.email as string;+ startCountdown();+ return;+ }+ // Forced-reset mode: if user doesn't need to reset, redirect away.if (!authStore.requireResetPassword) {router.replace(redirectQuery.value);- return;}});const allowConfirm = computed(() => {- if (!state.password) {+ if (!state.password) return false;+ if (codeMode.value && (!state.email || state.codeParts.join("").length !== 6))return false;- }return (!userPasswordRef.value?.passwordHint &&!userPasswordRef.value?.passwordMismatch@@ -95,16 +213,44 @@ const allowConfirm = computed(() => {});const onConfirm = async () => {- const patch: User = {- ...me.value,- password: state.password,- };+ if (codeMode.value) {+ try {+ await authServiceClientConnect.resetPassword(+ create(ResetPasswordRequestSchema, {+ email: state.email,+ code: state.codeParts.join(""),+ newPassword: state.password,+ })+ );+ pushNotification({+ module: "bytebase",+ style: "SUCCESS",+ title: t("common.updated"),+ });+ // Auto-login with the new password so the user doesn't have to re-enter it.+ await authStore.login({+ request: create(LoginRequestSchema, {+ email: state.email,+ password: state.password,+ workspace: resolveWorkspaceName(),+ }),+ });+ } catch {+ pushNotification({+ module: "bytebase",+ style: "CRITICAL",+ title: t("auth.password-reset.invalid-or-expired-code"),+ });+ }+ return;+ }++ // Legacy forced-reset mode.+ const patch: User = { ...me.value, password: state.password };await userStore.updateUser(createProto(UpdateUserRequestSchema, {user: patch,- updateMask: createProto(FieldMaskSchema, {- paths: ["password"],- }),+ updateMask: createProto(FieldMaskSchema, { paths: ["password"] }),}));pushNotification({@@ -116,3 +262,9 @@ const onConfirm = async () => {router.replace(redirectQuery.value);};</script>++<style scoped>+.email-code-otp :deep(.n-input) {+ flex: 1;+}+</style>diff --git a/frontend/src/views/auth/Signin.vue b/frontend/src/views/auth/Signin.vueindex 4de3dd4292..7909eaeffa 100644--- a/frontend/src/views/auth/Signin.vue+++ b/frontend/src/views/auth/Signin.vue@@ -55,6 +55,17 @@</template></NTabPane>+ <NTabPane+ v-if="serverInfo?.restriction?.allowEmailCodeSignin"+ name="email-code"+ :tab="$t('auth.sign-in.email-code-tab')"+ >+ <EmailCodeSigninForm+ :loading="state.isLoading"+ @signin="trySignin"+ />+ </NTabPane>+<templatev-for="identityProvider in groupedIdentityProviderList":key="identityProvider.name"@@ -191,6 +202,7 @@ import { useRoute, useRouter } from "vue-router";import { BBAttention, BBSpin, BBTextField } from "@/bbkit";import BytebaseLogo from "@/components/BytebaseLogo.vue";import DemoSigninForm from "@/components/DemoSigninForm.vue";+import EmailCodeSigninForm from "@/components/EmailCodeSigninForm.vue";import PasswordSigninForm from "@/components/PasswordSigninForm.vue";import RequiredStar from "@/components/RequiredStar.vue";import { AUTH_SIGNUP_MODULE } from "@/router/auth";@@ -207,7 +219,7 @@ import {} from "@/types/proto-es/v1/auth_service_pb";import type { IdentityProvider } from "@/types/proto-es/v1/idp_service_pb";import { IdentityProviderType } from "@/types/proto-es/v1/idp_service_pb";-import { openWindowForSSO } from "@/utils";+import { openWindowForSSO, resolveWorkspaceName } from "@/utils";import AuthFooter from "./AuthFooter.vue";const props = withDefaults(@@ -267,11 +279,15 @@ const groupedIdentityProviderList = computed(() =>const showSignInForm = computed(() => {return (!serverInfo.value?.restriction?.disallowPasswordSignin ||- groupedIdentityProviderList.value.length > 0+ groupedIdentityProviderList.value.length > 0 ||+ serverInfo.value.restriction.allowEmailCodeSignin);});const defaultTabValue = computed(() => {+ if (serverInfo.value?.restriction?.allowEmailCodeSignin) {+ return "email-code";+ }if (!serverInfo.value?.restriction?.disallowPasswordSignin) {return "standard";}@@ -296,12 +312,7 @@ watchEffect(() => {onMounted(async () => {// If a workspace is specified in the query, fetch workspace-scoped actuator and IDPs.- const workspaceID = route.query["workspace"] as string | undefined;- const workspaceNameFromQuery = workspaceID- ? `workspaces/${workspaceID}`- : undefined;- const workspaceName =- actuatorStore.workspaceResourceName || workspaceNameFromQuery;+ const workspaceName = resolveWorkspaceName();try {const [idpList, _] = await Promise.all([@@ -346,6 +357,7 @@ const trySigninWithIdp = (idpName: string) => {email: state.email,password: state.password,idpName: idpName,+ workspace: resolveWorkspaceName(),}));};diff --git a/frontend/src/views/auth/Signup.vue b/frontend/src/views/auth/Signup.vueindex 9294e3bb49..3f2b2d7cb5 100644--- a/frontend/src/views/auth/Signup.vue+++ b/frontend/src/views/auth/Signup.vue@@ -143,6 +143,7 @@import { NButton, NCheckbox } from "naive-ui";import { storeToRefs } from "pinia";import { computed, onMounted, reactive, ref } from "vue";+import { useRoute, useRouter } from "vue-router";import { BBTextField } from "@/bbkit";import BytebaseLogo from "@/components/BytebaseLogo.vue";import RequiredStar from "@/components/RequiredStar.vue";@@ -163,6 +164,8 @@ interface LocalState {isLoading: boolean;}+const router = useRouter();+const route = useRoute();const actuatorStore = useActuatorV1Store();const userPasswordRef = ref<InstanceType<typeof UserPassword>>();@@ -193,6 +196,11 @@ const allowSignup = computed(() => {});onMounted(() => {+ // Signup is closed — redirect to signin. Admin-setup (first user) is always allowed.+ if (!needAdminSetup.value && serverInfo.value?.restriction?.disallowSignup) {+ router.replace({ name: AUTH_SIGNIN_MODULE, query: route.query });+ return;+ }if (needAdminSetup.value) {state.acceptTermsAndPolicy = false;}diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex 848053ad3b..036c91867a 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -23321,6 +23321,17 @@ components:description: |-6-digit code from email for passwordless login/signup.Pairs with `email`. Mutually exclusive with `password` and `idp_name`.+ workspace:+ type:+ - string+ - "null"+ title: workspace+ description: |-+ Preferred workspace to land in after login. If the user is a member of this+ workspace, the token is issued for it; otherwise falls back to the default+ resolution (last login workspace → first membership). Typically populated+ from the ?workspace= query parameter in invite links.+ Format: workspaces/{workspace}title: LoginRequestadditionalProperties: falsebytebase.v1.LoginResponse:@@ -25400,6 +25411,13 @@ components:title: allow_email_code_signindescription: Whether email + 6-digit code signin is enabled for this workspace.readOnly: true+ passwordResetEnabled:+ type: boolean+ title: password_reset_enabled+ description: |-+ Whether password reset via email is available for this workspace.+ True when the workspace (or deployment) has an email setting configured.+ readOnly: truetitle: RestrictionadditionalProperties: falsebytebase.v1.ReviewConfig:diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex a466bd5f95..2a408e6720 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -2752,6 +2752,7 @@ Request message for getting actuator information.| disallow_password_signin | [bool](#bool) | | Whether password-based signin is disabled (except for workspace admins). || password_restriction | [WorkspaceProfileSetting.PasswordRestriction](#bytebase-v1-WorkspaceProfileSetting-PasswordRestriction) | | Password complexity and restriction requirements. || allow_email_code_signin | [bool](#bool) | | Whether email + 6-digit code signin is enabled for this workspace. |+| password_reset_enabled | [bool](#bool) | | Whether password reset via email is available for this workspace. True when the workspace (or deployment) has an email setting configured. |@@ -3559,6 +3560,7 @@ Context for identity provider authentication.| recovery_code | [string](#string) | optional | The recovery_code is used to recovery the user's identity with MFA. || mfa_temp_token | [string](#string) | optional | The mfa_temp_token is used to verify the user's identity by MFA. || email_code | [string](#string) | optional | 6-digit code from email for passwordless login/signup. Pairs with `email`. Mutually exclusive with `password` and `idp_name`. |+| workspace | [string](#string) | optional | Preferred workspace to land in after login. If the user is a member of this workspace, the token is issued for it; otherwise falls back to the default resolution (last login workspace → first membership). Typically populated from the ?workspace= query parameter in invite links. Format: workspaces/{workspace} |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex fc3ae51415..821719ed9a 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -8436,6 +8436,14 @@ or no workspace-scoped fields are returned (SaaS). </p></td><td><p>Whether email + 6-digit code signin is enabled for this workspace. </p></td></tr>+ <tr>+ <td>password_reset_enabled</td>+ <td><a href="#bool">bool</a></td>+ <td></td>+ <td><p>Whether password reset via email is available for this workspace.+True when the workspace (or deployment) has an email setting configured. </p></td>+ </tr>+</tbody></table>@@ -10568,6 +10576,17 @@ Format: idps/{idp} </p></td>Pairs with `email`. Mutually exclusive with `password` and `idp_name`. </p></td></tr>+ <tr>+ <td>workspace</td>+ <td><a href="#string">string</a></td>+ <td>optional</td>+ <td><p>Preferred workspace to land in after login. If the user is a member of this+workspace, the token is issued for it; otherwise falls back to the default+resolution (last login workspace → first membership). Typically populated+from the ?workspace= query parameter in invite links.+Format: workspaces/{workspace} </p></td>+ </tr>+</tbody></table>diff --git a/proto/v1/v1/actuator_service.proto b/proto/v1/v1/actuator_service.protoindex d66f3ff264..b6017d8623 100644--- a/proto/v1/v1/actuator_service.proto+++ b/proto/v1/v1/actuator_service.proto@@ -74,6 +74,10 @@ message Restriction {// Whether email + 6-digit code signin is enabled for this workspace.bool allow_email_code_signin = 4 [(google.api.field_behavior) = OUTPUT_ONLY];++ // Whether password reset via email is available for this workspace.+ // True when the workspace (or deployment) has an email setting configured.+ bool password_reset_enabled = 5 [(google.api.field_behavior) = OUTPUT_ONLY];}// System information and configuration for the Bytebase instance.diff --git a/proto/v1/v1/auth_service.proto b/proto/v1/v1/auth_service.protoindex 0d675907b1..dfd3d070de 100644--- a/proto/v1/v1/auth_service.proto+++ b/proto/v1/v1/auth_service.proto@@ -142,6 +142,13 @@ message LoginRequest {// 6-digit code from email for passwordless login/signup.// Pairs with `email`. Mutually exclusive with `password` and `idp_name`.optional string email_code = 9;++ // Preferred workspace to land in after login. If the user is a member of this+ // workspace, the token is issued for it; otherwise falls back to the default+ // resolution (last login workspace → first membership). Typically populated+ // from the ?workspace= query parameter in invite links.+ // Format: workspaces/{workspace}+ optional string workspace = 10;}// Context for identity provider authentication.