Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: login with workspace (#19657)

ecmadao7cddcbf31ac3
diff --git a/backend/api/auth/auth.go b/backend/api/auth/auth.go
index 6b63bd3405..9ce3c822ba 100644
--- a/backend/api/auth/auth.go
+++ b/backend/api/auth/auth.go
@@ -22,6 +22,7 @@ import (
"github.com/bytebase/bytebase/backend/component/bus"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/enterprise"
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/store"
)
@@ -89,7 +90,7 @@ func (in *APIAuthInterceptor) WrapUnary(next connect.UnaryFunc) connect.UnaryFun
}
ctx = context.WithValue(ctx, common.AuthContextKey, authContext)
- user, err := in.getUserConnect(ctx, accessTokenStr)
+ user, workspaceID, err := in.getUserConnect(ctx, accessTokenStr)
if err != nil {
if IsAuthenticationSkipped(req.Spec().Procedure, authContext) {
return next(ctx, req)
@@ -98,6 +99,7 @@ func (in *APIAuthInterceptor) WrapUnary(next connect.UnaryFunc) connect.UnaryFun
}
ctx = context.WithValue(ctx, common.UserContextKey, user)
+ ctx = context.WithValue(ctx, common.WorkspaceIDContextKey, workspaceID)
return next(ctx, req)
}
}
@@ -133,6 +135,7 @@ func (in *APIAuthInterceptor) WrapStreamingHandler(next connect.StreamingHandler
in.profile.LastActiveTS.Store(time.Now().Unix())
ctx = context.WithValue(ctx, common.UserContextKey, user)
+ ctx = context.WithValue(ctx, common.WorkspaceIDContextKey, claims.WorkspaceID)
var tokenExpiry time.Time
if claims.ExpiresAt != nil {
@@ -194,40 +197,112 @@ func (in *APIAuthInterceptor) authenticate(ctx context.Context, accessTokenStr s
)
}
- // GetPrincipalByEmail handles all principal types (user, service account, workload identity)
- user, err := in.store.GetPrincipalByEmail(ctx, claims.Subject)
+ account, err := in.store.GetAccountByEmail(ctx, claims.Subject)
if err != nil {
return nil, nil, errs.Errorf("failed to find principal %q in the access token", claims.Subject)
}
- if user == nil {
+ if account == nil {
return nil, nil, errs.Errorf("principal %q not exists in the access token", claims.Subject)
}
- if user.MemberDeleted {
- return nil, nil, errs.Errorf("principal %q has been deactivated by administrators", user.Email)
+ if account.MemberDeleted {
+ return nil, nil, errs.Errorf("principal %q has been deactivated by administrators", account.Email)
+ }
+
+ // Verify workspace membership.
+ // We always require workspace_id in the claims even for non-SaaS (single workspace) mode
+ if claims.WorkspaceID == "" {
+ return nil, nil, errs.New("empty workspace in the token")
+ }
+ if err := in.verifyWorkspaceMembership(ctx, claims.WorkspaceID, account); err != nil {
+ return nil, nil, err
+ }
+
+ // Convert to UserMessage for context storage.
+ user, err := in.accountToUser(ctx, account)
+ if err != nil {
+ return nil, nil, err
}
return user, claims, nil
}
+// verifyWorkspaceMembership checks that the account is a member of the workspace.
+func (in *APIAuthInterceptor) verifyWorkspaceMembership(ctx context.Context, workspaceID string, account *store.AccountMessage) error {
+ switch account.Type {
+ case storepb.PrincipalType_SERVICE_ACCOUNT, storepb.PrincipalType_WORKLOAD_IDENTITY:
+ // Service accounts and workload identities have workspace on their record.
+ if account.Workspace != workspaceID {
+ return errs.Errorf("principal %q does not belong to workspace %q", account.Email, workspaceID)
+ }
+ return nil
+
+ case storepb.PrincipalType_END_USER:
+ // END_USER membership is verified via workspace IAM policy.
+ iamPolicy, err := in.store.GetWorkspaceIamPolicy(ctx, workspaceID)
+ if err != nil {
+ return errs.Wrap(err, "failed to get workspace IAM policy")
+ }
+ userMember := common.FormatUserEmail(account.Email)
+ for _, binding := range iamPolicy.Policy.Bindings {
+ for _, member := range binding.Members {
+ if member == userMember {
+ return nil
+ }
+ if member == common.AllUsers && !in.profile.SaaS {
+ return nil
+ }
+ }
+ }
+ return errs.Errorf("user %q is not a member of workspace %q", account.Email, workspaceID)
+
+ default:
+ return errs.Errorf("unknown principal type %v", account.Type)
+ }
+}
+
+// accountToUser converts an AccountMessage to a UserMessage for context storage.
+// For END_USER, loads the full user record. For SA/WI, constructs a minimal UserMessage.
+func (in *APIAuthInterceptor) accountToUser(ctx context.Context, account *store.AccountMessage) (*store.UserMessage, error) {
+ if account.Type == storepb.PrincipalType_END_USER {
+ user, err := in.store.GetUserByEmail(ctx, account.Email)
+ if err != nil {
+ return nil, errs.Errorf("failed to get user %q", account.Email)
+ }
+ if user == nil {
+ return nil, errs.Errorf("user %q not found", account.Email)
+ }
+ return user, nil
+ }
+
+ // SA/WI: construct a minimal UserMessage with the fields available from AccountMessage.
+ return &store.UserMessage{
+ Email: account.Email,
+ Name: account.Name,
+ Type: account.Type,
+ MemberDeleted: account.MemberDeleted,
+ }, nil
+}
+
// authenticateConnect is a ConnectRPC-specific version that returns ConnectRPC errors.
-func (in *APIAuthInterceptor) authenticateConnect(ctx context.Context, accessTokenStr string) (*store.UserMessage, error) {
- user, _, err := in.authenticate(ctx, accessTokenStr)
+func (in *APIAuthInterceptor) authenticateConnect(ctx context.Context, accessTokenStr string) (*store.UserMessage, *claimsMessage, error) {
+ user, claims, err := in.authenticate(ctx, accessTokenStr)
if err != nil {
- return nil, connect.NewError(connect.CodeUnauthenticated, err)
+ return nil, nil, connect.NewError(connect.CodeUnauthenticated, err)
}
- return user, nil
+ return user, claims, nil
}
// getUserConnect is a ConnectRPC-specific version that returns ConnectRPC errors.
-func (in *APIAuthInterceptor) getUserConnect(ctx context.Context, accessTokenStr string) (*store.UserMessage, error) {
- user, err := in.authenticateConnect(ctx, accessTokenStr)
+// Returns the user and workspace ID from the token claims.
+func (in *APIAuthInterceptor) getUserConnect(ctx context.Context, accessTokenStr string) (*store.UserMessage, string, error) {
+ user, claims, err := in.authenticateConnect(ctx, accessTokenStr)
if err != nil {
- return nil, err
+ return nil, "", err
}
// Only update for authorized request.
in.profile.LastActiveTS.Store(time.Now().Unix())
- return user, nil
+ return user, claims.WorkspaceID, nil
}
// GetUserEmailFromMFATempToken returns the user email from the MFA temp token.
@@ -255,10 +330,10 @@ func GetUserEmailFromMFATempToken(token string, secret string) (string, error) {
// AuthenticateToken validates a JWT access token and returns the user and token expiry.
// This is a non-ConnectRPC version that returns regular errors instead of ConnectRPC errors.
-func (in *APIAuthInterceptor) AuthenticateToken(ctx context.Context, accessTokenStr string) (*store.UserMessage, time.Time, error) {
+func (in *APIAuthInterceptor) AuthenticateToken(ctx context.Context, accessTokenStr string) (*store.UserMessage, string, time.Time, error) {
user, claims, err := in.authenticate(ctx, accessTokenStr)
if err != nil {
- return nil, time.Time{}, err
+ return nil, "", time.Time{}, err
}
var tokenExpiry time.Time
@@ -266,7 +341,7 @@ func (in *APIAuthInterceptor) AuthenticateToken(ctx context.Context, accessToken
tokenExpiry = claims.ExpiresAt.Time
}
- return user, tokenExpiry, nil
+ return user, claims.WorkspaceID, tokenExpiry, nil
}
// GetTokenFromHeaders extracts the access token from HTTP headers for ConnectRPC.
diff --git a/backend/api/auth/header.go b/backend/api/auth/header.go
index d5b2e2b150..7123282de3 100644
--- a/backend/api/auth/header.go
+++ b/backend/api/auth/header.go
@@ -12,7 +12,7 @@ import (
)
// token="" => unset
-func GetTokenCookie(ctx context.Context, stores *store.Store, licenseService *enterprise.LicenseService, origin, token string) *http.Cookie {
+func GetTokenCookie(ctx context.Context, stores *store.Store, licenseService *enterprise.LicenseService, workspaceID string, origin, token string) *http.Cookie {
if token == "" {
return &http.Cookie{
Name: AccessTokenCookieName,
@@ -22,7 +22,7 @@ func GetTokenCookie(ctx context.Context, stores *store.Store, licenseService *en
}
}
isHTTPS := strings.HasPrefix(origin, "https")
- tokenDuration := GetAccessTokenDuration(ctx, stores, licenseService)
+ tokenDuration := GetAccessTokenDuration(ctx, stores, licenseService, workspaceID)
return &http.Cookie{
Name: AccessTokenCookieName,
Value: token,
@@ -41,15 +41,15 @@ func GetTokenCookie(ctx context.Context, stores *store.Store, licenseService *en
}
}
-func GetAccessTokenDuration(ctx context.Context, store *store.Store, licenseService *enterprise.LicenseService) time.Duration {
+func GetAccessTokenDuration(ctx context.Context, store *store.Store, licenseService *enterprise.LicenseService, workspaceID string) time.Duration {
accessTokenDuration := DefaultAccessTokenDuration
// If the sign-in frequency control feature is not enabled, return default duration
- if err := licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
+ if err := licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
return accessTokenDuration
}
- workspaceProfile, err := store.GetWorkspaceProfileSetting(ctx)
+ workspaceProfile, err := store.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return accessTokenDuration
}
@@ -61,15 +61,15 @@ func GetAccessTokenDuration(ctx context.Context, store *store.Store, licenseServ
return accessTokenDuration
}
-func GetRefreshTokenDuration(ctx context.Context, store *store.Store, licenseService *enterprise.LicenseService) time.Duration {
+func GetRefreshTokenDuration(ctx context.Context, store *store.Store, licenseService *enterprise.LicenseService, workspaceID string) time.Duration {
refreshTokenDuration := DefaultRefreshTokenDuration
// If the sign-in frequency control feature is not enabled, return default duration
- if err := licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
+ if err := licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
return refreshTokenDuration
}
- workspaceProfile, err := store.GetWorkspaceProfileSetting(ctx)
+ workspaceProfile, err := store.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return refreshTokenDuration
}
diff --git a/backend/api/auth/tokens.go b/backend/api/auth/tokens.go
index ecb6f489eb..9e3d46a01c 100644
--- a/backend/api/auth/tokens.go
+++ b/backend/api/auth/tokens.go
@@ -29,6 +29,7 @@ func HashToken(token string) string {
// claimsMessage is the JWT claims structure for web authentication tokens.
type claimsMessage struct {
jwt.RegisteredClaims
+ WorkspaceID string `json:"workspace_id,omitempty"`
}
// oauth2ClaimsMessage extends claimsMessage with OAuth2-specific fields.
@@ -38,25 +39,25 @@ type oauth2ClaimsMessage struct {
}
// GenerateAPIToken generates an API token.
-func GenerateAPIToken(userEmail string, secret string) (string, error) {
+func GenerateAPIToken(userEmail string, workspaceID, secret string) (string, error) {
expirationTime := time.Now().Add(apiTokenDuration)
- return generateToken(userEmail, AccessTokenAudience, expirationTime, []byte(secret))
+ return generateToken(userEmail, workspaceID, AccessTokenAudience, expirationTime, []byte(secret))
}
// GenerateAccessToken generates an access token for web.
-func GenerateAccessToken(userEmail string, secret string, tokenDuration time.Duration) (string, error) {
+func GenerateAccessToken(userEmail string, workspaceID string, secret string, tokenDuration time.Duration) (string, error) {
expirationTime := time.Now().Add(tokenDuration)
- return generateToken(userEmail, AccessTokenAudience, expirationTime, []byte(secret))
+ return generateToken(userEmail, workspaceID, AccessTokenAudience, expirationTime, []byte(secret))
}
// GenerateMFATempToken generates a temporary token for MFA.
func GenerateMFATempToken(userEmail string, secret string, tokenDuration time.Duration) (string, error) {
expirationTime := time.Now().Add(tokenDuration)
- return generateToken(userEmail, MFATempTokenAudience, expirationTime, []byte(secret))
+ return generateToken(userEmail, "", MFATempTokenAudience, expirationTime, []byte(secret))
}
// generateToken creates a JWT token for web authentication.
-func generateToken(userEmail string, aud string, expirationTime time.Time, secret []byte) (string, error) {
+func generateToken(userEmail string, workspaceID string, aud string, expirationTime time.Time, secret []byte) (string, error) {
claims := &claimsMessage{
RegisteredClaims: jwt.RegisteredClaims{
Audience: jwt.ClaimStrings{aud},
@@ -65,6 +66,7 @@ func generateToken(userEmail string, aud string, expirationTime time.Time, secre
Issuer: issuer,
Subject: userEmail,
},
+ WorkspaceID: workspaceID,
}
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
@@ -75,13 +77,13 @@ func generateToken(userEmail string, aud string, expirationTime time.Time, secre
// GenerateOAuth2AccessToken generates an access token for OAuth2 clients.
// The clientID is included in the token claims for audit purposes.
-func GenerateOAuth2AccessToken(userEmail, clientID, secret string, duration time.Duration) (string, error) {
+func GenerateOAuth2AccessToken(userEmail, clientID, workspaceID, secret string, duration time.Duration) (string, error) {
expirationTime := time.Now().Add(duration)
- return generateOAuth2Token(userEmail, clientID, OAuth2AccessTokenAudience, expirationTime, []byte(secret))
+ return generateOAuth2Token(userEmail, clientID, workspaceID, OAuth2AccessTokenAudience, expirationTime, []byte(secret))
}
// generateOAuth2Token creates a JWT token with OAuth2-specific claims including client_id.
-func generateOAuth2Token(userEmail, clientID, aud string, expirationTime time.Time, secret []byte) (string, error) {
+func generateOAuth2Token(userEmail, clientID, workspaceID, aud string, expirationTime time.Time, secret []byte) (string, error) {
claims := &oauth2ClaimsMessage{
ClientID: clientID,
claimsMessage: claimsMessage{
@@ -92,6 +94,7 @@ func generateOAuth2Token(userEmail, clientID, aud string, expirationTime time.Ti
Issuer: issuer,
Subject: userEmail,
},
+ WorkspaceID: workspaceID,
},
}
diff --git a/backend/api/directory-sync/webhook.go b/backend/api/directory-sync/webhook.go
index 5184b9fb06..ac79cf7744 100644
--- a/backend/api/directory-sync/webhook.go
+++ b/backend/api/directory-sync/webhook.go
@@ -50,7 +50,8 @@ func (s *Service) scimAuthMiddleware(next echo.HandlerFunc) echo.HandlerFunc {
if err := s.validRequestURL(ctx, c); err != nil {
return c.String(http.StatusUnauthorized, err.Error())
}
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DIRECTORY_SYNC); err != nil {
+ workspaceID := c.Param("workspaceID")
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DIRECTORY_SYNC); err != nil {
return c.String(http.StatusForbidden, err.Error())
}
return next(c)
@@ -471,7 +472,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
members = append(members, member)
}
- group, err := utils.GetGroupByName(ctx, s.store, common.FormatGroupEmail(scimGroup.ExternalID))
+ group, err := utils.GetGroupByName(ctx, s.store, c.Param("workspaceID"), common.FormatGroupEmail(scimGroup.ExternalID))
if err != nil {
return c.String(http.StatusInternalServerError, fmt.Sprintf(`failed to find group, error %v`, err))
}
@@ -481,12 +482,8 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
if email == "" && strings.Contains(scimGroup.ExternalID, "@") {
email = scimGroup.ExternalID
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to get workspace, error %v", err))
- }
newGroup, err := s.store.CreateGroup(ctx, &store.GroupMessage{
- Workspace: workspace.ResourceID,
+ Workspace: c.Param("workspaceID"),
ID: scimGroup.ExternalID,
Email: email,
Title: scimGroup.DisplayName,
@@ -502,8 +499,9 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
}
patch := &store.UpdateGroupMessage{
- ID: group.ID,
- Title: &scimGroup.DisplayName,
+ ID: group.ID,
+ Workspace: group.Workspace,
+ Title: &scimGroup.DisplayName,
}
email := scimGroup.Email
if email != "" {
@@ -584,7 +582,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
groupName = expr.Value
}
- group, err := utils.GetGroupByName(ctx, s.store, common.FormatGroupEmail(groupName))
+ group, err := utils.GetGroupByName(ctx, s.store, c.Param("workspaceID"), common.FormatGroupEmail(groupName))
if err != nil {
return c.String(http.StatusInternalServerError, fmt.Sprintf(`failed to find group, error %v`, err))
}
@@ -615,7 +613,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
})
}
- if err := s.store.DeleteGroup(ctx, group.ID); err != nil {
+ if err := s.store.DeleteGroup(ctx, group.Workspace, group.ID); err != nil {
return c.String(http.StatusInternalServerError, fmt.Sprintf("failed to delete group, error %v", err))
}
@@ -697,8 +695,9 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
}
updateGroup := &store.UpdateGroupMessage{
- ID: group.ID,
- Payload: group.Payload,
+ ID: group.ID,
+ Workspace: group.Workspace,
+ Payload: group.Payload,
}
if group.Payload.Source != source {
updateGroup.Payload.Source = source
@@ -846,15 +845,8 @@ func (s *Service) validRequestURL(ctx context.Context, c *echo.Context) error {
}
workspaceID := c.Param("workspaceID")
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return errors.Wrap(err, "failed to get workspace")
- }
- if workspace.ResourceID != workspaceID {
- return errors.Errorf("invalid workspace id %q, my ID %q", workspaceID, workspace.ResourceID)
- }
- workspaceProfileSetting, err := s.store.GetWorkspaceProfileSetting(ctx)
+ workspaceProfileSetting, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return errors.Wrapf(err, "failed to get workspace profile setting")
}
@@ -887,7 +879,7 @@ func (s *Service) getGroup(ctx context.Context, c *echo.Context) (*store.GroupMe
if err != nil {
return nil, errors.Errorf("failed to parse group %v, error %v", c.Param("groupID"), err)
}
- group, err := utils.GetGroupByName(ctx, s.store, common.FormatGroupEmail(groupName))
+ group, err := utils.GetGroupByName(ctx, s.store, c.Param("workspaceID"), common.FormatGroupEmail(groupName))
if err != nil {
return nil, errors.Errorf("failed to find group, error %v", err)
}
@@ -962,8 +954,9 @@ func (s *Service) updateGroupFromSCIM(ctx context.Context, group *store.GroupMes
}
return s.store.UpdateGroup(ctx, &store.UpdateGroupMessage{
- ID: group.ID,
- Title: &scimGroup.DisplayName,
+ ID: group.ID,
+ Workspace: group.Workspace,
+ Title: &scimGroup.DisplayName,
Payload: &storepb.GroupPayload{
Source: source,
Members: members,
diff --git a/backend/api/lsp/completion.go b/backend/api/lsp/completion.go
index 25772a1f01..65b3e04733 100644
--- a/backend/api/lsp/completion.go
+++ b/backend/api/lsp/completion.go
@@ -145,7 +145,7 @@ func convertLSPCompletionItemKind(tp parserbase.CandidateType) lsp.CompletionIte
}
func (h *Handler) GetDatabaseMetadataFunc(ctx context.Context, instanceID, databaseName string) (string, *model.DatabaseMetadata, error) {
- metadata, err := h.store.GetDBSchemaSnapshot(ctx, instanceID, databaseName)
+ metadata, err := h.store.GetDBSchemaSnapshot(ctx, h.workspaceID, instanceID, databaseName)
if err != nil {
return "", nil, errors.Wrap(err, "failed to get database schema")
}
diff --git a/backend/api/lsp/handler.go b/backend/api/lsp/handler.go
index e7e2d2e54d..f0505fdea8 100644
--- a/backend/api/lsp/handler.go
+++ b/backend/api/lsp/handler.go
@@ -49,11 +49,12 @@ const (
)
// NewHandlerWithAuth creates a new Language Server Protocol handler with authentication.
-func NewHandlerWithAuth(s *store.Store, profile *config.Profile, iamManager *iam.Manager, user *store.UserMessage, tokenExpiry time.Time) jsonrpc2.Handler {
+func NewHandlerWithAuth(s *store.Store, profile *config.Profile, iamManager *iam.Manager, user *store.UserMessage, workspaceID string, tokenExpiry time.Time) jsonrpc2.Handler {
handler := &Handler{
store: s,
profile: profile,
user: user,
+ workspaceID: workspaceID,
tokenExpiry: tokenExpiry,
iamManager: iamManager,
diagnosticsDebouncer: NewDiagnosticsDebouncer(500 * time.Millisecond), // 500ms debounce
@@ -84,6 +85,7 @@ type Handler struct {
// Auth-related fields
user *store.UserMessage
+ workspaceID string
tokenExpiry time.Time
iamManager *iam.Manager
@@ -166,6 +168,7 @@ func (h *Handler) getEngineType(ctx context.Context) storepb.Engine {
}
instance, err := h.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: h.workspaceID,
ResourceID: &instanceID,
})
if err != nil {
@@ -229,7 +232,7 @@ func (h *Handler) checkMetadataPermissions(ctx context.Context, metadata SetMeta
}
// Check bb.databases.getSchema permission
- ok, err := h.iamManager.CheckPermission(ctx, permission.DatabasesGetSchema, h.user, database.ProjectID)
+ ok, err := h.iamManager.CheckPermission(ctx, permission.DatabasesGetSchema, h.user, h.workspaceID, database.ProjectID)
if err != nil {
return errors.Wrap(err, "failed to check permission")
}
@@ -238,7 +241,7 @@ func (h *Handler) checkMetadataPermissions(ctx context.Context, metadata SetMeta
}
} else if metadata.InstanceID != "" && metadata.DatabaseName == "" {
// If only instance is specified, check instance get permission
- ok, err := h.iamManager.CheckPermission(ctx, permission.InstancesGet, h.user)
+ ok, err := h.iamManager.CheckPermission(ctx, permission.InstancesGet, h.user, h.workspaceID)
if err != nil {
return errors.Wrap(err, "failed to check permission")
}
diff --git a/backend/api/lsp/lsp.go b/backend/api/lsp/lsp.go
index 7d181295ff..5a7840c887 100644
--- a/backend/api/lsp/lsp.go
+++ b/backend/api/lsp/lsp.go
@@ -24,8 +24,8 @@ import (
var (
upgrader = websocket.Upgrader{CheckOrigin: func(_ *http.Request) bool { return true }}
- newHandler = func(s *store.Store, profile *config.Profile, iamManager *iam.Manager, user *store.UserMessage, tokenExpiry time.Time) (jsonrpc2.Handler, io.Closer) {
- return NewHandlerWithAuth(s, profile, iamManager, user, tokenExpiry), io.NopCloser(strings.NewReader(""))
+ newHandler = func(s *store.Store, profile *config.Profile, iamManager *iam.Manager, user *store.UserMessage, workspaceID string, tokenExpiry time.Time) (jsonrpc2.Handler, io.Closer) {
+ return NewHandlerWithAuth(s, profile, iamManager, user, workspaceID, tokenExpiry), io.NopCloser(strings.NewReader(""))
}
)
@@ -37,7 +37,7 @@ func (s *Server) Router(c *echo.Context) error {
}
// Authenticate user using server's auth interceptor
- user, tokenExpiry, err := s.authInterceptor.AuthenticateToken(c.Request().Context(), accessTokenStr)
+ user, workspaceID, tokenExpiry, err := s.authInterceptor.AuthenticateToken(c.Request().Context(), accessTokenStr)
if err != nil {
return echo.NewHTTPError(http.StatusUnauthorized, err.Error())
}
@@ -50,7 +50,7 @@ func (s *Server) Router(c *echo.Context) error {
defer connection.Close()
connectionID := s.connectionCount.Add(1)
- handler, closer := newHandler(s.store, s.profile, s.iamManager, user, tokenExpiry)
+ handler, closer := newHandler(s.store, s.profile, s.iamManager, user, workspaceID, tokenExpiry)
ctx := c.Request().Context()
<-jsonrpc2.NewConn(ctx, wsjsonrpc2.NewObjectStream(connection), handler, nil /* connOpt */).DisconnectNotify()
err = closer.Close()
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 2bce36141b..964ca6dced 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -369,6 +369,42 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.ResourcePackage'
+ /bytebase.v1.ActuatorService/GetWorkspaceActuatorInfo:
+ post:
+ tags:
+ - bytebase.v1.ActuatorService
+ summary: GetWorkspaceActuatorInfo
+ description: Gets workspace-scoped actuator info. Requires authentication.
+ operationId: bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo
+ parameters:
+ - name: Connect-Protocol-Version
+ in: header
+ required: true
+ schema:
+ $ref: '#/components/schemas/connect-protocol-version'
+ - name: Connect-Timeout-Ms
+ in: header
+ schema:
+ $ref: '#/components/schemas/connect-timeout-header'
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.GetWorkspaceActuatorInfoRequest'
+ required: true
+ responses:
+ default:
+ description: Error
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/connect.error'
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.ActuatorInfo'
/bytebase.v1.ActuatorService/SetupSample:
post:
tags:
@@ -636,6 +672,46 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.RefreshResponse'
+ /bytebase.v1.AuthService/Signup:
+ post:
+ tags:
+ - bytebase.v1.AuthService
+ summary: Signup
+ description: |-
+ Registers a new user account. Creates a principal and assigns a workspace:
+ - If the user's email was pre-invited to a workspace, joins that workspace.
+ - Otherwise, creates a new workspace with the user as admin.
+ Returns access tokens so the user is logged in immediately after signup.
+ operationId: bytebase.v1.AuthService.Signup
+ parameters:
+ - name: Connect-Protocol-Version
+ in: header
+ required: true
+ schema:
+ $ref: '#/components/schemas/connect-protocol-version'
+ - name: Connect-Timeout-Ms
+ in: header
+ schema:
+ $ref: '#/components/schemas/connect-timeout-header'
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.SignupRequest'
+ required: true
+ responses:
+ default:
+ description: Error
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/connect.error'
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.LoginResponse'
/bytebase.v1.CelService/BatchDeparse:
post:
tags:
@@ -6016,8 +6092,9 @@ paths:
- bytebase.v1.UserService
summary: CreateUser
description: |-
- Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
- Permissions required: bb.users.create (only when Disallow Signup is enabled)
+ Creates a user in the caller's workspace (admin action, self-hosted only).
+ In SaaS mode, admins should add users via workspace IAM policy instead.
+ Permissions required: bb.users.create
operationId: bytebase.v1.UserService.CreateUser
parameters:
- name: Connect-Protocol-Version
@@ -7274,10 +7351,12 @@ components:
title: last_active_time
description: The last time any API call was made, refreshed on each request.
$ref: '#/components/schemas/google.protobuf.Timestamp'
- workspaceId:
+ workspace:
type: string
- title: workspace_id
- description: The unique identifier for the workspace.
+ title: workspace
+ description: |-
+ The unique identifier for the workspace.
+ Format: workspaces/{id}
unlicensedFeatures:
type: array
items:
@@ -7319,6 +7398,12 @@ components:
restriction:
title: restriction
$ref: '#/components/schemas/bytebase.v1.Restriction'
+ defaultProject:
+ type: string
+ title: default_project
+ description: |-
+ The default project for unassigned databases.
+ Format: projects/{id}
title: ActuatorInfo
additionalProperties: false
description: |-
@@ -10949,6 +11034,13 @@ components:
additionalProperties: false
bytebase.v1.GetResourcePackageRequest:
type: object
+ properties:
+ name:
+ type: string
+ title: name
+ description: |-
+ Optional workspace name, format: workspaces/{workspace}.
+ Set when using the workspace-scoped URL pattern.
title: GetResourcePackageRequest
additionalProperties: false
description: Request message for getting branding resources.
@@ -11157,6 +11249,16 @@ components:
Format: projects/{project}/worksheets/{worksheet}
title: GetWorksheetRequest
additionalProperties: false
+ bytebase.v1.GetWorkspaceActuatorInfoRequest:
+ type: object
+ properties:
+ name:
+ type: string
+ title: name
+ description: 'The workspace name, format: workspaces/{workspace}.'
+ title: GetWorkspaceActuatorInfoRequest
+ additionalProperties: false
+ description: Request message for getting workspace-scoped actuator information.
bytebase.v1.GridLevel:
type: object
properties:
@@ -16599,6 +16701,23 @@ components:
description: content_size is the full size of the content, may not match the size of the `content` field.
title: Sheet
additionalProperties: false
+ bytebase.v1.SignupRequest:
+ type: object
+ properties:
+ email:
+ type: string
+ title: email
+ description: The email for the new account.
+ password:
+ type: string
+ title: password
+ description: The password for the new account.
+ title:
+ type: string
+ title: title
+ description: The display name of the user.
+ title: SignupRequest
+ additionalProperties: false
bytebase.v1.SpatialIndexConfig:
type: object
properties:
@@ -18720,7 +18839,7 @@ components:
serviceKey:
type: string
title: service_key
- description: The service key for service account authentication. Only used for service accounts.
+ description: The service key for service account authentication.
mfaEnabled:
type: boolean
title: mfa_enabled
@@ -18757,6 +18876,12 @@ components:
description: |-
The groups for the user.
Format: groups/{email}
+ workspace:
+ type: string
+ title: workspace
+ description: |-
+ The current workspace.
+ Format: workspaces/{id}
title: User
additionalProperties: false
bytebase.v1.User.Profile:
diff --git a/backend/api/oauth2/authorize.go b/backend/api/oauth2/authorize.go
index 4e1d9a18a9..c8a3520207 100644
--- a/backend/api/oauth2/authorize.go
+++ b/backend/api/oauth2/authorize.go
@@ -38,7 +38,12 @@ func (s *Service) handleAuthorizeGet(c *echo.Context) error {
if clientID == "" {
return oauth2Error(c, http.StatusBadRequest, "invalid_request", "client_id is required")
}
- client, err := s.store.GetOAuth2Client(ctx, clientID)
+
+ workspaceID, err := s.getWorkspaceFromRequest(c)
+ if err != nil {
+ return oauth2Error(c, http.StatusBadRequest, "invalid_request", "workspace is required")
+ }
+ client, err := s.store.GetOAuth2Client(ctx, workspaceID, clientID)
if err != nil {
return oauth2Error(c, http.StatusInternalServerError, "server_error", "failed to lookup client")
}
@@ -85,8 +90,13 @@ func (s *Service) handleAuthorizePost(c *echo.Context) error {
codeChallengeMethod := c.FormValue("code_challenge_method")
action := c.FormValue("action")
+ workspaceID, err := s.getWorkspaceFromRequest(c)
+ if err != nil {
+ return oauth2Error(c, http.StatusBadRequest, "invalid_request", "workspace is required")
+ }
+
// Validate client
- client, err := s.store.GetOAuth2Client(ctx, clientID)
+ client, err := s.store.GetOAuth2Client(ctx, workspaceID, clientID)
if err != nil || client == nil {
return oauth2Error(c, http.StatusBadRequest, "invalid_client", "client not found")
}
@@ -163,7 +173,7 @@ func (s *Service) handleAuthorizePost(c *echo.Context) error {
}
// Update client last active
- if err := s.store.UpdateOAuth2ClientLastActiveAt(ctx, clientID); err != nil {
+ if err := s.store.UpdateOAuth2ClientLastActiveAt(ctx, client.Workspace, clientID); err != nil {
slog.Warn("failed to update OAuth2 client last active", slog.String("clientID", clientID), log.BBError(err))
}
diff --git a/backend/api/oauth2/discovery.go b/backend/api/oauth2/discovery.go
index 140536f056..abb92181fd 100644
--- a/backend/api/oauth2/discovery.go
+++ b/backend/api/oauth2/discovery.go
@@ -38,7 +38,8 @@ type protectedResourceMetadata struct {
func (s *Service) getBaseURL(c *echo.Context) string {
ctx := c.Request().Context()
- externalURL, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile)
+ workspaceID, _ := s.getWorkspaceFromRequest(c)
+ externalURL, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile, workspaceID)
if err != nil {
slog.Warn("failed to get external url for OAuth2", log.BBError(err))
}
@@ -63,10 +64,10 @@ func (s *Service) handleDiscovery(c *echo.Context) error {
baseURL := s.getBaseURL(c)
metadata := &authorizationServerMetadata{
Issuer: baseURL,
- AuthorizationEndpoint: fmt.Sprintf("%s/api/oauth2/authorize", baseURL),
- TokenEndpoint: fmt.Sprintf("%s/api/oauth2/token", baseURL),
- RegistrationEndpoint: fmt.Sprintf("%s/api/oauth2/register", baseURL),
- RevocationEndpoint: fmt.Sprintf("%s/api/oauth2/revoke", baseURL),
+ AuthorizationEndpoint: fmt.Sprintf("%s/api/workspaces/:workspaceID/oauth2/authorize", baseURL),
+ TokenEndpoint: fmt.Sprintf("%s/api/workspaces/:workspaceID/oauth2/token", baseURL),
+ RegistrationEndpoint: fmt.Sprintf("%s/api/workspaces/:workspaceID/oauth2/register", baseURL),
+ RevocationEndpoint: fmt.Sprintf("%s/api/workspaces/:workspaceID/oauth2/revoke", baseURL),
ResponseTypesSupported: []string{"code"},
GrantTypesSupported: []string{"authorization_code", "refresh_token"},
CodeChallengeMethodsSupported: []string{"S256"},
diff --git a/backend/api/oauth2/oauth2.go b/backend/api/oauth2/oauth2.go
index 54960dfe7d..22a0b4a492 100644
--- a/backend/api/oauth2/oauth2.go
+++ b/backend/api/oauth2/oauth2.go
@@ -15,6 +15,8 @@ import (
"github.com/labstack/echo/v5"
"golang.org/x/crypto/bcrypt"
+ "github.com/pkg/errors"
+
"github.com/bytebase/bytebase/backend/api/auth"
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
@@ -48,18 +50,39 @@ func NewService(store *store.Store, profile *config.Profile, secret string) *Ser
}
func (s *Service) RegisterRoutes(e *echo.Echo) {
- // .well-known endpoints must stay at root (RFC 8615)
+ // Workspace-scoped OAuth2 routes (SaaS and self-hosted).
e.GET("/.well-known/oauth-authorization-server", s.handleDiscovery)
e.GET("/.well-known/oauth-authorization-server/*", s.handleDiscovery)
e.GET("/.well-known/oauth-protected-resource", s.handleProtectedResourceMetadata)
e.GET("/.well-known/oauth-protected-resource/*", s.handleProtectedResourceMetadata)
- // OAuth2 endpoints under /api prefix
- e.POST("/api/oauth2/register", s.handleRegister)
- e.GET("/api/oauth2/authorize", s.handleAuthorizeGet)
- e.POST("/api/oauth2/authorize", s.handleAuthorizePost)
- e.GET("/api/oauth2/clients/:clientID", s.handleGetClient)
- e.POST("/api/oauth2/token", s.handleToken)
- e.POST("/api/oauth2/revoke", s.handleRevoke)
+
+ e.POST("/api/workspaces/:workspaceID/oauth2/register", s.handleRegister)
+ e.GET("/api/workspaces/:workspaceID/oauth2/authorize", s.handleAuthorizeGet)
+ e.POST("/api/workspaces/:workspaceID/oauth2/authorize", s.handleAuthorizePost)
+ e.GET("/api/workspaces/:workspaceID/oauth2/clients/:clientID", s.handleGetClient)
+ e.POST("/api/workspaces/:workspaceID/oauth2/token", s.handleToken)
+ e.POST("/api/workspaces/:workspaceID/oauth2/revoke", s.handleRevoke)
+
+ // Legacy routes (self-hosted only, disabled in SaaS mode).
+ if !s.profile.SaaS {
+ e.POST("/api/oauth2/register", s.handleRegister)
+ e.GET("/api/oauth2/authorize", s.handleAuthorizeGet)
+ e.POST("/api/oauth2/authorize", s.handleAuthorizePost)
+ e.GET("/api/oauth2/clients/:clientID", s.handleGetClient)
+ e.POST("/api/oauth2/token", s.handleToken)
+ e.POST("/api/oauth2/revoke", s.handleRevoke)
+ }
+}
+
+// getWorkspaceFromRequest extracts workspace ID from URL param or falls back to store for legacy routes.
+func (s *Service) getWorkspaceFromRequest(c *echo.Context) (string, error) {
+ if ws := c.Param("workspaceID"); ws != "" {
+ return ws, nil
+ }
+ if s.profile.SaaS {
+ return "", errors.New("workspace ID required in URL for SaaS mode")
+ }
+ return s.store.GetWorkspaceID(c.Request().Context())
}
// handleGetClient returns public client info for the consent page.
@@ -67,7 +90,12 @@ func (s *Service) handleGetClient(c *echo.Context) error {
ctx := c.Request().Context()
clientID := c.Param("clientID")
- client, err := s.store.GetOAuth2Client(ctx, clientID)
+ workspaceID, err := s.getWorkspaceFromRequest(c)
+ if err != nil {
+ return oauth2Error(c, http.StatusBadRequest, "invalid_request", "workspace is required")
+ }
+
+ client, err := s.store.GetOAuth2Client(ctx, workspaceID, clientID)
if err != nil {
return oauth2Error(c, http.StatusInternalServerError, "server_error", "failed to lookup client")
}
diff --git a/backend/api/oauth2/register.go b/backend/api/oauth2/register.go
index b726eb4e71..6121c4cd44 100644
--- a/backend/api/oauth2/register.go
+++ b/backend/api/oauth2/register.go
@@ -90,6 +90,10 @@ func (s *Service) handleRegister(c *echo.Context) error {
}
// Store client
+ workspaceID, err := s.getWorkspaceFromRequest(c)
+ if err != nil {
+ return oauth2Error(c, http.StatusInternalServerError, "server_error", "failed to get workspace")
+ }
config := &storepb.OAuth2ClientConfig{
ClientName: req.ClientName,
RedirectUris: req.RedirectURIs,
@@ -98,6 +102,7 @@ func (s *Service) handleRegister(c *echo.Context) error {
}
if _, err := s.store.CreateOAuth2Client(ctx, &store.OAuth2ClientMessage{
ClientID: clientID,
+ Workspace: workspaceID,
ClientSecretHash: secretHash,
Config: config,
}); err != nil {
diff --git a/backend/api/oauth2/revoke.go b/backend/api/oauth2/revoke.go
index 31db7b88b1..a8075c1e22 100644
--- a/backend/api/oauth2/revoke.go
+++ b/backend/api/oauth2/revoke.go
@@ -33,7 +33,12 @@ func (s *Service) handleRevoke(c *echo.Context) error {
return oauth2Error(c, http.StatusUnauthorized, "invalid_client", "client authentication required")
}
- client, err := s.store.GetOAuth2Client(ctx, clientID)
+ workspaceID, err := s.getWorkspaceFromRequest(c)
+ if err != nil {
+ return oauth2Error(c, http.StatusBadRequest, "invalid_request", "workspace is required")
+ }
+
+ client, err := s.store.GetOAuth2Client(ctx, workspaceID, clientID)
if err != nil {
return oauth2Error(c, http.StatusInternalServerError, "server_error", "failed to lookup client")
}
@@ -57,7 +62,7 @@ func (s *Service) handleRevoke(c *echo.Context) error {
// Try to revoke as refresh token
// RFC 7009 says to return 200 even if token is invalid, but we log errors for debugging
tokenHash := auth.HashToken(req.Token)
- if err := s.store.DeleteOAuth2RefreshToken(ctx, tokenHash); err != nil {
+ if err := s.store.DeleteOAuth2RefreshToken(ctx, client.ClientID, tokenHash); err != nil {
slog.Warn("failed to delete OAuth2 refresh token during revocation", log.BBError(err))
}
diff --git a/backend/api/oauth2/token.go b/backend/api/oauth2/token.go
index c5d87fa85d..f45e457c77 100644
--- a/backend/api/oauth2/token.go
+++ b/backend/api/oauth2/token.go
@@ -47,7 +47,12 @@ func (s *Service) handleToken(c *echo.Context) error {
return oauth2Error(c, http.StatusUnauthorized, "invalid_client", "client authentication required")
}
- client, err := s.store.GetOAuth2Client(ctx, clientID)
+ workspaceID, err := s.getWorkspaceFromRequest(c)
+ if err != nil {
+ return oauth2Error(c, http.StatusBadRequest, "invalid_request", "workspace is required")
+ }
+
+ client, err := s.store.GetOAuth2Client(ctx, workspaceID, clientID)
if err != nil {
return oauth2Error(c, http.StatusInternalServerError, "server_error", "failed to lookup client")
}
@@ -103,7 +108,7 @@ func (s *Service) handleAuthorizationCodeGrant(c *echo.Context, client *store.OA
return oauth2Error(c, http.StatusBadRequest, "invalid_request", "code is required")
}
- authCode, err := s.store.GetOAuth2AuthorizationCode(ctx, req.Code)
+ authCode, err := s.store.GetOAuth2AuthorizationCode(ctx, client.ClientID, req.Code)
if err != nil {
return oauth2Error(c, http.StatusInternalServerError, "server_error", "failed to lookup code")
}
@@ -120,7 +125,7 @@ func (s *Service) handleAuthorizationCodeGrant(c *echo.Context, client *store.OA
// Validate code not expired
if time.Now().After(authCode.ExpiresAt) {
// Delete expired code
- if err := s.store.DeleteOAuth2AuthorizationCode(ctx, req.Code); err != nil {
+ if err := s.store.DeleteOAuth2AuthorizationCode(ctx, client.ClientID, req.Code); err != nil {
slog.Warn("failed to delete expired OAuth2 authorization code", slog.String("code", req.Code), log.BBError(err))
}
return oauth2Error(c, http.StatusBadRequest, "invalid_grant", "code has expired")
@@ -140,7 +145,7 @@ func (s *Service) handleAuthorizationCodeGrant(c *echo.Context, client *store.OA
}
// Delete code after all validations pass (single use)
- if err := s.store.DeleteOAuth2AuthorizationCode(ctx, req.Code); err != nil {
+ if err := s.store.DeleteOAuth2AuthorizationCode(ctx, client.ClientID, req.Code); err != nil {
slog.Warn("failed to delete OAuth2 authorization code after use", slog.String("code", req.Code), log.BBError(err))
}
@@ -168,7 +173,7 @@ func (s *Service) handleRefreshTokenGrant(c *echo.Context, client *store.OAuth2C
}
tokenHash := auth.HashToken(req.RefreshToken)
- refreshToken, err := s.store.GetOAuth2RefreshToken(ctx, tokenHash)
+ refreshToken, err := s.store.GetOAuth2RefreshToken(ctx, client.ClientID, tokenHash)
if err != nil {
return oauth2Error(c, http.StatusInternalServerError, "server_error", "failed to lookup refresh token")
}
@@ -185,14 +190,14 @@ func (s *Service) handleRefreshTokenGrant(c *echo.Context, client *store.OAuth2C
// Validate not expired
if time.Now().After(refreshToken.ExpiresAt) {
// Delete expired token
- if err := s.store.DeleteOAuth2RefreshToken(ctx, tokenHash); err != nil {
+ if err := s.store.DeleteOAuth2RefreshToken(ctx, client.ClientID, tokenHash); err != nil {
slog.Warn("failed to delete expired OAuth2 refresh token", log.BBError(err))
}
return oauth2Error(c, http.StatusBadRequest, "invalid_grant", "refresh token has expired")
}
// Delete token after validations pass (single use, will issue new one)
- if err := s.store.DeleteOAuth2RefreshToken(ctx, tokenHash); err != nil {
+ if err := s.store.DeleteOAuth2RefreshToken(ctx, client.ClientID, tokenHash); err != nil {
slog.Warn("failed to delete OAuth2 refresh token after use", log.BBError(err))
}
@@ -210,7 +215,7 @@ func (s *Service) issueTokens(c *echo.Context, client *store.OAuth2ClientMessage
ctx := c.Request().Context()
// Generate access token (JWT)
- accessToken, err := auth.GenerateOAuth2AccessToken(userEmail, client.ClientID, s.secret, accessTokenExpiry)
+ accessToken, err := auth.GenerateOAuth2AccessToken(userEmail, client.ClientID, client.Workspace, s.secret, accessTokenExpiry)
if err != nil {
return oauth2Error(c, http.StatusInternalServerError, "server_error", fmt.Sprintf("failed to generate access token with error: %v", err))
}
@@ -237,7 +242,7 @@ func (s *Service) issueTokens(c *echo.Context, client *store.OAuth2ClientMessage
}
// Update client last active
- if err := s.store.UpdateOAuth2ClientLastActiveAt(ctx, client.ClientID); err != nil {
+ if err := s.store.UpdateOAuth2ClientLastActiveAt(ctx, client.Workspace, client.ClientID); err != nil {
slog.Warn("failed to update OAuth2 client last active", slog.String("clientID", client.ClientID), log.BBError(err))
}
diff --git a/backend/api/v1/access_grant_service.go b/backend/api/v1/access_grant_service.go
index cb9c2b5f22..6fa00bc983 100644
--- a/backend/api/v1/access_grant_service.go
+++ b/backend/api/v1/access_grant_service.go
@@ -123,7 +123,7 @@ func (s *AccessGrantService) ListAccessGrants(ctx context.Context, request *conn
// CreateAccessGrant creates an access grant.
func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *connect.Request[v1pb.CreateAccessGrantRequest]) (*connect.Response[v1pb.AccessGrant], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_JIT); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_JIT); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
req := request.Msg
@@ -154,7 +154,8 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "invalid target %q", ag.Targets[0]))
}
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{Workspace: workspaceID, ResourceID: &instanceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get instance %q", instanceID))
}
@@ -237,7 +238,7 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con
}
// Step 4: Post-create: webhook, approval finding, auto-approve.
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: workspaceID, ResourceID: &projectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project %v", projectID))
}
@@ -262,7 +263,7 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con
// ActivateAccessGrant activates a pending access grant.
func (s *AccessGrantService) ActivateAccessGrant(ctx context.Context, request *connect.Request[v1pb.ActivateAccessGrantRequest]) (*connect.Response[v1pb.AccessGrant], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_JIT); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_JIT); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
@@ -312,7 +313,7 @@ func activateAccessGrant(ctx context.Context, stores *store.Store, accessGrantNa
// RevokeAccessGrant revokes an active access grant.
func (s *AccessGrantService) RevokeAccessGrant(ctx context.Context, request *connect.Request[v1pb.RevokeAccessGrantRequest]) (*connect.Response[v1pb.AccessGrant], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_JIT); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_JIT); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
req := request.Msg
diff --git a/backend/api/v1/acl.go b/backend/api/v1/acl.go
index 16e8b89e83..3f0d0bb966 100644
--- a/backend/api/v1/acl.go
+++ b/backend/api/v1/acl.go
@@ -217,8 +217,26 @@ func doIAMPermissionCheck(ctx context.Context, iamManager *iam.Manager, fullMeth
if len(authContext.Resources) == 0 {
return false, nil, errors.Errorf("no resource found for IAM auth method")
}
- if authContext.HasWorkspaceResource() {
- ok, err := iamManager.CheckPermission(ctx, authContext.Permission, user)
+
+ var hasWorkspaceResource bool
+ projectIDMap := make(map[string]bool)
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ for _, resource := range authContext.Resources {
+ switch resource.Type {
+ case common.ResourceTypeWorkspace:
+ if workspaceID != resource.ID {
+ return false, nil, errors.Errorf("request workspace %v does not match the workspace %v in token", resource.ID, workspaceID)
+ }
+ hasWorkspaceResource = true
+ case common.ResourceTypeProject:
+ projectIDMap[resource.ID] = true
+ default:
+ return false, nil, errors.Errorf("unknown resource type %v", resource.Type)
+ }
+ }
+
+ if hasWorkspaceResource {
+ ok, err := iamManager.CheckPermission(ctx, authContext.Permission, user, workspaceID)
if err != nil {
return false, nil, err
}
@@ -226,9 +244,12 @@ func doIAMPermissionCheck(ctx context.Context, iamManager *iam.Manager, fullMeth
return false, nil, nil
}
}
- projectIDs := authContext.GetProjectResources()
- if len(projectIDs) > 0 {
- ok, err := iamManager.CheckPermission(ctx, authContext.Permission, user, projectIDs...)
+ if len(projectIDMap) > 0 {
+ var projectIDs []string
+ for projectID := range projectIDMap {
+ projectIDs = append(projectIDs, projectID)
+ }
+ ok, err := iamManager.CheckPermission(ctx, authContext.Permission, user, workspaceID, projectIDs...)
if err != nil {
return false, nil, err
}
@@ -248,25 +269,39 @@ var projectRegex = regexp.MustCompile(`^projects/[^/]+`)
var databaseRegex = regexp.MustCompile(`^instances/[^/]+/databases/[^/]+`)
func populateRawResources(ctx context.Context, stores *store.Store, authContext *common.AuthContext, request any, method string) error {
- resources, err := getResourceFromRequest(request, method)
+ rawNames, err := getResourceFromRequest(ctx, request, method)
if err != nil {
return err
}
- for _, resource := range resources {
+
+ var resources []*common.Resource
+ for _, name := range rawNames {
switch {
+ case strings.HasPrefix(name, "workspaces/"):
+ wsID, err := common.GetWorkspaceID(name)
+ if err != nil {
+ return err
+ }
+ resources = append(resources, &common.Resource{
+ Type: common.ResourceTypeWorkspace,
+ ID: wsID,
+ })
// TODO(d): remove "projects/-" hack later.
- case strings.HasPrefix(resource.Name, "projects/") && resource.Name != "projects/-":
- project := projectRegex.FindString(resource.Name)
+ case strings.HasPrefix(name, "projects/") && name != "projects/-":
+ project := projectRegex.FindString(name)
if project == "" {
- return errors.Errorf("invalid project resource %q", resource.Name)
+ return errors.Errorf("invalid project resource %q", name)
}
projectID, err := common.GetProjectID(project)
if err != nil {
return err
}
- resource.ProjectID = projectID
- case strings.HasPrefix(resource.Name, "instances/") && strings.Contains(resource.Name, "/databases/") && !strings.HasPrefix(resource.Name, "instances/-/databases/"):
- match := databaseRegex.FindString(resource.Name)
+ resources = append(resources, &common.Resource{
+ Type: common.ResourceTypeProject,
+ ID: projectID,
+ })
+ case strings.HasPrefix(name, "instances/") && strings.Contains(name, "/databases/") && !strings.HasPrefix(name, "instances/-/databases/"):
+ match := databaseRegex.FindString(name)
if match != "" {
instanceID, databaseName, err := common.GetInstanceDatabaseID(match)
if err != nil {
@@ -283,17 +318,25 @@ func populateRawResources(ctx context.Context, stores *store.Store, authContext
if database == nil {
return errors.Errorf("database %q not found", match)
}
- resource.ProjectID = database.ProjectID
+ resources = append(resources, &common.Resource{
+ Type: common.ResourceTypeProject,
+ ID: database.ProjectID,
+ })
}
default:
- resource.Workspace = true
+ if workspaceID := common.GetWorkspaceIDFromContext(ctx); workspaceID != "" {
+ resources = append(resources, &common.Resource{
+ Type: common.ResourceTypeWorkspace,
+ ID: workspaceID,
+ })
+ }
}
}
authContext.Resources = resources
return nil
}
-func getResourceFromRequest(request any, method string) ([]*common.Resource, error) {
+func getResourceFromRequest(ctx context.Context, request any, method string) ([]string, error) {
pm, ok := request.(proto.Message)
if !ok {
return nil, errors.Errorf("invalid request for method %q", method)
@@ -306,7 +349,7 @@ func getResourceFromRequest(request any, method string) ([]*common.Resource, err
}
shortMethod := methodTokens[2]
- var resources []*common.Resource
+ var resources []string
// Transferring database projects needs to check both projects.
var updateDatabaseRequests []*v1pb.UpdateDatabaseRequest
@@ -324,20 +367,16 @@ func getResourceFromRequest(request any, method string) ([]*common.Resource, err
return nil, errors.Wrapf(err, "failed to get projectID from %q", r.GetDatabase().GetProject())
}
// Allow to transfer databases to the default project.
- if projectID == common.DefaultProjectID {
+ if common.IsDefaultProject(common.GetWorkspaceIDFromContext(ctx), projectID) {
continue
}
- resources = append(resources, &common.Resource{Name: r.GetDatabase().GetProject()})
+ resources = append(resources, r.GetDatabase().GetProject())
}
}
// HACK(p0ny): unfortunately, BatchUpdateIssuesStatus doesn't comply to aip.
if r, ok := request.(*v1pb.BatchUpdateIssuesStatusRequest); ok {
- for _, issue := range r.Issues {
- resources = append(resources, &common.Resource{
- Name: issue,
- })
- }
+ resources = append(resources, r.Issues...)
return resources, nil
}
@@ -350,7 +389,7 @@ func getResourceFromRequest(request any, method string) ([]*common.Resource, err
namesValueList := namesValue.List()
for i := 0; i < namesValueList.Len(); i++ {
v := namesValueList.Get(i)
- resources = append(resources, &common.Resource{Name: v.String()})
+ resources = append(resources, v.String())
}
return resources, nil
}
@@ -363,48 +402,38 @@ func getResourceFromRequest(request any, method string) ([]*common.Resource, err
shortMethodWithoutBatch := strings.TrimSuffix(strings.TrimPrefix(shortMethod, "Batch"), "s")
for i := 0; i < requestsValueList.Len(); i++ {
r := requestsValueList.Get(i).Message()
- resource := getResourceFromSingleRequest(r, shortMethodWithoutBatch)
- if resource != nil {
- resources = append(resources, resource)
- }
+ resources = append(resources, getResourceFromSingleRequest(r, shortMethodWithoutBatch))
}
return resources, nil
}
}
- resource := getResourceFromSingleRequest(mr, shortMethod)
- if resource != nil {
- resources = append(resources, resource)
- }
+ resources = append(resources, getResourceFromSingleRequest(mr, shortMethod))
return resources, nil
}
-func getResourceFromSingleRequest(mr protoreflect.Message, shortMethod string) *common.Resource {
+func getResourceFromSingleRequest(mr protoreflect.Message, shortMethod string) string {
parentDesc := mr.Descriptor().Fields().ByName("parent")
if parentDesc != nil && proto.HasExtension(parentDesc.Options(), annotationsproto.E_ResourceReference) {
- v := mr.Get(parentDesc)
- return &common.Resource{Name: v.String()}
+ return mr.Get(parentDesc).String()
}
nameDesc := mr.Descriptor().Fields().ByName("name")
if nameDesc != nil && proto.HasExtension(nameDesc.Options(), annotationsproto.E_ResourceReference) {
- v := mr.Get(nameDesc)
- return &common.Resource{Name: v.String()}
+ return mr.Get(nameDesc).String()
}
// This is primarily used by Get/SetIAMPolicy().
resourceFieldDesc := mr.Descriptor().Fields().ByName("resource")
if resourceFieldDesc != nil && proto.HasExtension(resourceFieldDesc.Options(), annotationsproto.E_ResourceReference) {
- v := mr.Get(resourceFieldDesc)
- return &common.Resource{Name: v.String()}
+ return mr.Get(resourceFieldDesc).String()
}
// This is primarily used by AddWebhook().
projectFieldDesc := mr.Descriptor().Fields().ByName("project")
if projectFieldDesc != nil && proto.HasExtension(projectFieldDesc.Options(), annotationsproto.E_ResourceReference) {
- v := mr.Get(projectFieldDesc)
- return &common.Resource{Name: v.String()}
+ return mr.Get(projectFieldDesc).String()
}
// Listing top-level resources.
if strings.HasPrefix(shortMethod, "List") {
- return &common.Resource{Workspace: true}
+ return ""
}
isCreate := strings.HasPrefix(shortMethod, "Create")
@@ -428,21 +457,20 @@ func getResourceFromSingleRequest(mr protoreflect.Message, shortMethod string) *
resourceName = toSnakeCase(resourceName)
resourceDesc := mr.Descriptor().Fields().ByName(protoreflect.Name(resourceName))
if resourceDesc == nil {
- return &common.Resource{Workspace: true}
+ return ""
}
if proto.HasExtension(resourceDesc.Message().Options(), annotationsproto.E_Resource) {
- // Parent-less resource. Return workspace resource for Create() method.
+ // Parent-less resource. Return empty for Create() method (workspace resource).
if isCreate {
- return &common.Resource{Workspace: true}
+ return ""
}
resourceValue := mr.Get(resourceDesc)
resourceNameDesc := resourceDesc.Message().Fields().ByName("name")
if resourceNameDesc != nil {
- v := resourceValue.Message().Get(resourceNameDesc)
- return &common.Resource{Name: v.String()}
+ return resourceValue.Message().Get(resourceNameDesc).String()
}
}
- return &common.Resource{Workspace: true}
+ return ""
}
var matchFirstCap = regexp.MustCompile("(.)([A-Z][a-z]+)")
diff --git a/backend/api/v1/acl_test.go b/backend/api/v1/acl_test.go
index 2cde37a384..4736493a96 100644
--- a/backend/api/v1/acl_test.go
+++ b/backend/api/v1/acl_test.go
@@ -1,12 +1,12 @@
package v1
import (
+ "context"
"testing"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/fieldmaskpb"
- "github.com/bytebase/bytebase/backend/common"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
)
@@ -14,14 +14,12 @@ func TestGetResourceFromRequest(t *testing.T) {
tests := []struct {
request any
method string
- want []*common.Resource
+ want []string
}{
{
request: &v1pb.LoginRequest{Email: "[email protected]"},
method: "/bytebase.v1.AuthService/Login",
- want: []*common.Resource{
- {Workspace: true},
- },
+ want: []string{""},
},
{
request: &v1pb.CreateProjectRequest{
@@ -30,9 +28,7 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.ProjectService/CreateProject",
- want: []*common.Resource{
- {Workspace: true},
- },
+ want: []string{""},
},
{
request: &v1pb.UpdateProjectRequest{
@@ -41,16 +37,12 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.ProjectService/UpdateProject",
- want: []*common.Resource{
- {Name: "projects/hello"},
- },
+ want: []string{"projects/hello"},
},
{
request: &v1pb.ListProjectsRequest{},
method: "/bytebase.v1.ProjectService/ListProjects",
- want: []*common.Resource{
- {Workspace: true},
- },
+ want: []string{""},
},
// The database group has not been annotated with resource yet.
{
@@ -58,9 +50,7 @@ func TestGetResourceFromRequest(t *testing.T) {
Parent: "projects/hello",
},
method: "/bytebase.v1.DatabaseGroupService/CreateDatabaseGroup",
- want: []*common.Resource{
- {Name: "projects/hello"},
- },
+ want: []string{"projects/hello"},
},
{
// The instance has not been annotated with resource yet.
@@ -70,18 +60,14 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.InstanceService/UpdateInstance",
- want: []*common.Resource{
- {Name: "instances/hello"},
- },
+ want: []string{"instances/hello"},
},
{
request: &v1pb.UpdateSubscriptionRequest{
License: "123",
},
method: "/bytebase.v1.SubscriptionService/UpdateSubscription",
- want: []*common.Resource{
- {Workspace: true},
- },
+ want: []string{""},
},
{
request: &v1pb.RemoveWebhookRequest{
@@ -90,9 +76,7 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.ProjectService/RemoveWebhook",
- want: []*common.Resource{
- {Name: "projects/aaa/webhooks/bbb"},
- },
+ want: []string{"projects/aaa/webhooks/bbb"},
},
{
request: &v1pb.UpdateIdentityProviderRequest{
@@ -101,9 +85,7 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.IdentityProviderService/UpdateIdentityProvider",
- want: []*common.Resource{
- {Name: "idps/hello"},
- },
+ want: []string{"idps/hello"},
},
{
request: &v1pb.TestIdentityProviderRequest{
@@ -112,16 +94,12 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.IdentityProviderService/TestIdentityProvider",
- want: []*common.Resource{
- {Name: "idps/hello"},
- },
+ want: []string{"idps/hello"},
},
{
request: &v1pb.ListReviewConfigsRequest{},
method: "/bytebase.v1.ReviewConfigService/ListReviewConfigs",
- want: []*common.Resource{
- {Workspace: true},
- },
+ want: []string{""},
},
{
request: &v1pb.BatchUpdateDatabasesRequest{
@@ -131,10 +109,7 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.DatabaseService/BatchUpdateDatabases",
- want: []*common.Resource{
- {Name: "instances/hello/databases/hello"},
- {Name: "instances/world/databases/world"},
- },
+ want: []string{"instances/hello/databases/hello", "instances/world/databases/world"},
},
{
request: &v1pb.BatchUpdateDatabasesRequest{
@@ -144,21 +119,14 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.DatabaseService/BatchUpdateDatabases",
- want: []*common.Resource{
- {Name: "projects/a"},
- {Name: "projects/b"},
- {Name: "instances/hello/databases/hello"},
- {Name: "instances/world/databases/world"},
- },
+ want: []string{"projects/a", "projects/b", "instances/hello/databases/hello", "instances/world/databases/world"},
},
{
request: &v1pb.SyncInstanceRequest{
Name: "instances/hello",
},
method: "/bytebase.v1.InstanceService/SyncInstance",
- want: []*common.Resource{
- {Name: "instances/hello"},
- },
+ want: []string{"instances/hello"},
},
{
request: &v1pb.BatchSyncInstancesRequest{
@@ -168,24 +136,19 @@ func TestGetResourceFromRequest(t *testing.T) {
},
},
method: "/bytebase.v1.InstanceService/BatchSyncInstances",
- want: []*common.Resource{
- {Name: "instances/hello"},
- {Name: "instances/world"},
- },
+ want: []string{"instances/hello", "instances/world"},
},
{
request: &v1pb.CancelPlanCheckRunRequest{
Name: "projects/hello/plans/world/planCheckRun",
},
method: "/bytebase.v1.PlanService/CancelPlanCheckRun",
- want: []*common.Resource{
- {Name: "projects/hello/plans/world/planCheckRun"},
- },
+ want: []string{"projects/hello/plans/world/planCheckRun"},
},
}
for _, tt := range tests {
- got, _ := getResourceFromRequest(tt.request, tt.method)
+ got, _ := getResourceFromRequest(context.Background(), tt.request, tt.method)
require.Equal(t, tt.want, got, tt.method)
}
}
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.go
index faaf3f811c..5809c1b259 100644
--- a/backend/api/v1/actuator_service.go
+++ b/backend/api/v1/actuator_service.go
@@ -12,10 +12,12 @@ import (
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/api/auth"
+ "github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/sampleinstance"
"github.com/bytebase/bytebase/backend/enterprise"
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
"github.com/bytebase/bytebase/backend/runner/schemasync"
@@ -54,7 +56,28 @@ func (s *ActuatorService) GetActuatorInfo(
ctx context.Context,
_ *connect.Request[v1pb.GetActuatorInfoRequest],
) (*connect.Response[v1pb.ActuatorInfo], error) {
- info, err := s.getServerInfo(ctx)
+ var workspaceID string
+ if !s.profile.SaaS {
+ ws, err := s.store.GetWorkspaceID(ctx)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
+ workspaceID = ws
+ }
+ info, err := s.getServerInfo(ctx, workspaceID)
+ if err != nil {
+ return nil, err
+ }
+ return connect.NewResponse(info), nil
+}
+
+// GetWorkspaceActuatorInfo gets workspace-scoped actuator info. Requires authentication.
+// Workspace validation is handled by the ACL layer (resource_reference on name field).
+func (s *ActuatorService) GetWorkspaceActuatorInfo(
+ ctx context.Context,
+ _ *connect.Request[v1pb.GetWorkspaceActuatorInfoRequest],
+) (*connect.Response[v1pb.ActuatorInfo], error) {
+ info, err := s.getServerInfo(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, err
}
@@ -71,18 +94,36 @@ func (s *ActuatorService) DeleteCache(
}
// GetResourcePackage gets the theme resources.
+// Serves both /v1/actuator/resources and /v1/{name=workspaces/*}/actuator/resources.
func (s *ActuatorService) GetResourcePackage(
ctx context.Context,
- _ *connect.Request[v1pb.GetResourcePackageRequest],
+ req *connect.Request[v1pb.GetResourcePackageRequest],
) (*connect.Response[v1pb.ResourcePackage], error) {
- workspaceProfileSetting, err := s.store.GetWorkspaceProfileSetting(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace profile setting"))
+ var workspaceID string
+ if !s.profile.SaaS {
+ ws, err := s.store.GetWorkspaceID(ctx)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
+ workspaceID = ws
+ } else if req.Msg.Name == "" {
+ reqWorkspaceID, err := common.GetWorkspaceID(req.Msg.Name)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ workspaceID = reqWorkspaceID
}
- pkg := &v1pb.ResourcePackage{
- Logo: []byte(workspaceProfileSetting.BrandingLogo),
+ pkg := &v1pb.ResourcePackage{}
+
+ if workspaceID != "" {
+ workspaceProfileSetting, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace profile setting"))
+ }
+ pkg.Logo = []byte(workspaceProfileSetting.BrandingLogo)
}
+
return connect.NewResponse(pkg), nil
}
@@ -91,102 +132,114 @@ func (s *ActuatorService) SetupSample(
ctx context.Context,
_ *connect.Request[v1pb.SetupSampleRequest],
) (*connect.Response[emptypb.Empty], error) {
+ if s.profile.SaaS {
+ // skip sample setup in SaaS
+ slog.Debug("sample is not available for SaaS")
+ return connect.NewResponse(&emptypb.Empty{}), nil
+ }
user, ok := GetUserFromContext(ctx)
if !ok || user == nil {
return nil, connect.NewError(connect.CodeInternal, errors.New("user not found"))
}
- if err := s.sampleInstanceManager.GenerateOnboardingData(ctx, user, s.schemaSyncer); err != nil {
- // When running inside docker on mac, we sometimes get database does not exist error.
- // This is due to the docker overlay storage incompatibility with mac OS file system.
- // Onboarding error is not critical, so we just emit an error log.
- slog.Error("failed to prepare onboarding data", log.BBError(err))
+
+ if s.sampleInstanceManager != nil {
+ if err := s.sampleInstanceManager.GenerateOnboardingData(ctx, common.GetWorkspaceIDFromContext(ctx), user, s.schemaSyncer); err != nil {
+ // When running inside docker on mac, we sometimes get database does not exist error.
+ // This is due to the docker overlay storage incompatibility with mac OS file system.
+ // Onboarding error is not critical, so we just emit an error log.
+ slog.Error("failed to prepare onboarding data", log.BBError(err))
+ }
}
return connect.NewResponse(&emptypb.Empty{}), nil
}
-func (s *ActuatorService) getServerInfo(ctx context.Context) (*v1pb.ActuatorInfo, error) {
- activeEndUserCount, err := s.store.CountActiveEndUsers(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, err)
- }
-
- setting, err := s.store.GetWorkspaceProfileSetting(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace setting"))
- }
-
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workspace"))
- }
- workspaceID := workspace.ResourceID
-
- usedFeatures, err := s.getUsedFeatures(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get used features"))
- }
- unlicensedFeatures := s.getUnlicensedFeatures(usedFeatures)
- var unlicensedFeaturesString []string
- for _, f := range unlicensedFeatures {
- unlicensedFeaturesString = append(unlicensedFeaturesString, f.String())
- }
-
- // Check if sample instances are available
- hasSampleInstances, _ := s.store.HasSampleInstances(ctx)
-
- // Prefer command-line flag over database value for external URL
- externalURL := setting.ExternalUrl
- if s.profile.ExternalURL != "" {
- externalURL = s.profile.ExternalURL
- }
-
+func (s *ActuatorService) getServerInfo(ctx context.Context, workspaceID string) (*v1pb.ActuatorInfo, error) {
serverInfo := v1pb.ActuatorInfo{
Version: s.profile.Version,
GitCommit: s.profile.GitCommit,
Saas: s.profile.SaaS,
Demo: s.profile.Demo,
- NeedAdminSetup: activeEndUserCount == 0,
- ExternalUrl: externalURL,
LastActiveTime: timestamppb.New(time.Unix(s.profile.LastActiveTS.Load(), 0)),
- WorkspaceId: workspaceID,
Docker: s.profile.IsDocker,
- UnlicensedFeatures: unlicensedFeaturesString,
- EnableSample: hasSampleInstances,
ExternalUrlFromFlag: s.profile.ExternalURL != "",
ReplicaCount: int32(s.licenseService.CountActiveReplicas(ctx)),
Restriction: &v1pb.Restriction{
- PasswordRestriction: convertToPasswordRestrictionSetting(setting.GetPasswordRestriction()),
- DisallowSignup: setting.DisallowSignup || s.profile.SaaS,
- DisallowPasswordSignin: setting.DisallowPasswordSignin,
+ PasswordRestriction: &v1pb.WorkspaceProfileSetting_PasswordRestriction{
+ MinLength: 8,
+ },
},
+ NeedAdminSetup: true,
}
- count, err := s.store.CountActiveEndUsers(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to stat users"))
- }
- serverInfo.ActivatedUserCount = int32(count)
+ if workspaceID != "" {
+ serverInfo.Workspace = common.FormatWorkspace(workspaceID)
- activatedInstanceCount, err := s.store.GetActivatedInstanceCount(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to count activated instance"))
- }
- serverInfo.ActivatedInstanceCount = int32(activatedInstanceCount)
+ defaultProjectID, err := s.store.GetDefaultProjectID(ctx, workspaceID)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get default project"))
+ }
+ serverInfo.DefaultProject = common.FormatProject(defaultProjectID)
- activeInstanceCount, err := s.store.CountActiveInstances(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to count total instance"))
+ usedFeatures, err := s.getUsedFeatures(ctx, workspaceID)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get used features"))
+ }
+ unlicensedFeatures := s.getUnlicensedFeatures(ctx, workspaceID, usedFeatures)
+ var unlicensedFeaturesString []string
+ for _, f := range unlicensedFeatures {
+ unlicensedFeaturesString = append(unlicensedFeaturesString, f.String())
+ }
+ serverInfo.UnlicensedFeatures = unlicensedFeaturesString
+
+ activeEndUserCount, err := s.store.CountActiveEndUsersPerWorkspace(ctx, workspaceID)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
+ serverInfo.NeedAdminSetup = activeEndUserCount <= 1
+ serverInfo.ActivatedUserCount = int32(activeEndUserCount)
+
+ setting, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace setting"))
+ }
+ serverInfo.Restriction = &v1pb.Restriction{
+ PasswordRestriction: convertPasswordRestriction(setting.GetPasswordRestriction()),
+ DisallowSignup: setting.DisallowSignup,
+ DisallowPasswordSignin: setting.DisallowPasswordSignin,
+ }
+
+ // Check if sample instances are available
+ hasSampleInstances, _ := s.store.HasSampleInstances(ctx, workspaceID)
+ serverInfo.EnableSample = hasSampleInstances
+
+ // Prefer command-line flag over database value for external URL
+ externalURL := setting.ExternalUrl
+ if s.profile.ExternalURL != "" {
+ externalURL = s.profile.ExternalURL
+ }
+ serverInfo.ExternalUrl = externalURL
+
+ activatedInstanceCount, err := s.store.GetActivatedInstanceCount(ctx, workspaceID)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to count activated instance"))
+ }
+ serverInfo.ActivatedInstanceCount = int32(activatedInstanceCount)
+
+ activeInstanceCount, err := s.store.CountActiveInstances(ctx, workspaceID)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to count total instance"))
+ }
+ serverInfo.TotalInstanceCount = int32(activeInstanceCount)
}
- serverInfo.TotalInstanceCount = int32(activeInstanceCount)
return &serverInfo, nil
}
-func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeature, error) {
+func (s *ActuatorService) getUsedFeatures(ctx context.Context, workspaceID string) ([]v1pb.PlanFeature, error) {
var features []v1pb.PlanFeature
// idp
- idps, err := s.store.ListIdentityProviders(ctx, &store.FindIdentityProviderMessage{})
+ idps, err := s.store.ListIdentityProviders(ctx, &store.FindIdentityProviderMessage{Workspace: workspaceID})
if err != nil {
return nil, errors.Wrapf(err, "failed to list identity providers")
}
@@ -195,11 +248,11 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatu
features = append(features, v1pb.PlanFeature_FEATURE_ENTERPRISE_SSO)
}
- setting, err := s.store.GetWorkspaceProfileSetting(ctx)
+ setting, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get workspace general setting")
}
- if setting.DisallowSignup && !s.profile.SaaS {
+ if setting.DisallowSignup {
features = append(features, v1pb.PlanFeature_FEATURE_DISALLOW_SELF_SERVICE_SIGNUP)
}
if setting.Require_2Fa {
@@ -219,7 +272,7 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatu
}
// environment tier
- environments, err := s.store.GetEnvironment(ctx)
+ environments, err := s.store.GetEnvironment(ctx, workspaceID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get environment setting")
}
@@ -241,12 +294,28 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatu
return features, nil
}
-func (s *ActuatorService) getUnlicensedFeatures(features []v1pb.PlanFeature) []v1pb.PlanFeature {
+func (s *ActuatorService) getUnlicensedFeatures(ctx context.Context, workspaceID string, features []v1pb.PlanFeature) []v1pb.PlanFeature {
var unlicensedFeatures []v1pb.PlanFeature
for _, feature := range features {
- if err := s.licenseService.IsFeatureEnabled(feature); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, feature); err != nil {
unlicensedFeatures = append(unlicensedFeatures, feature)
}
}
return unlicensedFeatures
}
+
+// convertPasswordRestriction converts store PasswordRestriction to v1 PasswordRestriction.
+func convertPasswordRestriction(pr *storepb.WorkspaceProfileSetting_PasswordRestriction) *v1pb.WorkspaceProfileSetting_PasswordRestriction {
+ if pr == nil {
+ return nil
+ }
+ return &v1pb.WorkspaceProfileSetting_PasswordRestriction{
+ MinLength: pr.MinLength,
+ RequireNumber: pr.RequireNumber,
+ RequireLetter: pr.RequireLetter,
+ RequireUppercaseLetter: pr.RequireUppercaseLetter,
+ RequireSpecialCharacter: pr.RequireSpecialCharacter,
+ RequireResetPasswordForFirstLogin: pr.RequireResetPasswordForFirstLogin,
+ PasswordRotation: pr.PasswordRotation,
+ }
+}
diff --git a/backend/api/v1/ai_service.go b/backend/api/v1/ai_service.go
index ea5cd12977..5c7005c2c6 100644
--- a/backend/api/v1/ai_service.go
+++ b/backend/api/v1/ai_service.go
@@ -12,6 +12,7 @@ import (
"connectrpc.com/connect"
"github.com/pkg/errors"
+ "github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
@@ -33,7 +34,7 @@ func NewAIService(store *store.Store) *AIService {
// Chat sends a conversation with tool definitions to the configured AI provider and returns the response.
func (s *AIService) Chat(ctx context.Context, req *connect.Request[v1pb.AIChatRequest]) (*connect.Response[v1pb.AIChatResponse], error) {
- aiSetting, err := s.store.GetAISetting(ctx)
+ aiSetting, err := s.store.GetAISetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, err
}
diff --git a/backend/api/v1/audit.go b/backend/api/v1/audit.go
index cd339cff39..fa4cfdcd6d 100644
--- a/backend/api/v1/audit.go
+++ b/backend/api/v1/audit.go
@@ -173,21 +173,19 @@ func createAuditLogConnect(ctx context.Context, request, response any, method st
requestMetadata := getRequestMetadataFromHeaders(headers, peerAddr)
- var parents []string
- if authContext.HasWorkspaceResource() {
- workspace, err := storage.GetWorkspace(ctx)
- if err != nil {
- return errors.Wrapf(err, "failed to get workspace")
- }
- parents = append(parents, common.FormatWorkspace(workspace.ResourceID))
- } else {
- for _, projectID := range authContext.GetProjectResources() {
- parents = append(parents, common.FormatProject(projectID))
- }
- }
-
createAuditLogCtx := context.WithoutCancel(ctx)
- for _, parent := range parents {
+ for _, authResource := range authContext.Resources {
+ var parent string
+ var auditWorkspaceID string
+ switch authResource.Type {
+ case common.ResourceTypeProject:
+ parent = common.FormatProject(authResource.ID)
+ case common.ResourceTypeWorkspace:
+ parent = common.FormatWorkspace(authResource.ID)
+ auditWorkspaceID = authResource.ID
+ default:
+ continue
+ }
resource := getRequestResource(request)
// For login requests, if resource is empty, try to get email from user context or MFA temp token.
// This handles MFA phase where request doesn't have email field.
@@ -215,11 +213,16 @@ func createAuditLogConnect(ctx context.Context, request, response any, method st
ServiceData: serviceData,
RequestMetadata: requestMetadata,
}
- workspaceForAudit, err := storage.GetWorkspace(createAuditLogCtx)
- if err != nil {
- return errors.Wrapf(err, "failed to get workspace for audit log")
+ // Resolve workspace for audit log.
+ workspaceIDForAudit := auditWorkspaceID
+ if workspaceIDForAudit == "" {
+ workspaceIDForAudit = common.GetWorkspaceIDFromContext(createAuditLogCtx)
+ }
+ if workspaceIDForAudit == "" {
+ // Skip audit log if no workspace can be determined (e.g., unauthenticated request).
+ continue
}
- if err := storage.CreateAuditLog(createAuditLogCtx, workspaceForAudit.ResourceID, p); err != nil {
+ if err := storage.CreateAuditLog(createAuditLogCtx, workspaceIDForAudit, p); err != nil {
return err
}
diff --git a/backend/api/v1/audit_log_service.go b/backend/api/v1/audit_log_service.go
index 9f17e562d4..c40f94f856 100644
--- a/backend/api/v1/audit_log_service.go
+++ b/backend/api/v1/audit_log_service.go
@@ -32,7 +32,8 @@ func NewAuditLogService(store *store.Store, licenseService *enterprise.LicenseSe
}
func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.Request[v1pb.SearchAuditLogsRequest]) (*connect.Response[v1pb.SearchAuditLogsResponse], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
filterQ, err := store.GetSearchAuditLogsFilter(request.Msg.Filter)
@@ -41,7 +42,7 @@ func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.
}
// Apply retention-based filtering based on the plan
- retentionCutoff := s.licenseService.GetAuditLogRetentionCutoff()
+ retentionCutoff := s.licenseService.GetAuditLogRetentionCutoff(ctx, workspaceID)
if retentionCutoff != nil {
filterQ = store.ApplyRetentionFilter(filterQ, retentionCutoff)
}
@@ -66,6 +67,7 @@ func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.
project = &request.Msg.Parent
}
auditLogFind := &store.AuditLogFind{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
Project: project,
Limit: &limitPlusOne,
Offset: &offset.offset,
@@ -93,7 +95,7 @@ func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.
}
func (s *AuditLogService) ExportAuditLogs(ctx context.Context, request *connect.Request[v1pb.ExportAuditLogsRequest]) (*connect.Response[v1pb.ExportAuditLogsResponse], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
if request.Msg.Filter == "" {
diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.go
index 84b76f2e4f..f87b492178 100644
--- a/backend/api/v1/auth_service.go
+++ b/backend/api/v1/auth_service.go
@@ -89,43 +89,51 @@ func (s *AuthService) Login(ctx context.Context, req *connect.Request[v1pb.Login
mfaSecondLogin := request.GetMfaTempToken() != ""
// 1. Authenticate user (password, IDP, or MFA completion)
- loginUser, requireResetPassword, err := s.authenticateLogin(ctx, request)
+ loginUser, err := s.authenticateLogin(ctx, request)
if err != nil {
return nil, err
}
- // 2. Post-auth checks (deleted, domain, license)
- if err := s.validateLoginPermissions(ctx, loginUser, request); err != nil {
+ // 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)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to resolve workspace"))
+ }
+
+ // 3. Post-auth checks (deleted, domain, license)
+ if err := s.validateLoginPermissions(ctx, loginUser, workspaceID, request); err != nil {
return nil, err
}
- // 3. Check if MFA challenge needed (returns early with temp token)
- if resp, err := s.checkMFARequired(loginUser, mfaSecondLogin); err != nil {
+ // 4. Check if MFA challenge needed (returns early with temp token)
+ if resp, err := s.checkMFARequired(ctx, loginUser, workspaceID, mfaSecondLogin); err != nil {
return nil, err
} else if resp != nil {
return resp, nil
}
- // 4. Generate appropriate token
- token, err := s.generateLoginToken(ctx, loginUser)
+ // 5. Generate token (workspace already resolved)
+ token, err := s.generateLoginToken(ctx, loginUser, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to generate access token"))
}
- // 5. Build response and finalize
- return s.finalizeLogin(ctx, req, loginUser, token, requireResetPassword)
+ // 6. Build response and finalize
+ requireResetPassword := s.needResetPassword(ctx, loginUser, workspaceID)
+ return s.finalizeLogin(ctx, req, loginUser, token, workspaceID, requireResetPassword)
}
-func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMessage) bool {
+func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMessage, workspaceID string) bool {
// Reset password restriction only works for end user with email & password login.
if user.Type != storepb.PrincipalType_END_USER {
return false
}
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_PASSWORD_RESTRICTIONS); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_PASSWORD_RESTRICTIONS); err != nil {
return false
}
- setting, err := s.store.GetWorkspaceProfileSetting(ctx)
+ setting, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
slog.Error("failed to get workspace setting", log.BBError(err))
return false
@@ -136,7 +144,7 @@ func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMes
if !passwordRestriction.GetRequireResetPasswordForFirstLogin() {
return false
}
- count, err := s.store.CountActiveEndUsers(ctx)
+ count, err := s.store.CountActiveEndUsersPerWorkspace(ctx, workspaceID)
if err != nil {
slog.Error("failed to count end users", log.BBError(err))
return false
@@ -158,6 +166,168 @@ func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMes
return false
}
+// Signup registers a new user account (self-service).
+// Creates a principal and assigns a workspace:
+// - If the user's email was pre-invited to a workspace, joins that workspace.
+// - Otherwise, creates a new workspace with the user as admin.
+func (s *AuthService) Signup(ctx context.Context, req *connect.Request[v1pb.SignupRequest]) (*connect.Response[v1pb.LoginResponse], error) {
+ request := req.Msg
+ if request.Email == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("email must be set"))
+ }
+ if request.Title == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("title must be set"))
+ }
+ if request.Password == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("password must be set"))
+ }
+ if err := validateEndUserEmail(request.Email); err != nil {
+ return nil, err
+ }
+
+ // Check if principal already exists.
+ existingUser, err := s.store.GetUserByEmail(ctx, request.Email)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find user by email"))
+ }
+ if existingUser != nil {
+ return 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.
+ memberName := common.FormatUserEmail(request.Email)
+ workspaces, err := s.store.FindWorkspacesByMemberEmail(ctx, memberName, !s.profile.SaaS)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspaces"))
+ }
+
+ var workspaceID string
+ isMember := len(workspaces) > 0
+ if isMember {
+ workspaceID = workspaces[0].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
+ }
+
+ if workspaceID != "" {
+ if !s.profile.SaaS {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DISALLOW_SELF_SERVICE_SIGNUP); err == nil {
+ setting, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workspace setting"))
+ }
+ if setting.DisallowSignup {
+ return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("sign up is disallowed for this workspace"))
+ }
+ }
+ }
+
+ if err := validatePassword(ctx, s.store, workspaceID, request.Password); err != nil {
+ return nil, err
+ }
+ } else if len(request.Password) < 8 {
+ // TODO(ed): optimize this
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("password length should be no less than 8 characters"))
+ }
+
+ 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"))
+ }
+
+ // Step 2: Create the principal (global identity).
+ user, err := s.store.CreateUser(ctx, &store.UserMessage{
+ Email: request.Email,
+ Name: request.Title,
+ PasswordHash: string(passwordHash),
+ Profile: &storepb.UserProfile{},
+ })
+ if err != nil {
+ return 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,
+ Name: "Default workspace",
+ }, 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.
+ tokenDuration := auth.GetAccessTokenDuration(ctx, s.store, s.licenseService, workspaceID)
+ token, err := auth.GenerateAccessToken(user.Email, workspaceID, s.secret, tokenDuration)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to generate access token"))
+ }
+
+ response := &v1pb.LoginResponse{}
+ resp := connect.NewResponse(response)
+
+ // Signup is always web-based — set tokens as HTTP-only cookies.
+ origin := req.Header().Get("Origin")
+ cookie := auth.GetTokenCookie(ctx, s.store, s.licenseService, workspaceID, origin, token)
+ resp.Header().Add("Set-Cookie", cookie.String())
+
+ refreshToken, err := auth.GenerateOpaqueToken()
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to generate refresh token"))
+ }
+ refreshTokenDuration := auth.GetRefreshTokenDuration(ctx, s.store, s.licenseService, workspaceID)
+ if err := s.store.CreateWebRefreshToken(ctx, &store.WebRefreshTokenMessage{
+ TokenHash: auth.HashToken(refreshToken),
+ UserEmail: user.Email,
+ ExpiresAt: time.Now().Add(refreshTokenDuration),
+ }); err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to create refresh token"))
+ }
+ refreshCookie := auth.GetRefreshTokenCookie(origin, refreshToken, refreshTokenDuration)
+ resp.Header().Add("Set-Cookie", refreshCookie.String())
+
+ // Update last login time.
+ if _, err := s.store.UpdateUser(ctx, user, &store.UpdateUserMessage{
+ Profile: &storepb.UserProfile{
+ LastLoginTime: timestamppb.Now(),
+ },
+ }); err != nil {
+ slog.Error("failed to update user profile", log.BBError(err), slog.String("user", user.Email))
+ }
+
+ v1User, err := convertToUser(ctx, s.iamManager, user)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))
+ }
+ v1User.Workspace = common.FormatWorkspace(workspaceID)
+ response.User = v1User
+
+ return resp, 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
@@ -171,7 +341,7 @@ func (s *AuthService) Logout(ctx context.Context, req *connect.Request[v1pb.Logo
origin := req.Header().Get("Origin")
// Clear access token cookie
- resp.Header().Add("Set-Cookie", auth.GetTokenCookie(ctx, s.store, s.licenseService, origin, "").String())
+ resp.Header().Add("Set-Cookie", auth.GetTokenCookie(ctx, s.store, s.licenseService, common.GetWorkspaceIDFromContext(ctx), origin, "").String())
// Clear refresh token cookie
resp.Header().Add("Set-Cookie", auth.GetRefreshTokenCookie(origin, "", 0).String())
return resp, nil
@@ -210,8 +380,12 @@ func (s *AuthService) Refresh(ctx context.Context, req *connect.Request[v1pb.Ref
}
// 5. Issue new tokens
- accessTokenDuration := auth.GetAccessTokenDuration(ctx, s.store, s.licenseService)
- accessToken, err := auth.GenerateAccessToken(user.Email, s.secret, accessTokenDuration)
+ workspaceID, err := s.store.FindWorkspaceIDByMemberEmail(ctx, common.FormatUserEmail(user.Email), !s.profile.SaaS)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
+ }
+ accessTokenDuration := auth.GetAccessTokenDuration(ctx, s.store, s.licenseService, workspaceID)
+ accessToken, err := auth.GenerateAccessToken(user.Email, workspaceID, s.secret, accessTokenDuration)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to generate access token"))
}
@@ -233,7 +407,7 @@ func (s *AuthService) Refresh(ctx context.Context, req *connect.Request[v1pb.Ref
// 6. Set cookies and return
resp := connect.NewResponse(&v1pb.RefreshResponse{})
origin := req.Header().Get("Origin")
- resp.Header().Add("Set-Cookie", auth.GetTokenCookie(ctx, s.store, s.licenseService, origin, accessToken).String())
+ resp.Header().Add("Set-Cookie", auth.GetTokenCookie(ctx, s.store, s.licenseService, workspaceID, origin, accessToken).String())
resp.Header().Add("Set-Cookie", auth.GetRefreshTokenCookie(origin, newRefreshToken, time.Until(stored.ExpiresAt)).String())
return resp, nil
@@ -245,29 +419,37 @@ func (s *AuthService) getAndVerifyUser(ctx context.Context, request *v1pb.LoginR
return nil, err
}
- user, err := s.store.GetPrincipalByEmail(ctx, request.Email)
+ // GetAccountByEmail is cross-workspace, which is correct for login.
+ // Email is globally unique (PK). The token gets workspace from account.Workspace (SA/WI)
+ // or from the default workspace (END_USER).
+ account, err := s.store.GetAccountByEmail(ctx, request.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user by email %q", request.Email))
}
- if user == nil {
+ if account == nil {
return nil, invalidCredentialsError
}
// Compare the stored hashed password, with the hashed version of the password that was received.
- if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(request.Password)); err != nil {
+ if err := bcrypt.CompareHashAndPassword([]byte(account.PasswordHash), []byte(request.Password)); err != nil {
// If the two passwords don't match, return a 401 status.
return nil, invalidCredentialsError
}
- return user, nil
+
+ // Convert AccountMessage to UserMessage for downstream use.
+ return s.accountToUser(ctx, account)
}
+// getOrCreateUserWithIDP authenticates a user via an identity provider (SSO).
+// Login API has allow_without_credential, so there's no workspace in the token context.
+// We resolve workspace from the IDP entity (IDP resource_id is globally unique).
func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.LoginRequest) (*store.UserMessage, error) {
idpID, err := common.GetIdentityProviderID(request.IdpName)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get identity provider ID"))
}
- idp, err := s.store.GetIdentityProvider(ctx, &store.FindIdentityProviderMessage{
- ResourceID: &idpID,
- })
+ // Look up IDP without workspace filter — IDP resource_id is globally unique.
+ // The workspace is resolved from the IDP entity.
+ idp, err := s.store.GetIdentityProviderByID(ctx, idpID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get identity provider"))
}
@@ -275,7 +457,8 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("identity provider not found"))
}
- externalURL, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile)
+ workspaceID := idp.Workspace
+ externalURL, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile, workspaceID)
if err != nil {
return nil, err
}
@@ -365,7 +548,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
}
}
// If the email is still invalid, we will return an error.
- if err := validateEmailWithDomains(ctx, s.licenseService, s.store, email, false); err != nil {
+ if err := validateEmailWithDomains(ctx, s.licenseService, s.store, workspaceID, email, false); err != nil {
return nil, err
}
@@ -375,7 +558,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
}
if user != nil {
if user.MemberDeleted {
- if err := s.userCountGuard(ctx); err != nil {
+ if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID); err != nil {
return nil, err
}
// Undelete the user when login via SSO.
@@ -387,7 +570,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
if userInfo.HasGroups {
// Sync user groups with the identity provider.
// The userInfo.Groups is the groups that the user belongs to in the identity provider.
- if err := s.syncUserGroups(ctx, user, userInfo.Groups); err != nil {
+ if err := s.syncUserGroups(ctx, user, workspaceID, userInfo.Groups); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to sync user groups"))
}
}
@@ -399,7 +582,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
if idp.Type == storepb.IdentityProviderType_OAUTH2 && googleGitHubDomains[idp.Domain] {
featurePlan = v1pb.PlanFeature_FEATURE_GOOGLE_AND_GITHUB_SSO
}
- if err := s.licenseService.IsFeatureEnabled(featurePlan); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, featurePlan); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
// Create new user from identity provider.
@@ -411,7 +594,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate password hash"))
}
- if err := s.userCountGuard(ctx); err != nil {
+ if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID); err != nil {
return nil, err
}
newUser, err := s.store.CreateUser(ctx, &store.UserMessage{
@@ -424,29 +607,27 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create user"))
}
+
+ // Add the new user to the workspace IAM policy as a member.
+ // The IDP is workspace-scoped, so authenticating through it grants workspace access.
+ if _, err := s.store.PatchWorkspaceIamPolicy(ctx, &store.PatchIamPolicyMessage{
+ Workspace: workspaceID,
+ Member: common.FormatUserEmail(email),
+ Roles: []string{common.FormatRole(store.WorkspaceMemberRole)},
+ }); err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to add user to workspace"))
+ }
+
if userInfo.HasGroups {
// Sync user groups with the identity provider.
// The userInfo.Groups is the groups that the user belongs to in the identity provider.
- if err := s.syncUserGroups(ctx, newUser, userInfo.Groups); err != nil {
+ if err := s.syncUserGroups(ctx, newUser, workspaceID, userInfo.Groups); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to sync user groups"))
}
}
return newUser, nil
}
-func (s *AuthService) userCountGuard(ctx context.Context) error {
- userLimit := s.licenseService.GetUserLimit(ctx)
-
- count, err := s.store.CountActiveEndUsers(ctx)
- if err != nil {
- return connect.NewError(connect.CodeInternal, err)
- }
- if count >= userLimit {
- return connect.NewError(connect.CodeResourceExhausted, errors.Errorf("reached the maximum user count %d", userLimit))
- }
- return nil
-}
-
// countRecentLoginFailures counts the number of failed login attempts for a given email
// within the specified time window, matching any of the provided error messages.
func (s *AuthService) countRecentLoginFailures(ctx context.Context, email string, window time.Duration, errMessages ...string) (int, error) {
@@ -480,6 +661,7 @@ func (s *AuthService) countRecentLoginFailures(ctx context.Context, email string
filterQ.And("created_at >= ?", windowStart)
+ // Search across all workspaces — lockout is per-email, not per-workspace.
logs, err := s.store.SearchAuditLogs(ctx, &store.AuditLogFind{
FilterQ: filterQ,
})
@@ -555,8 +737,8 @@ func validateWithCodeAndSecret(code, secret string) bool {
// syncUserGroups syncs the user groups with the given groups.
// The given groups are the groups that the user belongs to in the identity provider.
// Supported groups format: ["group1", "group2", ...], ["[email protected]", ...]
-func (s *AuthService) syncUserGroups(ctx context.Context, user *store.UserMessage, groups []string) error {
- bbGroups, err := s.store.ListGroups(ctx, &store.FindGroupMessage{})
+func (s *AuthService) syncUserGroups(ctx context.Context, user *store.UserMessage, workspaceID string, groups []string) error {
+ bbGroups, err := s.store.ListGroups(ctx, &store.FindGroupMessage{Workspace: workspaceID})
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to list groups"))
}
@@ -585,8 +767,9 @@ func (s *AuthService) syncUserGroups(ctx context.Context, user *store.UserMessag
})
}
if _, err := s.store.UpdateGroup(ctx, &store.UpdateGroupMessage{
- ID: bbGroup.ID,
- Payload: bbGroup.Payload,
+ ID: bbGroup.ID,
+ Workspace: bbGroup.Workspace,
+ Payload: bbGroup.Payload,
}); err != nil {
return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to update group %q", bbGroup.Email))
}
@@ -606,25 +789,18 @@ func (s *AuthService) syncUserGroups(ctx context.Context, user *store.UserMessag
// authenticateLogin handles all authentication paths: password, IDP, or MFA completion.
// Returns the authenticated user and whether password reset is required.
-func (s *AuthService) authenticateLogin(ctx context.Context, request *v1pb.LoginRequest) (*store.UserMessage, bool, error) {
+func (s *AuthService) authenticateLogin(ctx context.Context, request *v1pb.LoginRequest) (*store.UserMessage, error) {
mfaSecondLogin := request.GetMfaTempToken() != ""
if mfaSecondLogin {
- user, err := s.completeMFALogin(ctx, request)
- return user, false, err
+ return s.completeMFALogin(ctx, request)
}
if request.GetIdpName() != "" {
- user, err := s.getOrCreateUserWithIDP(ctx, request)
- return user, false, err
+ return s.getOrCreateUserWithIDP(ctx, request)
}
- user, err := s.getAndVerifyUser(ctx, request)
- if err != nil {
- return nil, false, err
- }
- requireResetPassword := s.needResetPassword(ctx, user)
- return user, requireResetPassword, nil
+ return s.getAndVerifyUser(ctx, request)
}
// completeMFALogin validates MFA temp token and verifies OTP or recovery code.
@@ -660,18 +836,18 @@ func (s *AuthService) completeMFALogin(ctx context.Context, request *v1pb.LoginR
}
// validateLoginPermissions checks if the user is allowed to login.
-func (s *AuthService) validateLoginPermissions(ctx context.Context, user *store.UserMessage, request *v1pb.LoginRequest) error {
+func (s *AuthService) validateLoginPermissions(ctx context.Context, user *store.UserMessage, workspaceID string, request *v1pb.LoginRequest) error {
if user.MemberDeleted {
return connect.NewError(connect.CodeUnauthenticated, errors.Errorf("user has been deactivated by administrators"))
}
- isWorkspaceAdmin, err := isUserWorkspaceAdmin(ctx, s.store, user)
+ isAdmin, err := isUserWorkspaceAdmin(ctx, s.store, user, workspaceID)
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check user roles"))
}
// Skip restrictions for workspace admins and service accounts
- if isWorkspaceAdmin || user.Type != storepb.PrincipalType_END_USER {
+ if isAdmin || user.Type != storepb.PrincipalType_END_USER {
return nil
}
@@ -684,8 +860,8 @@ func (s *AuthService) validateLoginPermissions(ctx context.Context, user *store.
loginViaIDP := request.GetIdpName() != ""
// Check disallow password signin
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DISALLOW_PASSWORD_SIGNIN); err == nil {
- setting, err := s.store.GetWorkspaceProfileSetting(ctx)
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DISALLOW_PASSWORD_SIGNIN); err == nil {
+ setting, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace setting"))
}
@@ -695,18 +871,18 @@ func (s *AuthService) validateLoginPermissions(ctx context.Context, user *store.
}
// Check domain restriction
- return validateEmailWithDomains(ctx, s.licenseService, s.store, user.Email, false)
+ return validateEmailWithDomains(ctx, s.licenseService, s.store, workspaceID, user.Email, false)
}
// checkMFARequired checks if MFA is required and returns a response with temp token if so.
// Returns (nil, nil) if MFA is not required or already completed.
-func (s *AuthService) checkMFARequired(user *store.UserMessage, mfaSecondLogin bool) (*connect.Response[v1pb.LoginResponse], error) {
+func (s *AuthService) checkMFARequired(ctx context.Context, user *store.UserMessage, workspaceID string, mfaSecondLogin bool) (*connect.Response[v1pb.LoginResponse], error) {
if mfaSecondLogin {
return nil, nil
}
userMFAEnabled := user.MFAConfig != nil && user.MFAConfig.OtpSecret != ""
- mfaFeatureEnabled := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TWO_FA) == nil
+ mfaFeatureEnabled := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_TWO_FA) == nil
if !mfaFeatureEnabled || !userMFAEnabled {
return nil, nil
}
@@ -722,21 +898,57 @@ func (s *AuthService) checkMFARequired(user *store.UserMessage, mfaSecondLogin b
}
// generateLoginToken generates the appropriate token based on user type.
-func (s *AuthService) generateLoginToken(ctx context.Context, user *store.UserMessage) (string, error) {
- tokenDuration := auth.GetAccessTokenDuration(ctx, s.store, s.licenseService)
+func (s *AuthService) generateLoginToken(ctx context.Context, user *store.UserMessage, workspaceID string) (string, error) {
+ tokenDuration := auth.GetAccessTokenDuration(ctx, s.store, s.licenseService, workspaceID)
+ var token string
+ var err error
switch user.Type {
case storepb.PrincipalType_END_USER:
- return auth.GenerateAccessToken(user.Email, s.secret, tokenDuration)
+ token, err = auth.GenerateAccessToken(user.Email, workspaceID, s.secret, tokenDuration)
case storepb.PrincipalType_SERVICE_ACCOUNT:
- return auth.GenerateAPIToken(user.Email, s.secret)
+ token, err = auth.GenerateAPIToken(user.Email, workspaceID, s.secret)
default:
return "", connect.NewError(connect.CodeUnauthenticated, errors.Errorf("user type %s cannot login", user.Type))
}
+ if err != nil {
+ return "", err
+ }
+ return token, nil
+}
+
+// resolveWorkspaceForLogin determines the workspace for a login token.
+// For SA/WI: looks up the account record to get workspace.
+// For END_USER: finds workspaces via IAM policy membership.
+// - If the user belongs to exactly 1 workspace, use it.
+// - If multiple, use the first one (TODO: workspace picker in SaaS mode).
+// - If none, return error.
+func (s *AuthService) resolveWorkspaceForLogin(ctx context.Context, user *store.UserMessage) (string, error) {
+ // Determine member name format based on user type.
+ var memberName string
+ switch user.Type {
+ case storepb.PrincipalType_SERVICE_ACCOUNT:
+ // SA has workspace on its record — look it up directly.
+ sa, err := s.store.GetServiceAccountByEmail(ctx, user.Email)
+ if err != nil {
+ return "", errors.Wrap(err, "failed to get service account")
+ }
+ if sa != nil {
+ return sa.Workspace, nil
+ }
+ return "", errors.Errorf("service account %q not found", user.Email)
+ case storepb.PrincipalType_END_USER:
+ memberName = common.FormatUserEmail(user.Email)
+ default:
+ return "", errors.Errorf("unsupported user type %s for login", user.Type)
+ }
+
+ // find workspaces by IAM policy membership.
+ return s.store.FindWorkspaceIDByMemberEmail(ctx, memberName, !s.profile.SaaS)
}
// finalizeLogin builds the response, sets cookies if needed, and updates the user profile.
-func (s *AuthService) finalizeLogin(ctx context.Context, req *connect.Request[v1pb.LoginRequest], user *store.UserMessage, token string, requireResetPassword bool) (*connect.Response[v1pb.LoginResponse], error) {
+func (s *AuthService) finalizeLogin(ctx context.Context, req *connect.Request[v1pb.LoginRequest], user *store.UserMessage, token string, workspaceID string, requireResetPassword bool) (*connect.Response[v1pb.LoginResponse], error) {
response := &v1pb.LoginResponse{
RequireResetPassword: requireResetPassword,
}
@@ -747,7 +959,7 @@ func (s *AuthService) finalizeLogin(ctx context.Context, req *connect.Request[v1
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("only users can use web login"))
}
origin := req.Header().Get("Origin")
- cookie := auth.GetTokenCookie(ctx, s.store, s.licenseService, origin, token)
+ cookie := auth.GetTokenCookie(ctx, s.store, s.licenseService, workspaceID, origin, token)
resp.Header().Add("Set-Cookie", cookie.String())
// Issue refresh token for web login
@@ -755,7 +967,7 @@ func (s *AuthService) finalizeLogin(ctx context.Context, req *connect.Request[v1
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to generate refresh token"))
}
- refreshTokenDuration := auth.GetRefreshTokenDuration(ctx, s.store, s.licenseService)
+ refreshTokenDuration := auth.GetRefreshTokenDuration(ctx, s.store, s.licenseService, workspaceID)
if err := s.store.CreateWebRefreshToken(ctx, &store.WebRefreshTokenMessage{
TokenHash: auth.HashToken(refreshToken),
UserEmail: user.Email,
@@ -784,6 +996,7 @@ func (s *AuthService) finalizeLogin(ctx context.Context, req *connect.Request[v1
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))
}
+ v1User.Workspace = common.FormatWorkspace(workspaceID)
response.User = v1User
}
@@ -808,7 +1021,7 @@ func (s *AuthService) ExchangeToken(ctx context.Context, req *connect.Request[v1
errors.Errorf("email must end with %s", common.WorkloadIdentitySuffix))
}
- // Find workload identity by email
+ // Find workload identity by email (cross-workspace lookup since this is unauthenticated).
wi, err := s.store.GetWorkloadIdentityByEmail(ctx, request.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to find workload identity"))
@@ -834,8 +1047,8 @@ func (s *AuthService) ExchangeToken(ctx context.Context, req *connect.Request[v1
errors.Wrap(err, "token validation failed"))
}
- // Generate Bytebase API token (1 hour duration, same as service account)
- token, err := auth.GenerateAPIToken(wi.Email, s.secret)
+ // Generate Bytebase API token using workspace from the WI record.
+ token, err := auth.GenerateAPIToken(wi.Email, wi.Workspace, s.secret)
if err != nil {
return nil, connect.NewError(connect.CodeInternal,
errors.Wrap(err, "failed to generate access token"))
@@ -845,3 +1058,26 @@ func (s *AuthService) ExchangeToken(ctx context.Context, req *connect.Request[v1
AccessToken: token,
}), nil
}
+
+// accountToUser converts an AccountMessage to a UserMessage.
+// For END_USER, loads the full user record. For SA/WI, constructs a minimal UserMessage.
+func (s *AuthService) accountToUser(ctx context.Context, account *store.AccountMessage) (*store.UserMessage, error) {
+ if account.Type == storepb.PrincipalType_END_USER {
+ user, err := s.store.GetUserByEmail(ctx, account.Email)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user %q", account.Email))
+ }
+ if user == nil {
+ return nil, connect.NewError(connect.CodeUnauthenticated, errors.Errorf("user %q not found", account.Email))
+ }
+ return user, nil
+ }
+
+ // SA/WI: construct a minimal UserMessage with the fields available from AccountMessage.
+ return &store.UserMessage{
+ Email: account.Email,
+ Name: account.Name,
+ Type: account.Type,
+ MemberDeleted: account.MemberDeleted,
+ }, nil
+}
diff --git a/backend/api/v1/database_catalog_service.go b/backend/api/v1/database_catalog_service.go
index 7181cf07f9..c8cdfe8717 100644
--- a/backend/api/v1/database_catalog_service.go
+++ b/backend/api/v1/database_catalog_service.go
@@ -51,6 +51,7 @@ func (s *DatabaseCatalogService) GetDatabaseCatalog(ctx context.Context, req *co
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseResourceName))
}
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -89,6 +90,7 @@ func (s *DatabaseCatalogService) UpdateDatabaseCatalog(ctx context.Context, req
}
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -101,7 +103,7 @@ func (s *DatabaseCatalogService) UpdateDatabaseCatalog(ctx context.Context, req
databaseConfig := convertDatabaseCatalog(req.Msg.GetCatalog())
- semanticTypesSetting, err := s.store.GetSemanticTypesSetting(ctx)
+ semanticTypesSetting, err := s.store.GetSemanticTypesSetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get semantic types setting"))
}
diff --git a/backend/api/v1/database_group_service.go b/backend/api/v1/database_group_service.go
index e67f3213d0..72581cc19a 100644
--- a/backend/api/v1/database_group_service.go
+++ b/backend/api/v1/database_group_service.go
@@ -33,7 +33,7 @@ func NewDatabaseGroupService(store *store.Store, licenseService *enterprise.Lice
// CreateDatabaseGroup creates a database group.
func (s *DatabaseGroupService) CreateDatabaseGroup(ctx context.Context, req *connect.Request[v1pb.CreateDatabaseGroupRequest]) (*connect.Response[v1pb.DatabaseGroup], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DATABASE_GROUPS); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATABASE_GROUPS); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
projectResourceID, err := common.GetProjectID(req.Msg.Parent)
@@ -41,6 +41,7 @@ func (s *DatabaseGroupService) CreateDatabaseGroup(ctx context.Context, req *con
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
@@ -93,7 +94,7 @@ func (s *DatabaseGroupService) CreateDatabaseGroup(ctx context.Context, req *con
// UpdateDatabaseGroup updates a database group.
func (s *DatabaseGroupService) UpdateDatabaseGroup(ctx context.Context, req *connect.Request[v1pb.UpdateDatabaseGroupRequest]) (*connect.Response[v1pb.DatabaseGroup], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DATABASE_GROUPS); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATABASE_GROUPS); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
projectResourceID, databaseGroupResourceID, err := common.GetProjectIDDatabaseGroupID(req.Msg.DatabaseGroup.Name)
@@ -101,6 +102,7 @@ func (s *DatabaseGroupService) UpdateDatabaseGroup(ctx context.Context, req *con
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
@@ -169,6 +171,7 @@ func (s *DatabaseGroupService) DeleteDatabaseGroup(ctx context.Context, req *con
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
@@ -206,6 +209,7 @@ func (s *DatabaseGroupService) ListDatabaseGroups(ctx context.Context, req *conn
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
@@ -257,7 +261,9 @@ func getDatabaseGroupByName(ctx context.Context, stores *store.Store, databaseGr
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+
project, err := stores.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
diff --git a/backend/api/v1/database_service.go b/backend/api/v1/database_service.go
index 4dbcd24bc2..6e0b428126 100644
--- a/backend/api/v1/database_service.go
+++ b/backend/api/v1/database_service.go
@@ -109,7 +109,7 @@ func (s *DatabaseService) BatchGetDatabases(ctx context.Context, req *connect.Re
// Ignore database not in the specified project.
continue
}
- ok, err := s.iamManager.CheckPermission(ctx, permission.DatabasesGet, user, databaseMessage.ProjectID)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.DatabasesGet, user, common.GetWorkspaceIDFromContext(ctx), databaseMessage.ProjectID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -196,7 +196,7 @@ func (s *DatabaseService) ListDatabases(ctx context.Context, req *connect.Reques
}
find.OrderByKeys = orderByKeys
- filterQ, err := store.GetListDatabaseFilter(req.Msg.Filter)
+ filterQ, err := store.GetListDatabaseFilter(common.GetWorkspaceIDFromContext(ctx), req.Msg.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
@@ -208,7 +208,7 @@ func (s *DatabaseService) ListDatabases(ctx context.Context, req *connect.Reques
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent %q", req.Msg.Parent))
}
- ok, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, p)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, common.GetWorkspaceIDFromContext(ctx), p)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -217,7 +217,7 @@ func (s *DatabaseService) ListDatabases(ctx context.Context, req *connect.Reques
}
find.ProjectID = &p
case strings.HasPrefix(req.Msg.Parent, common.WorkspacePrefix):
- ok, err := s.iamManager.CheckPermission(ctx, permission.DatabasesList, user)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.DatabasesList, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -225,7 +225,7 @@ func (s *DatabaseService) ListDatabases(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("user does not have permission %q", permission.DatabasesList))
}
case strings.HasPrefix(req.Msg.Parent, common.InstanceNamePrefix):
- ok, err := s.iamManager.CheckPermission(ctx, permission.InstancesGet, user)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.InstancesGet, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -309,6 +309,7 @@ func (s *DatabaseService) UpdateDatabase(ctx context.Context, req *connect.Reque
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))
}
project, err = s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
ShowDeleted: true,
})
@@ -332,7 +333,7 @@ func (s *DatabaseService) UpdateDatabase(ctx context.Context, req *connect.Reque
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))
}
- environment, err := s.store.GetEnvironmentByID(ctx, environmentID)
+ environment, err := s.store.GetEnvironmentByID(ctx, common.GetWorkspaceIDFromContext(ctx), environmentID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))
}
@@ -350,7 +351,10 @@ func (s *DatabaseService) UpdateDatabase(ctx context.Context, req *connect.Reque
if err != nil {
return nil, errors.Wrapf(err, "failed to sync database metadata and schema")
}
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &databaseMessage.InstanceID})
+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ ResourceID: &databaseMessage.InstanceID,
+ })
if err != nil {
return nil, errors.Wrapf(err, "failed to get instance for format version")
}
@@ -546,6 +550,7 @@ func (s *DatabaseService) GetDatabaseMetadata(ctx context.Context, req *connect.
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", name))
}
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -557,6 +562,7 @@ func (s *DatabaseService) GetDatabaseMetadata(ctx context.Context, req *connect.
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", name, err))
}
newDBSchema, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -597,6 +603,7 @@ func (s *DatabaseService) GetDatabaseSchema(ctx context.Context, req *connect.Re
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseName))
}
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -608,6 +615,7 @@ func (s *DatabaseService) GetDatabaseSchema(ctx context.Context, req *connect.Re
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", databaseName, err))
}
newDBSchema, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -642,6 +650,7 @@ func (s *DatabaseService) GetDatabaseSDLSchema(ctx context.Context, req *connect
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseName))
}
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: instanceID,
DatabaseName: databaseName,
})
@@ -653,6 +662,7 @@ func (s *DatabaseService) GetDatabaseSDLSchema(ctx context.Context, req *connect
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", databaseName, err))
}
newDBSchema, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -752,7 +762,10 @@ func (s *DatabaseService) getSourceDBMetadata(ctx context.Context, request *v1pb
}
// Get instance to determine engine and case sensitivity
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})
+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ ResourceID: &instanceID,
+ })
if err != nil {
return nil, err
}
@@ -771,6 +784,7 @@ func (s *DatabaseService) getSourceDBMetadata(ctx context.Context, request *v1pb
// Fallback to current database schema if no sync history
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: instanceID,
DatabaseName: databaseName,
})
@@ -789,6 +803,7 @@ func (s *DatabaseService) getSourceDBMetadata(ctx context.Context, request *v1pb
}
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: instanceID,
DatabaseName: databaseName,
})
@@ -833,7 +848,10 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pb
}
// Get instance to determine engine and case sensitivity
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})
+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ ResourceID: &instanceID,
+ })
if err != nil {
return nil, err
}
@@ -852,6 +870,7 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pb
// Fallback to current database schema if no sync history
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: instanceID,
DatabaseName: databaseName,
})
@@ -884,7 +903,10 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pb
if err != nil {
return nil, err
}
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})
+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ ResourceID: &instanceID,
+ })
if err != nil {
return nil, err
}
@@ -922,7 +944,10 @@ func (s *DatabaseService) getParserEngine(ctx context.Context, request *v1pb.Dif
instanceID = insID
}
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})
+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ ResourceID: &instanceID,
+ })
if err != nil {
return storepb.Engine_ENGINE_UNSPECIFIED, errors.Wrapf(err, "failed to get instance %s", instanceID)
}
@@ -935,6 +960,7 @@ func (s *DatabaseService) getParserEngine(ctx context.Context, request *v1pb.Dif
func (s *DatabaseService) convertToDatabase(ctx context.Context, database *store.DatabaseMessage) (*v1pb.Database, error) {
instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &database.InstanceID,
})
if err != nil {
@@ -1005,6 +1031,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Requ
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Name))
}
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: instanceID,
DatabaseName: databaseName,
})
diff --git a/backend/api/v1/database_service_test.go b/backend/api/v1/database_service_test.go
index 8e853cd463..b6d51be925 100644
--- a/backend/api/v1/database_service_test.go
+++ b/backend/api/v1/database_service_test.go
@@ -50,8 +50,8 @@ func TestListDatabaseFilter(t *testing.T) {
},
{
input: `(labels.region == "asia" || labels.tenant == "bytebase") && exclude_unassigned == true`,
- wantSQL: `(((db.metadata->'labels'->>'region' = $1 OR db.metadata->'labels'->>'tenant' = $2) AND db.project != $3))`,
- wantArgs: []any{"asia", "bytebase", common.DefaultProjectID},
+ wantSQL: `(((db.metadata->'labels'->>'region' = $1 OR db.metadata->'labels'->>'tenant' = $2) AND db.project != $3 AND db.project != 'default'))`,
+ wantArgs: []any{"asia", "bytebase", common.DefaultProjectID("test-workspace")},
},
{
input: `labels.region in ["asia", "europe"] && labels.tenant == "bytebase"`,
@@ -61,7 +61,7 @@ func TestListDatabaseFilter(t *testing.T) {
}
for _, tc := range testCases {
- filterQ, err := store.GetListDatabaseFilter(tc.input)
+ filterQ, err := store.GetListDatabaseFilter("test-workspace", tc.input)
if tc.error != nil {
require.Error(t, err)
require.Equal(t, tc.error.Message(), err.Error())
diff --git a/backend/api/v1/document_masking.go b/backend/api/v1/document_masking.go
index de799b02d9..5774d9a67c 100644
--- a/backend/api/v1/document_masking.go
+++ b/backend/api/v1/document_masking.go
@@ -10,6 +10,7 @@ import (
"connectrpc.com/connect"
"github.com/pkg/errors"
+ "github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/component/masker"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -1337,6 +1338,7 @@ func checkElasticsearchRequestBlocked(analysis *parserbase.ElasticsearchAnalysis
// databases (CosmosDB containers, MongoDB collections, Elasticsearch indices).
func getTableObjectSchema(ctx context.Context, stores *store.Store, instanceID, databaseName, tableName string) (*storepb.ObjectSchema, error) {
dbMetadata, err := stores.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: instanceID,
DatabaseName: databaseName,
})
diff --git a/backend/api/v1/group_service.go b/backend/api/v1/group_service.go
index 4023a1639f..e3e723d586 100644
--- a/backend/api/v1/group_service.go
+++ b/backend/api/v1/group_service.go
@@ -39,7 +39,7 @@ func NewGroupService(store *store.Store, iamManager *iam.Manager, licenseService
// GetGroup gets a group.
func (s *GroupService) GetGroup(ctx context.Context, req *connect.Request[v1pb.GetGroupRequest]) (*connect.Response[v1pb.Group], error) {
- group, err := utils.GetGroupByName(ctx, s.store, req.Msg.Name)
+ group, err := utils.GetGroupByName(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), req.Msg.Name)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -85,8 +85,9 @@ func (s *GroupService) ListGroups(ctx context.Context, request *connect.Request[
limitPlusOne := offset.limit + 1
find := &store.FindGroupMessage{
- Limit: &limitPlusOne,
- Offset: &offset.offset,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ Limit: &limitPlusOne,
+ Offset: &offset.offset,
}
filterQ, err := store.GetListGroupFilter(find, request.Msg.Filter)
if err != nil {
@@ -122,7 +123,7 @@ func (s *GroupService) ListGroups(ctx context.Context, request *connect.Request[
// CreateGroup creates a group.
func (s *GroupService) CreateGroup(ctx context.Context, req *connect.Request[v1pb.CreateGroupRequest]) (*connect.Response[v1pb.Group], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_USER_GROUPS); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_USER_GROUPS); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
groupMessage, err := s.convertToGroupMessage(ctx, req.Msg)
@@ -130,15 +131,11 @@ func (s *GroupService) CreateGroup(ctx context.Context, req *connect.Request[v1p
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- if err := validateEmailWithDomains(ctx, s.licenseService, s.store, groupMessage.Email, true); err != nil {
+ if err := validateEmailWithDomains(ctx, s.licenseService, s.store, common.GetWorkspaceIDFromContext(ctx), groupMessage.Email, true); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "invalid email %q", groupMessage.Email))
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
- groupMessage.Workspace = workspace.ResourceID
+ groupMessage.Workspace = common.GetWorkspaceIDFromContext(ctx)
group, err := s.store.CreateGroup(ctx, groupMessage)
if err != nil {
@@ -158,11 +155,11 @@ func (s *GroupService) CreateGroup(ctx context.Context, req *connect.Request[v1p
// UpdateGroup updates a group.
func (s *GroupService) UpdateGroup(ctx context.Context, req *connect.Request[v1pb.UpdateGroupRequest]) (*connect.Response[v1pb.Group], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_USER_GROUPS); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_USER_GROUPS); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
- group, err := utils.GetGroupByName(ctx, s.store, req.Msg.Group.Name)
+ group, err := utils.GetGroupByName(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), req.Msg.Group.Name)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -194,7 +191,8 @@ func (s *GroupService) UpdateGroup(ctx context.Context, req *connect.Request[v1p
}
patch := &store.UpdateGroupMessage{
- ID: group.ID,
+ ID: group.ID,
+ Workspace: group.Workspace,
}
for _, path := range req.Msg.UpdateMask.Paths {
switch path {
@@ -238,7 +236,7 @@ func (s *GroupService) UpdateGroup(ctx context.Context, req *connect.Request[v1p
// DeleteGroup deletes a group.
func (s *GroupService) DeleteGroup(ctx context.Context, req *connect.Request[v1pb.DeleteGroupRequest]) (*connect.Response[emptypb.Empty], error) {
- group, err := utils.GetGroupByName(ctx, s.store, req.Msg.Name)
+ group, err := utils.GetGroupByName(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), req.Msg.Name)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -255,7 +253,7 @@ func (s *GroupService) DeleteGroup(ctx context.Context, req *connect.Request[v1p
return nil, err
}
- if err := s.store.DeleteGroup(ctx, group.ID); err != nil {
+ if err := s.store.DeleteGroup(ctx, group.Workspace, group.ID); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -272,7 +270,7 @@ func (s *GroupService) checkPermission(ctx context.Context, group *store.GroupMe
return nil
}
- ok, err := s.iamManager.CheckPermission(ctx, permission, user)
+ ok, err := s.iamManager.CheckPermission(ctx, permission, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to check permission"))
}
@@ -374,7 +372,7 @@ func (s *GroupService) checkGroupPermission(ctx context.Context, req connect.Any
}
if getMemberInGroup(user, group) == nil {
- ok, err := s.iamManager.CheckPermission(ctx, permission.GroupsGet, user)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.GroupsGet, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
diff --git a/backend/api/v1/idp_service.go b/backend/api/v1/idp_service.go
index 5aaf4b88e6..616a27041d 100644
--- a/backend/api/v1/idp_service.go
+++ b/backend/api/v1/idp_service.go
@@ -53,7 +53,13 @@ func (s *IdentityProviderService) GetIdentityProvider(ctx context.Context, req *
// ListIdentityProviders lists all identity providers.
func (s *IdentityProviderService) ListIdentityProviders(ctx context.Context, _ *connect.Request[v1pb.ListIdentityProvidersRequest]) (*connect.Response[v1pb.ListIdentityProvidersResponse], error) {
- identityProviders, err := s.store.ListIdentityProviders(ctx, &store.FindIdentityProviderMessage{})
+ // allow_without_credential: workspace may not be in context (login page).
+ // In self-hosted (single workspace), fall back to store lookup.
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ if workspaceID == "" && !s.profile.SaaS {
+ workspaceID, _ = s.store.GetWorkspaceID(ctx)
+ }
+ identityProviders, err := s.store.ListIdentityProviders(ctx, &store.FindIdentityProviderMessage{Workspace: workspaceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -67,11 +73,11 @@ func (s *IdentityProviderService) ListIdentityProviders(ctx context.Context, _ *
// CreateIdentityProvider creates an identity provider.
func (s *IdentityProviderService) CreateIdentityProvider(ctx context.Context, req *connect.Request[v1pb.CreateIdentityProviderRequest]) (*connect.Response[v1pb.IdentityProvider], error) {
- if err := s.checkFeatureAvailable(req.Msg.IdentityProvider); err != nil {
+ if err := s.checkFeatureAvailable(ctx, req.Msg.IdentityProvider); err != nil {
return nil, err
}
- if _, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile); err != nil {
+ if _, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile, common.GetWorkspaceIDFromContext(ctx)); err != nil {
return nil, err
}
@@ -88,12 +94,8 @@ func (s *IdentityProviderService) CreateIdentityProvider(ctx context.Context, re
if err := validIdentityProviderConfig(req.Msg.IdentityProvider.Type, req.Msg.IdentityProvider.Config); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
identityProviderMessage := &store.IdentityProviderMessage{
- Workspace: workspace.ResourceID,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: req.Msg.IdentityProviderId,
Title: req.Msg.IdentityProvider.Title,
Domain: req.Msg.IdentityProvider.Domain,
@@ -105,7 +107,7 @@ func (s *IdentityProviderService) CreateIdentityProvider(ctx context.Context, re
return connect.NewResponse(identityProvider), nil
}
- identityProviderMessage, err = s.store.CreateIdentityProvider(ctx, identityProviderMessage)
+ identityProviderMessage, err := s.store.CreateIdentityProvider(ctx, identityProviderMessage)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create identity provider"))
}
@@ -121,7 +123,7 @@ func (s *IdentityProviderService) UpdateIdentityProvider(ctx context.Context, re
if req.Msg.UpdateMask == nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update_mask must be set"))
}
- if err := s.checkFeatureAvailable(req.Msg.IdentityProvider); err != nil {
+ if err := s.checkFeatureAvailable(ctx, req.Msg.IdentityProvider); err != nil {
return nil, err
}
@@ -131,6 +133,7 @@ func (s *IdentityProviderService) UpdateIdentityProvider(ctx context.Context, re
}
identityProviderMessage, err := s.store.GetIdentityProvider(ctx, &store.FindIdentityProviderMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &identityProviderID,
})
if err != nil {
@@ -148,6 +151,7 @@ func (s *IdentityProviderService) UpdateIdentityProvider(ctx context.Context, re
patch := &store.UpdateIdentityProviderMessage{
ResourceID: identityProviderMessage.ResourceID,
+ Workspace: identityProviderMessage.Workspace,
}
for _, path := range req.Msg.UpdateMask.Paths {
switch path {
@@ -200,7 +204,7 @@ func (s *IdentityProviderService) DeleteIdentityProvider(ctx context.Context, re
return nil, err
}
- if err := s.store.DeleteIdentityProvider(ctx, identityProvider.ResourceID); err != nil {
+ if err := s.store.DeleteIdentityProvider(ctx, identityProvider.Workspace, identityProvider.ResourceID); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
return connect.NewResponse(&emptypb.Empty{}), nil
@@ -211,12 +215,12 @@ var googleGitHubDomains = map[string]bool{
"github.com": true,
}
-func (s *IdentityProviderService) checkFeatureAvailable(idp *v1pb.IdentityProvider) error {
+func (s *IdentityProviderService) checkFeatureAvailable(ctx context.Context, idp *v1pb.IdentityProvider) error {
featurePlan := v1pb.PlanFeature_FEATURE_ENTERPRISE_SSO
if idp.Type == v1pb.IdentityProviderType_OAUTH2 && googleGitHubDomains[idp.Domain] {
featurePlan = v1pb.PlanFeature_FEATURE_GOOGLE_AND_GITHUB_SSO
}
- if err := s.licenseService.IsFeatureEnabled(featurePlan); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), featurePlan); err != nil {
return connect.NewError(connect.CodePermissionDenied, err)
}
return nil
@@ -229,7 +233,7 @@ func (s *IdentityProviderService) TestIdentityProvider(ctx context.Context, req
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("identity provider not found"))
}
- externalURL, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile)
+ externalURL, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, err
}
@@ -388,6 +392,7 @@ func (s *IdentityProviderService) getIdentityProviderMessage(ctx context.Context
}
identityProvider, err := s.store.GetIdentityProvider(ctx, &store.FindIdentityProviderMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &identityProviderID,
})
if err != nil {
diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.go
index e9c06a991b..32f6cb0495 100644
--- a/backend/api/v1/instance_service.go
+++ b/backend/api/v1/instance_service.go
@@ -71,6 +71,7 @@ func (s *InstanceService) ListInstances(ctx context.Context, req *connect.Reques
limitPlusOne := offset.limit + 1
find := &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ShowDeleted: req.Msg.ShowDeleted,
Limit: &limitPlusOne,
Offset: &offset.offset,
@@ -193,9 +194,10 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Reque
return connect.NewResponse(result), nil
}
- activatedInstanceLimit := s.licenseService.GetActivatedInstanceLimit(ctx)
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ activatedInstanceLimit := s.licenseService.GetActivatedInstanceLimit(ctx, workspaceID)
if instanceMessage.Metadata.GetActivation() {
- count, err := s.store.GetActivatedInstanceCount(ctx)
+ count, err := s.store.GetActivatedInstanceCount(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -204,16 +206,11 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Reque
}
}
- if err := s.checkInstanceDataSources(instanceMessage, instanceMessage.Metadata.GetDataSources()); err != nil {
+ if err := s.checkInstanceDataSources(ctx, instanceMessage, instanceMessage.Metadata.GetDataSources()); err != nil {
return nil, err
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
- instanceMessage.Workspace = workspace.ResourceID
-
+ instanceMessage.Workspace = workspaceID
instance, err := s.store.CreateInstance(ctx, instanceMessage)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
@@ -238,10 +235,10 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Reque
return connect.NewResponse(result), nil
}
-func (s *InstanceService) checkInstanceDataSources(instance *store.InstanceMessage, dataSources []*storepb.DataSource) error {
+func (s *InstanceService) checkInstanceDataSources(ctx context.Context, instance *store.InstanceMessage, dataSources []*storepb.DataSource) error {
dsIDMap := map[string]bool{}
for _, ds := range dataSources {
- if err := s.checkDataSource(instance, ds); err != nil {
+ if err := s.checkDataSource(ctx, instance, ds); err != nil {
return err
}
if dsIDMap[ds.GetId()] {
@@ -255,7 +252,7 @@ func (s *InstanceService) checkInstanceDataSources(instance *store.InstanceMessa
const instanceExceededError = "activation instance count has reached the limit (%v)"
-func (s *InstanceService) checkDataSource(instance *store.InstanceMessage, dataSource *storepb.DataSource) error {
+func (s *InstanceService) checkDataSource(ctx context.Context, instance *store.InstanceMessage, dataSource *storepb.DataSource) error {
if dataSource.GetId() == "" {
return connect.NewError(connect.CodeInvalidArgument, errors.New("data source id is required"))
}
@@ -265,7 +262,7 @@ func (s *InstanceService) checkDataSource(instance *store.InstanceMessage, dataS
return err
}
- if err := s.licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_EXTERNAL_SECRET_MANAGER, instance); err != nil {
+ if err := s.licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_EXTERNAL_SECRET_MANAGER, instance); err != nil {
missingFeatureError := connect.NewError(connect.CodePermissionDenied, err)
if dataSource.GetExternalSecret() != nil {
return missingFeatureError
@@ -340,6 +337,7 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Reque
metadata := proto.CloneOf(instance.Metadata)
patch := &store.UpdateInstanceMessage{
ResourceID: &instance.ResourceID,
+ Workspace: instance.Workspace,
Metadata: metadata,
}
updateActivation := false
@@ -358,7 +356,7 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Reque
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- environment, err := s.store.GetEnvironmentByID(ctx, envID)
+ environment, err := s.store.GetEnvironmentByID(ctx, common.GetWorkspaceIDFromContext(ctx), envID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -374,7 +372,7 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Reque
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- if err := s.checkInstanceDataSources(instance, dataSources); err != nil {
+ if err := s.checkInstanceDataSources(ctx, instance, dataSources); err != nil {
return nil, err
}
patch.Metadata.DataSources = dataSources
@@ -403,14 +401,15 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Reque
if updateSyncInterval {
patchedInstance := *instance
patchedInstance.Metadata = patch.Metadata
- if err := s.licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_CUSTOM_INSTANCE_SYNC_TIME, &patchedInstance); err != nil {
+ if err := s.licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_CUSTOM_INSTANCE_SYNC_TIME, &patchedInstance); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
}
- activatedInstanceLimit := s.licenseService.GetActivatedInstanceLimit(ctx)
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ activatedInstanceLimit := s.licenseService.GetActivatedInstanceLimit(ctx, workspaceID)
if updateActivation {
- count, err := s.store.GetActivatedInstanceCount(ctx)
+ count, err := s.store.GetActivatedInstanceCount(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -442,7 +441,7 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Reque
}
// Permanently delete the instance and all related resources
- if err := s.store.DeleteInstance(ctx, instance.ResourceID); err != nil {
+ if err := s.store.DeleteInstance(ctx, instance.Workspace, instance.ResourceID); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to purge instance"))
}
@@ -461,7 +460,10 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Reque
}
if req.Msg.Force {
if len(databases) > 0 {
- defaultProjectID := common.DefaultProjectID
+ defaultProjectID, err := s.store.GetDefaultProjectID(ctx, common.GetWorkspaceIDFromContext(ctx))
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get default project ID"))
+ }
if err := s.store.BatchUpdateDatabases(ctx, databases, &store.BatchUpdateDatabases{ProjectID: &defaultProjectID}); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -469,7 +471,7 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Reque
} else {
var databaseNames []string
for _, database := range databases {
- if database.ProjectID != common.DefaultProjectID {
+ if !common.IsDefaultProject(common.GetWorkspaceIDFromContext(ctx), database.ProjectID) {
databaseNames = append(databaseNames, database.DatabaseName)
}
}
@@ -482,6 +484,7 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Reque
metadata.Activation = false
if _, err := s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{
ResourceID: &instance.ResourceID,
+ Workspace: instance.Workspace,
Deleted: &deletePatch,
Metadata: metadata,
}); err != nil {
@@ -489,8 +492,10 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Reque
}
// Handle sample instance deletion if applicable
- if err := s.sampleInstanceManager.HandleInstanceDeletion(ctx, instance.ResourceID); err != nil {
- slog.Warn("failed to handle sample instance deletion", log.BBError(err), slog.String("instance", instance.ResourceID))
+ if s.sampleInstanceManager != nil {
+ if err := s.sampleInstanceManager.HandleInstanceDeletion(ctx, common.GetWorkspaceIDFromContext(ctx), instance.ResourceID); err != nil {
+ slog.Warn("failed to handle sample instance deletion", log.BBError(err), slog.String("instance", instance.ResourceID))
+ }
}
return connect.NewResponse(&emptypb.Empty{}), nil
@@ -513,6 +518,7 @@ func (s *InstanceService) UndeleteInstance(ctx context.Context, req *connect.Req
ins, err := s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{
ResourceID: &instance.ResourceID,
+ Workspace: instance.Workspace,
Deleted: &undeletePatch,
})
if err != nil {
@@ -520,8 +526,10 @@ func (s *InstanceService) UndeleteInstance(ctx context.Context, req *connect.Req
}
// Handle sample instance undelete (restart) if applicable
- if err := s.sampleInstanceManager.HandleInstanceCreation(ctx, ins.ResourceID); err != nil {
- slog.Warn("failed to handle sample instance undelete", log.BBError(err), slog.String("instance", ins.ResourceID))
+ if s.sampleInstanceManager != nil {
+ if err := s.sampleInstanceManager.HandleInstanceCreation(ctx, ins.ResourceID); err != nil {
+ slog.Warn("failed to handle sample instance undelete", log.BBError(err), slog.String("instance", ins.ResourceID))
+ }
}
result := convertToV1Instance(ins)
@@ -622,7 +630,7 @@ func (s *InstanceService) AddDataSource(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodeNotFound, errors.New("data source already exists with the same name"))
}
}
- if err := s.checkDataSource(instance, dataSource); err != nil {
+ if err := s.checkDataSource(ctx, instance, dataSource); err != nil {
return nil, err
}
@@ -654,7 +662,7 @@ func (s *InstanceService) AddDataSource(ctx context.Context, req *connect.Reques
if dataSource.GetType() != storepb.DataSourceType_READ_ONLY {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("only read-only data source can be added"))
}
- if err := s.licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_INSTANCE_READ_ONLY_CONNECTION, instance); err != nil {
+ if err := s.licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_INSTANCE_READ_ONLY_CONNECTION, instance); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
@@ -662,6 +670,7 @@ func (s *InstanceService) AddDataSource(ctx context.Context, req *connect.Reques
metadata.DataSources = append(metadata.DataSources, dataSource)
instance, err = s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{
ResourceID: &instance.ResourceID,
+ Workspace: instance.Workspace,
Metadata: metadata,
})
if err != nil {
@@ -707,7 +716,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
}
if dataSource.GetType() == storepb.DataSourceType_READ_ONLY {
- if err := s.licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_INSTANCE_READ_ONLY_CONNECTION, instance); err != nil {
+ if err := s.licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_INSTANCE_READ_ONLY_CONNECTION, instance); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
}
@@ -836,7 +845,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
clearDataSourceAuthentication(dataSource)
- if err := s.checkDataSource(instance, dataSource); err != nil {
+ if err := s.checkDataSource(ctx, instance, dataSource); err != nil {
return nil, err
}
@@ -865,6 +874,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
instance, err = s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{
ResourceID: &instance.ResourceID,
+ Workspace: instance.Workspace,
Metadata: metadata,
})
if err != nil {
@@ -910,6 +920,7 @@ func (s *InstanceService) RemoveDataSource(ctx context.Context, req *connect.Req
metadata.DataSources = updatedDataSources
instance, err = s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{
ResourceID: &instance.ResourceID,
+ Workspace: instance.Workspace,
Metadata: metadata,
})
if err != nil {
@@ -927,6 +938,7 @@ func getInstanceMessage(ctx context.Context, stores *store.Store, name string) (
}
find := &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &instanceID,
}
instance, err := stores.GetInstance(ctx, find)
@@ -963,9 +975,10 @@ func buildEnvironmentName(environmentID *string) *string {
}
func (s *InstanceService) instanceCountGuard(ctx context.Context) error {
- instanceLimit := s.licenseService.GetInstanceLimit(ctx)
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ instanceLimit := s.licenseService.GetInstanceLimit(ctx, workspaceID)
- count, err := s.store.CountActiveInstances(ctx)
+ count, err := s.store.CountActiveInstances(ctx, workspaceID)
if err != nil {
return connect.NewError(connect.CodeInternal, err)
}
diff --git a/backend/api/v1/issue_hook.go b/backend/api/v1/issue_hook.go
index 7bc7ab2a30..82b5744395 100644
--- a/backend/api/v1/issue_hook.go
+++ b/backend/api/v1/issue_hook.go
@@ -102,7 +102,7 @@ func completeAccessRequestIssue(ctx context.Context, stores *store.Store, userEm
return nil, errors.Wrapf(err, "failed to activate access grant %v", accessGrantName)
}
case storepb.Issue_ROLE_GRANT:
- if err := utils.UpdateProjectPolicyFromRoleGrantIssue(ctx, stores, issue, issue.Payload.RoleGrant); err != nil {
+ if err := utils.UpdateProjectPolicyFromRoleGrantIssue(ctx, stores, common.GetWorkspaceIDFromContext(ctx), issue, issue.Payload.RoleGrant); err != nil {
return nil, err
}
default:
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index 62768fb4ea..5fe487d077 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -362,14 +362,19 @@ func (s *IssueService) getUserByIdentifier(ctx context.Context, identifier strin
if email == "" {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid empty creator identifier"))
}
- user, err := s.store.GetPrincipalByEmail(ctx, email)
+ account, err := s.store.GetAccountByEmail(ctx, email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf(`failed to find user "%s" with error: %v`, email, err.Error()))
}
- if user == nil {
+ if account == nil {
return nil, errors.Errorf("cannot found user %s", email)
}
- return user, nil
+ return &store.UserMessage{
+ Email: account.Email,
+ Name: account.Name,
+ Type: account.Type,
+ MemberDeleted: account.MemberDeleted,
+ }, nil
}
// CreateIssue creates a issue.
@@ -379,6 +384,7 @@ func (s *IssueService) CreateIssue(ctx context.Context, req *connect.Request[v1p
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -433,7 +439,7 @@ func (s *IssueService) buildIssueMessage(ctx context.Context, project *store.Pro
}
// Check if role grant workflow feature is enabled.
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_REQUEST_ROLE_WORKFLOW); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_REQUEST_ROLE_WORKFLOW); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied,
errors.Errorf("role request requires approval workflow feature (available in Enterprise plan)"))
}
@@ -546,7 +552,7 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1
if err != nil {
return nil, err
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &issue.ProjectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
}
@@ -653,7 +659,7 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1p
if err != nil {
return nil, err
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &issue.ProjectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
}
@@ -724,8 +730,7 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1p
slog.Warn("failed to create issue comment", log.BBError(err))
}
- // Get issue creator for webhook event
- creator, err := s.store.GetPrincipalByEmail(ctx, issue.CreatorEmail)
+ creatorAccount, err := s.store.GetAccountByEmail(ctx, issue.CreatorEmail)
if err != nil {
slog.Warn("failed to get issue creator", log.BBError(err))
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get issue creator"))
@@ -741,8 +746,8 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1p
Email: user.Email,
},
Creator: &webhook.User{
- Name: creator.Name,
- Email: creator.Email,
+ Name: creatorAccount.Name,
+ Email: creatorAccount.Email,
},
Issue: webhook.NewIssue(issue),
Reason: req.Msg.Comment,
@@ -762,7 +767,7 @@ func (s *IssueService) RequestIssue(ctx context.Context, req *connect.Request[v1
if err != nil {
return nil, err
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &issue.ProjectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
}
@@ -851,7 +856,7 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1p
if err != nil {
if connect.CodeOf(err) == connect.CodeNotFound && req.Msg.AllowMissing {
// When allow_missing is true and issue doesn't exist, create a new one
- ok, err := s.iamManager.CheckPermission(ctx, permission.IssuesCreate, user)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.IssuesCreate, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to check permission"))
}
@@ -873,7 +878,7 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1p
}
return nil, err
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &issue.ProjectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
}
@@ -1002,7 +1007,7 @@ func (s *IssueService) BatchUpdateIssuesStatus(ctx context.Context, req *connect
}
// Get project early for webhooks.
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &projectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project: %v", err))
}
@@ -1110,7 +1115,7 @@ func (s *IssueService) CreateIssueComment(ctx context.Context, req *connect.Requ
if err != nil {
return nil, err
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &issue.ProjectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
}
@@ -1161,7 +1166,7 @@ func (s *IssueService) UpdateIssueComment(ctx context.Context, req *connect.Requ
}
if issueComment == nil {
if req.Msg.AllowMissing {
- ok, err := s.iamManager.CheckPermission(ctx, permission.IssueCommentsCreate, user)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.IssueCommentsCreate, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to check permission"))
}
diff --git a/backend/api/v1/issue_service_converter.go b/backend/api/v1/issue_service_converter.go
index 30a9d9fec7..3526afba21 100644
--- a/backend/api/v1/issue_service_converter.go
+++ b/backend/api/v1/issue_service_converter.go
@@ -49,18 +49,18 @@ func (s *IssueService) getUserRoleMap(ctx context.Context, projectResourceID str
return map[string]bool{}
}
- policy, err := s.store.GetProjectIamPolicy(ctx, projectResourceID)
+ policy, err := s.store.GetProjectIamPolicy(ctx, common.GetWorkspaceIDFromContext(ctx), projectResourceID)
if err != nil {
slog.Error("failed to get project iam policy", log.BBError(err), slog.String("project", projectResourceID))
return map[string]bool{}
}
- workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx)
+ workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
slog.Error("failed to get workspace iam policy", log.BBError(err))
return map[string]bool{}
}
- return utils.GetUserFormattedRolesMap(ctx, s.store, user, policy.Policy, workspacePolicy.Policy)
+ return utils.GetUserFormattedRolesMap(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), user, policy.Policy, workspacePolicy.Policy)
}
func (s *IssueService) isIssueNextApprover(ctx context.Context, issue *v1pb.Issue, projectResourceID string, user *store.UserMessage) bool {
diff --git a/backend/api/v1/org_policy_service.go b/backend/api/v1/org_policy_service.go
index 16281f2aad..d8c1427360 100644
--- a/backend/api/v1/org_policy_service.go
+++ b/backend/api/v1/org_policy_service.go
@@ -109,6 +109,7 @@ func (s *OrgPolicyService) ListPolicies(ctx context.Context, req *connect.Reques
}
find := &store.FindPolicyMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceType: &resourceType,
Resource: resource,
ShowAll: req.Msg.ShowDeleted,
@@ -151,7 +152,7 @@ func (s *OrgPolicyService) CreatePolicy(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("policy must be set"))
}
- if err := s.checkPolicyFeatureGuard(req.Msg.Policy.Type); err != nil {
+ if err := s.checkPolicyFeatureGuard(ctx, req.Msg.Policy.Type); err != nil {
return nil, err
}
@@ -169,7 +170,7 @@ func (s *OrgPolicyService) UpdatePolicy(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("policy must be set"))
}
- if err := s.checkPolicyFeatureGuard(req.Msg.Policy.Type); err != nil {
+ if err := s.checkPolicyFeatureGuard(ctx, req.Msg.Policy.Type); err != nil {
return nil, err
}
@@ -210,6 +211,7 @@ func (s *OrgPolicyService) UpdatePolicy(ctx context.Context, req *connect.Reques
ResourceType: policy.ResourceType,
Type: policy.Type,
Resource: policy.Resource,
+ Workspace: policy.Workspace,
}
for _, path := range req.Msg.UpdateMask.Paths {
switch path {
@@ -231,7 +233,7 @@ func (s *OrgPolicyService) UpdatePolicy(ctx context.Context, req *connect.Reques
if err := validatePolicyPayload(policy.Type, req.Msg.Policy); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrap(err, "invalid policy"))
}
- payloadStr, err := s.convertPolicyPayloadToString(req.Msg.Policy)
+ payloadStr, err := s.convertPolicyPayloadToString(ctx, req.Msg.Policy)
if err != nil {
return nil, err
}
@@ -374,6 +376,7 @@ func (s *OrgPolicyService) findPolicyMessage(ctx context.Context, policyName str
}
policy, err := s.store.GetPolicy(ctx, &store.FindPolicyMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceType: &resourceType,
Type: &policyType,
Resource: resource,
@@ -410,17 +413,13 @@ func (s *OrgPolicyService) createPolicyMessage(ctx context.Context, req *connect
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrap(err, "invalid policy"))
}
- payloadStr, err := s.convertPolicyPayloadToString(policy)
+ payloadStr, err := s.convertPolicyPayloadToString(ctx, policy)
if err != nil {
return nil, err
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
create := &store.PolicyMessage{
- Workspace: workspace.ResourceID,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceType: resourceType,
Resource: parent,
Payload: payloadStr,
@@ -471,7 +470,7 @@ func (s *OrgPolicyService) checkPolicyPermission(ctx context.Context, req connec
projectIDs = append(projectIDs, projectID)
}
- ok, err := s.iamManager.CheckPermission(ctx, perm, user, projectIDs...)
+ ok, err := s.iamManager.CheckPermission(ctx, perm, user, common.GetWorkspaceIDFromContext(ctx), projectIDs...)
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -499,9 +498,9 @@ func validatePolicyType(policyType storepb.Policy_Type, policyResourceType store
return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("policy %v is not allowed in resource %v", policyType, policyResourceType))
}
-func (s *OrgPolicyService) checkPolicyFeatureGuard(policyType v1pb.PolicyType) error {
+func (s *OrgPolicyService) checkPolicyFeatureGuard(ctx context.Context, policyType v1pb.PolicyType) error {
if policyType == v1pb.PolicyType_DATA_QUERY {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_QUERY_POLICY); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_QUERY_POLICY); err != nil {
return connect.NewError(connect.CodePermissionDenied, err)
}
}
@@ -549,7 +548,7 @@ func validatePolicyPayload(policyType storepb.Policy_Type, policy *v1pb.Policy)
return nil
}
-func (s *OrgPolicyService) convertPolicyPayloadToString(policy *v1pb.Policy) (string, error) {
+func (s *OrgPolicyService) convertPolicyPayloadToString(ctx context.Context, policy *v1pb.Policy) (string, error) {
switch policy.Type {
case v1pb.PolicyType_ROLLOUT_POLICY:
rolloutPolicy := convertToStorePBRolloutPolicy(policy.GetRolloutPolicy())
@@ -570,11 +569,11 @@ func (s *OrgPolicyService) convertPolicyPayloadToString(policy *v1pb.Policy) (st
case v1pb.PolicyType_DATA_QUERY:
// Check license for both query policy and restrict copying data features
if policy.GetQueryDataPolicy() != nil && policy.GetQueryDataPolicy().DisableCopyData {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_RESTRICT_COPYING_DATA); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_RESTRICT_COPYING_DATA); err != nil {
return "", connect.NewError(connect.CodePermissionDenied, err)
}
}
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_QUERY_POLICY); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_QUERY_POLICY); err != nil {
return "", connect.NewError(connect.CodePermissionDenied, err)
}
payload := convertToQueryDataPolicyPayload(policy.GetQueryDataPolicy())
@@ -584,7 +583,7 @@ func (s *OrgPolicyService) convertPolicyPayloadToString(policy *v1pb.Policy) (st
}
return string(payloadBytes), nil
case v1pb.PolicyType_MASKING_RULE:
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DATA_MASKING); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATA_MASKING); err != nil {
return "", connect.NewError(connect.CodePermissionDenied, err)
}
payload := convertToStorePBMskingRulePolicy(policy.GetMaskingRulePolicy())
@@ -594,7 +593,7 @@ func (s *OrgPolicyService) convertPolicyPayloadToString(policy *v1pb.Policy) (st
}
return string(payloadBytes), nil
case v1pb.PolicyType_MASKING_EXEMPTION:
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DATA_MASKING); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATA_MASKING); err != nil {
return "", connect.NewError(connect.CodePermissionDenied, err)
}
payload, err := convertToStorePBMaskingExemptionPolicyPayload(policy.GetMaskingExemptionPolicy())
diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.go
index 05f2c28828..ab7f493d1b 100644
--- a/backend/api/v1/plan_service.go
+++ b/backend/api/v1/plan_service.go
@@ -129,21 +129,22 @@ func (s *PlanService) ListPlans(ctx context.Context, request *connect.Request[v1
}
func getProjectIDsSearchFilter(ctx context.Context, user *store.UserMessage, permission permission.Permission, iamManager *iam.Manager, stores *store.Store) (*[]string, error) {
- ok, err := iamManager.CheckPermission(ctx, permission, user)
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ ok, err := iamManager.CheckPermission(ctx, permission, user, workspaceID)
if err != nil {
return nil, errors.Wrapf(err, "failed to check permission %q", permission)
}
if ok {
return nil, nil
}
- projects, err := stores.ListProjects(ctx, &store.FindProjectMessage{})
+ projects, err := stores.ListProjects(ctx, &store.FindProjectMessage{Workspace: workspaceID})
if err != nil {
return nil, errors.Wrapf(err, "failed to list projects")
}
var projectIDs []string
for _, project := range projects {
- ok, err := iamManager.CheckPermission(ctx, permission, user, project.ResourceID)
+ ok, err := iamManager.CheckPermission(ctx, permission, user, workspaceID, project.ResourceID)
if err != nil {
return nil, errors.Wrapf(err, "failed to check permission %q", permission)
}
@@ -166,6 +167,7 @@ func (s *PlanService) CreatePlan(ctx context.Context, request *connect.Request[v
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -229,7 +231,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &projectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project %q, err: %v", projectID, err))
}
@@ -242,7 +244,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v
}
if oldPlan == nil {
if req.AllowMissing {
- ok, err := s.iamManager.CheckPermission(ctx, permission.PlansCreate, user, projectID)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.PlansCreate, user, common.GetWorkspaceIDFromContext(ctx), projectID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to check permission"))
}
@@ -270,7 +272,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v
if oldPlan.Creator == user.Email {
return true, nil
}
- return s.iamManager.CheckPermission(ctx, permission.PlansUpdate, user, oldPlan.ProjectID)
+ return s.iamManager.CheckPermission(ctx, permission.PlansUpdate, user, common.GetWorkspaceIDFromContext(ctx), oldPlan.ProjectID)
}()
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check permission"))
@@ -411,6 +413,7 @@ func (s *PlanService) RunPlanChecks(ctx context.Context, request *connect.Reques
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -475,6 +478,7 @@ func (s *PlanService) CancelPlanCheckRun(ctx context.Context, request *connect.R
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -629,6 +633,7 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specs
if len(instanceIDs) == 1 {
instanceID := instanceIDs[0]
instance, err := s.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &instanceID,
})
if err != nil {
diff --git a/backend/api/v1/predicate_columns_check.go b/backend/api/v1/predicate_columns_check.go
index ff8ae0b8e2..03fcd275d8 100644
--- a/backend/api/v1/predicate_columns_check.go
+++ b/backend/api/v1/predicate_columns_check.go
@@ -5,6 +5,7 @@ import (
"github.com/pkg/errors"
+ "github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
"github.com/bytebase/bytebase/backend/store"
@@ -14,17 +15,17 @@ import (
func (s *QueryResultMasker) ExtractSensitivePredicateColumns(ctx context.Context, spans []*base.QuerySpan, instance *store.InstanceMessage, user *store.UserMessage) ([][]base.ColumnResource, error) {
var result [][]base.ColumnResource
- classificationSetting, err := s.store.GetDataClassificationSetting(ctx)
+ classificationSetting, err := s.store.GetDataClassificationSetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, errors.Wrapf(err, "failed to find classification setting")
}
- maskingRulePolicy, err := s.store.GetMaskingRulePolicy(ctx)
+ maskingRulePolicy, err := s.store.GetMaskingRulePolicy(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, errors.Wrapf(err, "failed to find masking rule policy")
}
- semanticTypesSetting, err := s.store.GetSemanticTypesSetting(ctx)
+ semanticTypesSetting, err := s.store.GetSemanticTypesSetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, errors.Wrapf(err, "failed to find semantic types setting")
}
@@ -99,7 +100,7 @@ func (s *QueryResultMasker) getSensitiveColumnsForPredicate(
if policy := data.getMaskingExemptionPolicy(database.ProjectID); policy != nil {
for _, e := range policy.Exemptions {
for _, member := range e.Members {
- if utils.MemberContainsUser(ctx, s.store, member, currentPrincipal) {
+ if utils.MemberContainsUser(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), member, currentPrincipal) {
exemptions = append(exemptions, e)
break
}
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index 406bc51e78..aa9a49aa9e 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -91,11 +91,12 @@ func (s *ProjectService) ListProjects(ctx context.Context, req *connect.Request[
limitPlusOne := offset.limit + 1
find := &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ShowDeleted: req.Msg.ShowDeleted,
Limit: &limitPlusOne,
Offset: &offset.offset,
}
- filterQ, err := store.GetListProjectFilter(req.Msg.Filter)
+ filterQ, err := store.GetListProjectFilter(common.GetWorkspaceIDFromContext(ctx), req.Msg.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
@@ -147,11 +148,12 @@ func (s *ProjectService) SearchProjects(ctx context.Context, req *connect.Reques
limitPlusOne := offset.limit + 1
find := &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ShowDeleted: req.Msg.ShowDeleted,
Limit: &limitPlusOne,
Offset: &offset.offset,
}
- filterQ, err := store.GetListProjectFilter(req.Msg.Filter)
+ filterQ, err := store.GetListProjectFilter(common.GetWorkspaceIDFromContext(ctx), req.Msg.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
@@ -176,14 +178,14 @@ func (s *ProjectService) SearchProjects(ctx context.Context, req *connect.Reques
}
}
- ok, err = s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user)
+ ok, err = s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check permission"))
}
if !ok {
var ps []*store.ProjectMessage
for _, project := range projects {
- ok, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, project.ResourceID)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, common.GetWorkspaceIDFromContext(ctx), project.ResourceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check permission for project %q", project.ResourceID))
}
@@ -208,6 +210,9 @@ func (s *ProjectService) CreateProject(ctx context.Context, req *connect.Request
if !isValidResourceID(req.Msg.ProjectId) {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid project ID %v", req.Msg.ProjectId))
}
+ if req.Msg.ProjectId == "default" || strings.HasPrefix(req.Msg.ProjectId, "default-") {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("project ID %q is reserved", req.Msg.ProjectId))
+ }
if req.Msg.Project != nil && req.Msg.Project.Labels != nil {
if err := validateLabels(req.Msg.Project.Labels); err != nil {
@@ -217,13 +222,10 @@ func (s *ProjectService) CreateProject(ctx context.Context, req *connect.Request
projectMessage := convertToProjectMessage(req.Msg.ProjectId, req.Msg.Project)
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
- projectMessage.Workspace = workspace.ResourceID
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ projectMessage.Workspace = workspaceID
- setting, err := s.store.GetDataClassificationSetting(ctx)
+ setting, err := s.store.GetDataClassificationSetting(ctx, workspaceID)
if err != nil {
slog.Error("failed to find classification setting", log.BBError(err))
}
@@ -273,12 +275,13 @@ func (s *ProjectService) UpdateProject(ctx context.Context, req *connect.Request
if project.Deleted {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q has been deleted", req.Msg.Project.Name))
}
- if project.ResourceID == common.DefaultProjectID {
+ if common.IsDefaultProject(project.Workspace, project.ResourceID) {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("default project cannot be updated"))
}
patch := &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
+ Workspace: project.Workspace,
}
projectSettings := proto.CloneOf(project.Setting)
@@ -287,7 +290,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, req *connect.Request
case "title":
patch.Title = &req.Msg.Project.Title
case "data_classification_config_id":
- setting, err := s.store.GetDataClassificationSetting(ctx)
+ setting, err := s.store.GetDataClassificationSetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get data classification setting"))
}
@@ -364,7 +367,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, req *connect.Request
if err := s.store.UpdateProjects(ctx, patch); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- project, err = s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &patch.ResourceID})
+ project, err = s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &patch.ResourceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -380,7 +383,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request
// Handle purge (hard delete)
if req.Msg.Purge {
- if project.ResourceID == common.DefaultProjectID {
+ if common.IsDefaultProject(project.Workspace, project.ResourceID) {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("default project cannot be purged"))
}
@@ -388,6 +391,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request
if !project.Deleted {
if err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
+ Workspace: project.Workspace,
Delete: &deletePatch,
}); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
@@ -395,7 +399,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request
}
// Permanently delete the project and all related resources (moves databases to default project)
- if err := s.store.DeleteProject(ctx, project.ResourceID); err != nil {
+ if err := s.store.DeleteProject(ctx, project.Workspace, project.ResourceID); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to purge project"))
}
@@ -403,7 +407,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request
}
// Regular soft delete (archive) flow
- if project.ResourceID == common.DefaultProjectID {
+ if common.IsDefaultProject(project.Workspace, project.ResourceID) {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("default project cannot be deleted"))
}
// Idempotent: if already deleted, return success
@@ -414,6 +418,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request
// For archive (soft delete), just mark the project as deleted without touching databases or issues
if err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
+ Workspace: project.Workspace,
Delete: &deletePatch,
}); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
@@ -435,11 +440,12 @@ func (s *ProjectService) UndeleteProject(ctx context.Context, req *connect.Reque
if err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
+ Workspace: project.Workspace,
Delete: &undeletePatch,
}); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- project, err = s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &project.ResourceID})
+ project, err = s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &project.ResourceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -460,7 +466,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne
if err != nil {
return nil, err
}
- if project.ResourceID == common.DefaultProjectID {
+ if common.IsDefaultProject(project.Workspace, project.ResourceID) {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("default project cannot be purged"))
}
projectsToPurge = append(projectsToPurge, project)
@@ -472,6 +478,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne
if !project.Deleted {
projectsToSoftDelete = append(projectsToSoftDelete, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
+ Workspace: project.Workspace,
Delete: &deletePatch,
})
}
@@ -484,7 +491,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne
// Permanently delete all projects (moves databases to default project)
for _, project := range projectsToPurge {
- if err := s.store.DeleteProject(ctx, project.ResourceID); err != nil {
+ if err := s.store.DeleteProject(ctx, project.Workspace, project.ResourceID); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to purge project %q", project.Title))
}
}
@@ -499,7 +506,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne
if err != nil {
return nil, err
}
- if project.ResourceID == common.DefaultProjectID {
+ if common.IsDefaultProject(project.Workspace, project.ResourceID) {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("default project cannot be deleted"))
}
// Idempotent: skip already deleted projects
@@ -515,6 +522,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne
for _, project := range projects {
updatePatches = append(updatePatches, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
+ Workspace: project.Workspace,
Delete: &deletePatch,
})
}
@@ -534,7 +542,9 @@ func (s *ProjectService) GetIamPolicy(ctx context.Context, req *connect.Request[
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
@@ -544,7 +554,7 @@ func (s *ProjectService) GetIamPolicy(ctx context.Context, req *connect.Request[
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot found project %s", projectID))
}
- policy, err := s.store.GetProjectIamPolicy(ctx, project.ResourceID)
+ policy, err := s.store.GetProjectIamPolicy(ctx, workspaceID, project.ResourceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -562,7 +572,9 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
@@ -575,7 +587,7 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q has been deleted", req.Msg.Resource))
}
- oldIamPolicyMsg, err := s.store.GetProjectIamPolicy(ctx, project.ResourceID)
+ oldIamPolicyMsg, err := s.store.GetProjectIamPolicy(ctx, workspaceID, project.ResourceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find project iam policy with error"))
}
@@ -596,12 +608,8 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
- if _, err := s.store.CreatePolicy(ctx, &store.PolicyMessage{
- Workspace: workspace.ResourceID,
+ if _, err = s.store.CreatePolicy(ctx, &store.PolicyMessage{
+ Workspace: workspaceID,
Resource: common.FormatProject(project.ResourceID),
ResourceType: storepb.Policy_PROJECT,
Payload: string(policyPayload),
@@ -613,7 +621,7 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[
return nil, connect.NewError(connect.CodeInternal, err)
}
- iamPolicyMessage, err := s.store.GetProjectIamPolicy(ctx, project.ResourceID)
+ iamPolicyMessage, err := s.store.GetProjectIamPolicy(ctx, workspaceID, project.ResourceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -738,7 +746,9 @@ func (s *ProjectService) AddWebhook(ctx context.Context, req *connect.Request[v1
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
@@ -751,7 +761,7 @@ func (s *ProjectService) AddWebhook(ctx context.Context, req *connect.Request[v1
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q has been deleted", req.Msg.Project))
}
- if _, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile); err != nil {
+ if _, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile, common.GetWorkspaceIDFromContext(ctx)); err != nil {
return nil, err
}
@@ -770,6 +780,7 @@ func (s *ProjectService) AddWebhook(ctx context.Context, req *connect.Request[v1
}
project, err = s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
@@ -785,7 +796,9 @@ func (s *ProjectService) UpdateWebhook(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
@@ -798,7 +811,7 @@ func (s *ProjectService) UpdateWebhook(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q has been deleted", projectID))
}
- if _, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile); err != nil {
+ if _, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile, common.GetWorkspaceIDFromContext(ctx)); err != nil {
return nil, err
}
@@ -862,6 +875,7 @@ func (s *ProjectService) UpdateWebhook(ctx context.Context, req *connect.Request
}
project, err = s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
@@ -877,7 +891,9 @@ func (s *ProjectService) RemoveWebhook(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
@@ -906,6 +922,7 @@ func (s *ProjectService) RemoveWebhook(ctx context.Context, req *connect.Request
}
project, err = s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
@@ -916,7 +933,7 @@ func (s *ProjectService) RemoveWebhook(ctx context.Context, req *connect.Request
// TestWebhook tests a webhook.
func (s *ProjectService) TestWebhook(ctx context.Context, req *connect.Request[v1pb.TestWebhookRequest]) (*connect.Response[v1pb.TestWebhookResponse], error) {
- externalURL, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile)
+ externalURL, err := utils.GetEffectiveExternalURL(ctx, s.store, s.profile, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, err
}
@@ -926,6 +943,7 @@ func (s *ProjectService) TestWebhook(ctx context.Context, req *connect.Request[v
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -1008,6 +1026,7 @@ func (s *ProjectService) getProjectMessage(ctx context.Context, name string) (*s
}
find := &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
ShowDeleted: true,
}
@@ -1050,7 +1069,7 @@ func validateIAMPolicy(
return connect.NewError(connect.CodeInvalidArgument, errors.New("IAM Binding is empty"))
}
- workspaceProfileSetting, err := stores.GetWorkspaceProfileSetting(ctx)
+ workspaceProfileSetting, err := stores.GetWorkspaceProfileSetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return connect.NewError(connect.CodeInternal, errors.New("failed to get workspace profile setting"))
}
@@ -1059,7 +1078,7 @@ func validateIAMPolicy(
maximumRoleExpiration = workspaceProfileSetting.MaximumRoleExpiration
}
- roleMessages, err := stores.ListRoles(ctx, &store.FindRoleMessage{})
+ roleMessages, err := stores.ListRoles(ctx, &store.FindRoleMessage{Workspace: common.GetWorkspaceIDFromContext(ctx)})
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to list roles"))
}
diff --git a/backend/api/v1/query_result_masker.go b/backend/api/v1/query_result_masker.go
index 7335ed3a02..00705a296d 100644
--- a/backend/api/v1/query_result_masker.go
+++ b/backend/api/v1/query_result_masker.go
@@ -28,17 +28,18 @@ func NewQueryResultMasker(store *store.Store) *QueryResultMasker {
// MaskResults masks the result in-place based on the dynamic masking policy, query-span, instance and action.
func (s *QueryResultMasker) MaskResults(ctx context.Context, spans []*parserbase.QuerySpan, results []*v1pb.QueryResult, instance *store.InstanceMessage, user *store.UserMessage) error {
- classificationSetting, err := s.store.GetDataClassificationSetting(ctx)
+ maskerWorkspaceID := common.GetWorkspaceIDFromContext(ctx)
+ classificationSetting, err := s.store.GetDataClassificationSetting(ctx, maskerWorkspaceID)
if err != nil {
return errors.Wrapf(err, "failed to find classification setting")
}
- maskingRulePolicy, err := s.store.GetMaskingRulePolicy(ctx)
+ maskingRulePolicy, err := s.store.GetMaskingRulePolicy(ctx, maskerWorkspaceID)
if err != nil {
return errors.Wrapf(err, "failed to find masking rule policy")
}
- semanticTypesSetting, err := s.store.GetSemanticTypesSetting(ctx)
+ semanticTypesSetting, err := s.store.GetSemanticTypesSetting(ctx, maskerWorkspaceID)
if err != nil {
return errors.Wrapf(err, "failed to find semantic types setting")
}
@@ -152,7 +153,7 @@ func buildSemanticTypeToMaskerMap(ctx context.Context, stores *store.Store) (map
"bb.default": masker.NewDefaultFullMasker(),
"bb.default-partial": masker.NewDefaultRangeMasker(),
}
- semanticTypesSetting, err := stores.GetSemanticTypesSetting(ctx)
+ semanticTypesSetting, err := stores.GetSemanticTypesSetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, errors.Wrap(err, "failed to get semantic types setting")
}
@@ -255,6 +256,7 @@ func newMaskingDataProviderFromDBNames(ctx context.Context, s *store.Store, inst
projectIDs = append(projectIDs, id)
}
projects, err := s.ListProjects(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceIDs: projectIDs,
ShowDeleted: true,
})
@@ -267,7 +269,7 @@ func newMaskingDataProviderFromDBNames(ctx context.Context, s *store.Store, inst
}
for dbName := range p.databases {
- schema, err := s.GetDBSchema(ctx, &store.FindDBSchemaMessage{InstanceID: instance.ResourceID, DatabaseName: dbName})
+ schema, err := s.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), InstanceID: instance.ResourceID, DatabaseName: dbName})
if err != nil {
return nil, errors.Wrapf(err, "failed to get db schema for %q", dbName)
}
@@ -277,7 +279,7 @@ func newMaskingDataProviderFromDBNames(ctx context.Context, s *store.Store, inst
}
for projectID := range projectIDSet {
- policy, err := s.GetMaskingExemptionPolicyByProject(ctx, projectID)
+ policy, err := s.GetMaskingExemptionPolicyByProject(ctx, common.GetWorkspaceIDFromContext(ctx), projectID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get masking exemption policy for project %q", projectID)
}
@@ -451,7 +453,7 @@ func (s *QueryResultMasker) getMaskerForColumnResource(
if policy := data.getMaskingExemptionPolicy(database.ProjectID); policy != nil {
for _, e := range policy.Exemptions {
for _, member := range e.Members {
- if utils.MemberContainsUser(ctx, s.store, member, currentPrincipal) {
+ if utils.MemberContainsUser(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), member, currentPrincipal) {
exemptions = append(exemptions, e)
break
}
diff --git a/backend/api/v1/release_service.go b/backend/api/v1/release_service.go
index 91cd95d6ae..858945ed54 100644
--- a/backend/api/v1/release_service.go
+++ b/backend/api/v1/release_service.go
@@ -60,7 +60,7 @@ func (s *ReleaseService) CreateRelease(ctx context.Context, req *connect.Request
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get project id"))
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &projectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find project"))
}
@@ -190,7 +190,7 @@ func (s *ReleaseService) ListReleases(ctx context.Context, req *connect.Request[
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get project id"))
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &projectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find project"))
}
@@ -456,7 +456,7 @@ func (s *ReleaseService) ListReleaseCategories(ctx context.Context, req *connect
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get project id"))
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &projectID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find project"))
}
diff --git a/backend/api/v1/release_service_ai_lint.go b/backend/api/v1/release_service_ai_lint.go
index 6152abb90d..3193154ca9 100644
--- a/backend/api/v1/release_service_ai_lint.go
+++ b/backend/api/v1/release_service_ai_lint.go
@@ -8,6 +8,7 @@ import (
"github.com/pkg/errors"
+ "github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
)
@@ -36,7 +37,7 @@ func (s *ReleaseService) runAIPoweredLintBatch(ctx context.Context, files []file
slog.Info("Starting batch AI-powered linting", "filesCount", len(files), "rulesLength", len(customRules))
- aiSetting, err := s.store.GetAISetting(ctx)
+ aiSetting, err := s.store.GetAISetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
slog.Error("Failed to get AI setting", "error", err)
return nil, errors.Wrap(err, "failed to get AI setting")
diff --git a/backend/api/v1/release_service_check.go b/backend/api/v1/release_service_check.go
index 2ca96bed01..b6a7f0e112 100644
--- a/backend/api/v1/release_service_check.go
+++ b/backend/api/v1/release_service_check.go
@@ -37,7 +37,9 @@ func (s *ReleaseService) CheckRelease(ctx context.Context, req *connect.Request[
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
ShowDeleted: true,
})
@@ -68,6 +70,7 @@ func (s *ReleaseService) CheckRelease(ctx context.Context, req *connect.Request[
// Handle database group target. Extract all matched databases in the database group.
if projectResourceID, databaseGroupResourceID, err := common.GetProjectIDDatabaseGroupID(target); err == nil {
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectResourceID,
})
if err != nil {
@@ -152,6 +155,7 @@ func (s *ReleaseService) checkReleaseVersioned(ctx context.Context, project *sto
loop:
for _, database := range databases {
instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &database.InstanceID,
})
if err != nil {
@@ -164,6 +168,7 @@ loop:
engine := instance.Metadata.GetEngine()
// Get the database metadata
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -350,6 +355,7 @@ func (s *ReleaseService) checkReleaseDeclarative(ctx context.Context, files []*v
var errorAdviceCount, warningAdviceCount int
for _, database := range databases {
instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &database.InstanceID,
})
if err != nil {
@@ -439,6 +445,7 @@ func (s *ReleaseService) checkReleaseDeclarative(ctx context.Context, files []*v
if err == nil {
// Get current database schema
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -629,6 +636,7 @@ func (s *ReleaseService) runSQLReviewCheckForFile(
statement string,
) (storepb.Advice_Status, []*v1pb.Advice, error) {
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -660,7 +668,7 @@ func (s *ReleaseService) runSQLReviewCheckForFile(
IsObjectCaseSensitive: store.IsObjectCaseSensitive(instance),
}
- reviewConfig, err := s.store.GetReviewConfigForDatabase(ctx, database)
+ reviewConfig, err := s.store.GetReviewConfigForDatabase(ctx, common.GetWorkspaceIDFromContext(ctx), database)
if err != nil {
if e, ok := err.(*common.Error); ok && e.Code == common.NotFound {
// Continue to check the builtin rules.
diff --git a/backend/api/v1/review_config_service.go b/backend/api/v1/review_config_service.go
index 07425b0669..baee9917a8 100644
--- a/backend/api/v1/review_config_service.go
+++ b/backend/api/v1/review_config_service.go
@@ -41,11 +41,7 @@ func (s *ReviewConfigService) CreateReviewConfig(ctx context.Context, req *conne
return nil, err
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
- reviewConfigMessage.Workspace = workspace.ResourceID
+ reviewConfigMessage.Workspace = common.GetWorkspaceIDFromContext(ctx)
created, err := s.store.CreateReviewConfig(ctx, reviewConfigMessage)
if err != nil {
@@ -60,7 +56,7 @@ func (s *ReviewConfigService) CreateReviewConfig(ctx context.Context, req *conne
// ListReviewConfigs lists the review configs.
func (s *ReviewConfigService) ListReviewConfigs(ctx context.Context, _ *connect.Request[v1pb.ListReviewConfigsRequest]) (*connect.Response[v1pb.ListReviewConfigsResponse], error) {
- messages, err := s.store.ListReviewConfigs(ctx, &store.FindReviewConfigMessage{})
+ messages, err := s.store.ListReviewConfigs(ctx, &store.FindReviewConfigMessage{Workspace: common.GetWorkspaceIDFromContext(ctx)})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -83,7 +79,7 @@ func (s *ReviewConfigService) GetReviewConfig(ctx context.Context, req *connect.
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- message, err := s.store.GetReviewConfig(ctx, id)
+ message, err := s.store.GetReviewConfig(ctx, common.GetWorkspaceIDFromContext(ctx), id)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -104,7 +100,7 @@ func (s *ReviewConfigService) UpdateReviewConfig(ctx context.Context, req *conne
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- existed, err := s.store.GetReviewConfig(ctx, id)
+ existed, err := s.store.GetReviewConfig(ctx, common.GetWorkspaceIDFromContext(ctx), id)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get review config %q", id))
}
@@ -118,7 +114,8 @@ func (s *ReviewConfigService) UpdateReviewConfig(ctx context.Context, req *conne
}
patch := &store.PatchReviewConfigMessage{
- ID: id,
+ ID: id,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
}
for _, path := range req.Msg.UpdateMask.Paths {
@@ -161,13 +158,14 @@ func (s *ReviewConfigService) DeleteReviewConfig(ctx context.Context, req *conne
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- if err := s.store.DeleteReviewConfig(ctx, id); err != nil {
+ if err := s.store.DeleteReviewConfig(ctx, common.GetWorkspaceIDFromContext(ctx), id); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to delete review config"))
}
policyType := storepb.Policy_TAG
policies, err := s.store.ListPolicies(ctx, &store.FindPolicyMessage{
- Type: &policyType,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ Type: &policyType,
})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to list tag policy"))
@@ -194,6 +192,7 @@ func (s *ReviewConfigService) DeleteReviewConfig(ctx context.Context, req *conne
if _, err := s.store.UpdatePolicy(ctx, &store.UpdatePolicyMessage{
ResourceType: policy.ResourceType,
Resource: policy.Resource,
+ Workspace: policy.Workspace,
Payload: &patch,
}); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to update tag policy"))
@@ -231,8 +230,9 @@ func convertToReviewConfigMessage(reviewConfig *v1pb.ReviewConfig) (*store.Revie
func (s *ReviewConfigService) convertToV1ReviewConfig(ctx context.Context, reviewConfigMessage *store.ReviewConfigMessage) (*v1pb.ReviewConfig, error) {
policyType := storepb.Policy_TAG
tagPolicies, err := s.store.ListPolicies(ctx, &store.FindPolicyMessage{
- Type: &policyType,
- ShowAll: false,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ Type: &policyType,
+ ShowAll: false,
})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to list tag policy"))
@@ -260,7 +260,7 @@ func (s *ReviewConfigService) convertToV1ReviewConfig(ctx context.Context, revie
if err != nil {
return nil, err
}
- environment, err := s.store.GetEnvironmentByID(ctx, environmentID)
+ environment, err := s.store.GetEnvironmentByID(ctx, common.GetWorkspaceIDFromContext(ctx), environmentID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get environment %s", environmentID))
}
@@ -274,6 +274,7 @@ func (s *ReviewConfigService) convertToV1ReviewConfig(ctx context.Context, revie
return nil, err
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
ShowDeleted: false,
})
diff --git a/backend/api/v1/role_service.go b/backend/api/v1/role_service.go
index fc6c8400f0..1f8c6242b8 100644
--- a/backend/api/v1/role_service.go
+++ b/backend/api/v1/role_service.go
@@ -38,7 +38,7 @@ func NewRoleService(store *store.Store, iamManager *iam.Manager, licenseService
// ListRoles lists roles.
func (s *RoleService) ListRoles(ctx context.Context, _ *connect.Request[v1pb.ListRolesRequest]) (*connect.Response[v1pb.ListRolesResponse], error) {
- roleMessages, err := s.store.ListRoles(ctx, &store.FindRoleMessage{})
+ roleMessages, err := s.store.ListRoles(ctx, &store.FindRoleMessage{Workspace: common.GetWorkspaceIDFromContext(ctx)})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to list roles"))
}
@@ -54,7 +54,7 @@ func (s *RoleService) GetRole(ctx context.Context, req *connect.Request[v1pb.Get
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- role, err := s.store.GetRole(ctx, &store.FindRoleMessage{ResourceID: &roleID})
+ role, err := s.store.GetRole(ctx, &store.FindRoleMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &roleID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get role"))
}
@@ -73,7 +73,8 @@ func (*RoleService) getBuildinRole(roleID string) *store.RoleMessage {
// CreateRole creates a new role.
func (s *RoleService) CreateRole(ctx context.Context, req *connect.Request[v1pb.CreateRoleRequest]) (*connect.Response[v1pb.Role], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_CUSTOM_ROLES); err != nil {
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_CUSTOM_ROLES); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
@@ -89,12 +90,8 @@ func (s *RoleService) CreateRole(ctx context.Context, req *connect.Request[v1pb.
for _, v := range req.Msg.GetRole().GetPermissions() {
permissions[permission.Permission(v)] = true
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
create := &store.RoleMessage{
- Workspace: workspace.ResourceID,
+ Workspace: workspaceID,
ResourceID: req.Msg.RoleId,
Name: req.Msg.Role.Title,
Description: req.Msg.Role.Description,
@@ -121,7 +118,8 @@ func (s *RoleService) CreateRole(ctx context.Context, req *connect.Request[v1pb.
// UpdateRole updates an existing role.
func (s *RoleService) UpdateRole(ctx context.Context, req *connect.Request[v1pb.UpdateRoleRequest]) (*connect.Response[v1pb.Role], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_CUSTOM_ROLES); err != nil {
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_CUSTOM_ROLES); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
if req.Msg.UpdateMask == nil {
@@ -134,7 +132,7 @@ func (s *RoleService) UpdateRole(ctx context.Context, req *connect.Request[v1pb.
if predefinedRole := s.getBuildinRole(roleID); predefinedRole != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot change the build-in role %s", req.Msg.Role.Name))
}
- role, err := s.store.GetRole(ctx, &store.FindRoleMessage{ResourceID: &roleID})
+ role, err := s.store.GetRole(ctx, &store.FindRoleMessage{Workspace: workspaceID, ResourceID: &roleID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get role"))
}
@@ -149,6 +147,7 @@ func (s *RoleService) UpdateRole(ctx context.Context, req *connect.Request[v1pb.
}
patch := &store.UpdateRoleMessage{
ResourceID: roleID,
+ Workspace: workspaceID,
}
for _, path := range req.Msg.UpdateMask.Paths {
switch path {
@@ -195,7 +194,8 @@ func (s *RoleService) DeleteRole(ctx context.Context, req *connect.Request[v1pb.
if predefinedRole := s.getBuildinRole(roleID); predefinedRole != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot delete the build-in role %s", req.Msg.Name))
}
- role, err := s.store.GetRole(ctx, &store.FindRoleMessage{ResourceID: &roleID})
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ role, err := s.store.GetRole(ctx, &store.FindRoleMessage{Workspace: workspaceID, ResourceID: &roleID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get role"))
}
@@ -203,7 +203,7 @@ func (s *RoleService) DeleteRole(ctx context.Context, req *connect.Request[v1pb.
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("role not found: %s", roleID))
}
- usedByResources, err := s.store.GetResourcesUsedByRole(ctx, req.Msg.Name)
+ usedByResources, err := s.store.GetResourcesUsedByRole(ctx, workspaceID, req.Msg.Name)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to check if the role is used"))
}
@@ -223,7 +223,7 @@ func (s *RoleService) DeleteRole(ctx context.Context, req *connect.Request[v1pb.
return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("cannot delete because role %s is used by resources: %s", common.FormatRole(roleID), strings.Join(usedBy, ",")))
}
- if err := s.store.DeleteRole(ctx, roleID); err != nil {
+ if err := s.store.DeleteRole(ctx, workspaceID, roleID); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to delete role"))
}
if err := s.iamManager.ReloadCache(ctx); err != nil {
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index 07a4ff2e6b..014630ffa5 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -60,6 +60,7 @@ func (s *RolloutService) GetRollout(ctx context.Context, req *connect.Request[v1
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -91,7 +92,7 @@ func (s *RolloutService) GetRollout(ctx context.Context, req *connect.Request[v1
}
// Get environment order.
- environments, err := s.store.GetEnvironment(ctx)
+ environments, err := s.store.GetEnvironment(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get environments"))
}
@@ -115,6 +116,7 @@ func (s *RolloutService) ListRollouts(ctx context.Context, req *connect.Request[
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -179,7 +181,7 @@ func (s *RolloutService) ListRollouts(ctx context.Context, req *connect.Request[
}
// Get environment order once for all rollouts.
- environments, err := s.store.GetEnvironment(ctx)
+ environments, err := s.store.GetEnvironment(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get environments"))
}
@@ -228,6 +230,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -260,7 +263,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
}
// Check permission: allow if user has bb.rollouts.create permission
- hasPermission, err := s.iamManager.CheckPermission(ctx, permission.RolloutsCreate, user, project.ResourceID)
+ hasPermission, err := s.iamManager.CheckPermission(ctx, permission.RolloutsCreate, user, common.GetWorkspaceIDFromContext(ctx), project.ResourceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check permission"))
}
@@ -293,7 +296,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
}
// Get environment order.
- environments, err := s.store.GetEnvironment(ctx)
+ environments, err := s.store.GetEnvironment(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get environments"))
}
@@ -322,6 +325,7 @@ func (s *RolloutService) ListTaskRuns(ctx context.Context, req *connect.Request[
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -431,7 +435,7 @@ func CreateRolloutAndPendingTasks(
policy, ok := envPolicies[task.Environment]
if !ok {
var err error
- policy, err = s.GetRolloutPolicy(ctx, task.Environment)
+ policy, err = s.GetRolloutPolicy(ctx, common.GetWorkspaceIDFromContext(ctx), task.Environment)
if err != nil {
// Don't error out entirely just because policy fetch failed for one env, but logging/continuing is better.
// However, here we don't have logger injected easily.
@@ -571,7 +575,7 @@ func (s *RolloutService) GetTaskRunSession(ctx context.Context, req *connect.Req
}
task := tasks[0]
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})
+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &task.InstanceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get instance"))
}
@@ -705,6 +709,7 @@ func (s *RolloutService) BatchRunTasks(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -845,6 +850,7 @@ func (s *RolloutService) BatchSkipTasks(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -935,6 +941,7 @@ func (s *RolloutService) BatchCancelTaskRuns(ctx context.Context, req *connect.R
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectID,
})
if err != nil {
@@ -1107,7 +1114,7 @@ func (s *RolloutService) PreviewTaskRunRollback(ctx context.Context, req *connec
}
task := tasks[0]
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})
+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &task.InstanceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get instance"))
}
@@ -1195,8 +1202,8 @@ func filterTasksByStage(tasks []*store.TaskMessage, targetEnvironment *string) (
return filteredTasks, nil
}
-func GetValidRolloutPolicyForEnvironment(ctx context.Context, stores *store.Store, environment string) (*storepb.RolloutPolicy, error) {
- policy, err := stores.GetRolloutPolicy(ctx, environment)
+func GetValidRolloutPolicyForEnvironment(ctx context.Context, stores *store.Store, workspaceID string, environment string) (*storepb.RolloutPolicy, error) {
+ policy, err := stores.GetRolloutPolicy(ctx, workspaceID, environment)
if err != nil {
return nil, errors.Wrapf(err, "failed to get rollout policy for environment %s", environment)
}
@@ -1211,7 +1218,7 @@ func (s *RolloutService) canUserRunEnvironmentTasks(ctx context.Context, user *s
}
// Users with bb.taskRuns.create can always create task runs.
- ok, err := s.iamManager.CheckPermission(ctx, permission.TaskRunsCreate, user, project.ResourceID)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.TaskRunsCreate, user, common.GetWorkspaceIDFromContext(ctx), project.ResourceID)
if err != nil {
return false, errors.Wrapf(err, "failed to check workspace role")
}
@@ -1219,21 +1226,21 @@ func (s *RolloutService) canUserRunEnvironmentTasks(ctx context.Context, user *s
return true, nil
}
- p, err := GetValidRolloutPolicyForEnvironment(ctx, s.store, environment)
+ p, err := GetValidRolloutPolicyForEnvironment(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), environment)
if err != nil {
return false, err
}
- policy, err := s.store.GetProjectIamPolicy(ctx, project.ResourceID)
+ policy, err := s.store.GetProjectIamPolicy(ctx, common.GetWorkspaceIDFromContext(ctx), project.ResourceID)
if err != nil {
return false, common.Wrapf(err, common.Internal, "failed to get project %s IAM policy", project.ResourceID)
}
- workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx)
+ workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return false, common.Wrapf(err, common.Internal, "failed to get workspace IAM policy")
}
- roles := utils.GetUserFormattedRolesMap(ctx, s.store, user, policy.Policy)
- workspaceRoles := utils.GetUserFormattedRolesMap(ctx, s.store, user, workspacePolicy.Policy)
+ roles := utils.GetUserFormattedRolesMap(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), user, policy.Policy)
+ workspaceRoles := utils.GetUserFormattedRolesMap(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), user, workspacePolicy.Policy)
for k := range workspaceRoles {
roles[k] = true
}
diff --git a/backend/api/v1/rollout_service_converter.go b/backend/api/v1/rollout_service_converter.go
index fa609280e1..1a64de4e11 100644
--- a/backend/api/v1/rollout_service_converter.go
+++ b/backend/api/v1/rollout_service_converter.go
@@ -59,7 +59,7 @@ func convertToTaskRun(ctx context.Context, s *store.Store, taskRun *store.TaskRu
if taskRun.ResultProto.ExportArchiveId != "" {
t.ExportArchiveStatus = v1pb.TaskRun_EXPORTED
exportArchiveID := taskRun.ResultProto.ExportArchiveId
- exportArchive, err := s.GetExportArchive(ctx, exportArchiveID)
+ exportArchive, err := s.GetExportArchive(ctx, common.GetWorkspaceIDFromContext(ctx), exportArchiveID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get export archive")
}
diff --git a/backend/api/v1/service_account_service.go b/backend/api/v1/service_account_service.go
index 1edfc935f6..34d0dea342 100644
--- a/backend/api/v1/service_account_service.go
+++ b/backend/api/v1/service_account_service.go
@@ -70,7 +70,7 @@ func (s *ServiceAccountService) CreateServiceAccount(ctx context.Context, reques
email := common.BuildServiceAccountEmail(serviceAccountID, projectIDStr)
// Check for duplicate email
- existingSA, err := s.store.GetServiceAccountByEmail(ctx, email)
+ existingSA, err := s.store.GetServiceAccount(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check for existing service account"))
}
@@ -91,12 +91,8 @@ func (s *ServiceAccountService) CreateServiceAccount(ctx context.Context, reques
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to hash service key"))
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
createdSA, err := s.store.CreateServiceAccount(ctx, &store.CreateServiceAccountMessage{
- Workspace: workspace.ResourceID,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
Email: email,
Name: sa.Title,
ServiceKeyHash: string(passwordHash),
@@ -120,7 +116,7 @@ func (s *ServiceAccountService) GetServiceAccount(ctx context.Context, request *
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- sa, err := s.store.GetServiceAccountByEmail(ctx, email)
+ sa, err := s.store.GetServiceAccount(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get service account"))
}
@@ -170,6 +166,7 @@ func (s *ServiceAccountService) ListServiceAccounts(ctx context.Context, request
// List service accounts using the store method with project filtering
sas, err := s.store.ListServiceAccounts(ctx, &store.FindServiceAccountMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
Project: projectID,
Limit: &limitPlusOne,
Offset: &offset.offset,
@@ -212,7 +209,7 @@ func (s *ServiceAccountService) UpdateServiceAccount(ctx context.Context, reques
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- sa, err := s.store.GetServiceAccountByEmail(ctx, email)
+ sa, err := s.store.GetServiceAccount(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get service account"))
}
@@ -269,7 +266,7 @@ func (s *ServiceAccountService) DeleteServiceAccount(ctx context.Context, reques
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- sa, err := s.store.GetServiceAccountByEmail(ctx, email)
+ sa, err := s.store.GetServiceAccount(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get service account"))
}
@@ -295,7 +292,7 @@ func (s *ServiceAccountService) UndeleteServiceAccount(ctx context.Context, requ
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- sa, err := s.store.GetServiceAccountByEmail(ctx, email)
+ sa, err := s.store.GetServiceAccount(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get service account"))
}
diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.go
index 47d55d99cc..26918af81c 100644
--- a/backend/api/v1/setting_service.go
+++ b/backend/api/v1/setting_service.go
@@ -58,7 +58,7 @@ func NewSettingService(
// ListSettings lists all settings.
func (s *SettingService) ListSettings(ctx context.Context, _ *connect.Request[v1pb.ListSettingsRequest]) (*connect.Response[v1pb.ListSettingsResponse], error) {
- settings, err := s.store.ListSettings(ctx, &store.FindSettingMessage{})
+ settings, err := s.store.ListSettings(ctx, &store.FindSettingMessage{Workspace: common.GetWorkspaceIDFromContext(ctx)})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list settings: %v", err))
}
@@ -68,7 +68,7 @@ func (s *SettingService) ListSettings(ctx context.Context, _ *connect.Request[v1
if isSettingDisallowed(setting.Name) {
continue
}
- settingMessage, err := convertToSettingMessage(setting, s.profile)
+ settingMessage, err := convertToSettingMessage(setting)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to convert setting message: %v", err))
}
@@ -108,7 +108,7 @@ func (s *SettingService) GetSetting(ctx context.Context, request *connect.Reques
return nil, err
}
- setting, err := s.store.GetSetting(ctx, storeSettingName)
+ setting, err := s.store.GetSetting(ctx, common.GetWorkspaceIDFromContext(ctx), storeSettingName)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get setting: %v", err))
}
@@ -116,7 +116,7 @@ func (s *SettingService) GetSetting(ctx context.Context, request *connect.Reques
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("setting %s not found", settingName))
}
// Only return whitelisted setting.
- settingMessage, err := convertToSettingMessage(setting, s.profile)
+ settingMessage, err := convertToSettingMessage(setting)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to convert setting message: %v", err))
}
@@ -161,7 +161,8 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
return nil, err
}
- existedSetting, err := s.store.GetSetting(ctx, storeSettingName)
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ existedSetting, err := s.store.GetSetting(ctx, workspaceID, storeSettingName)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to find setting %s with error: %v", settingName, err))
}
@@ -170,7 +171,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}
// audit log.
if setServiceData, ok := common.GetSetServiceDataFromContext(ctx); ok && existedSetting != nil {
- v1pbSetting, err := convertToSettingMessage(existedSetting, s.profile)
+ v1pbSetting, err := convertToSettingMessage(existedSetting)
if err != nil {
slog.Warn("audit: failed to convert to v1.Setting", log.BBError(err))
}
@@ -191,7 +192,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update mask is required"))
}
payload := convertWorkspaceProfileSetting(request.Msg.Setting.Value.GetWorkspaceProfile())
- oldSetting, err := s.store.GetWorkspaceProfileSetting(ctx)
+ oldSetting, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to find setting %s with error: %v", storeSettingName, err))
}
@@ -210,7 +211,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("feature %s is unavailable in current mode", settingName))
}
if payload.DisallowSignup {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DISALLOW_SELF_SERVICE_SIGNUP); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DISALLOW_SELF_SERVICE_SIGNUP); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
}
@@ -232,12 +233,12 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}
oldSetting.ExternalUrl = payload.ExternalUrl
case "value.workspace_profile.require_2fa":
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TWO_FA); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_TWO_FA); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
oldSetting.Require_2Fa = payload.Require_2Fa
case "value.workspace_profile.access_token_duration":
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
if payload.AccessTokenDuration != nil && payload.AccessTokenDuration.Seconds > 0 && payload.AccessTokenDuration.AsDuration() < time.Minute {
@@ -245,7 +246,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}
oldSetting.AccessTokenDuration = payload.AccessTokenDuration
case "value.workspace_profile.refresh_token_duration":
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
if payload.RefreshTokenDuration != nil && payload.RefreshTokenDuration.Seconds > 0 && payload.RefreshTokenDuration.AsDuration() < time.Hour {
@@ -253,12 +254,12 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}
oldSetting.RefreshTokenDuration = payload.RefreshTokenDuration
case "value.workspace_profile.inactive_session_timeout":
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_TOKEN_DURATION_CONTROL); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
oldSetting.InactiveSessionTimeout = payload.InactiveSessionTimeout
case "value.workspace_profile.announcement":
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DASHBOARD_ANNOUNCEMENT); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DASHBOARD_ANNOUNCEMENT); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
oldSetting.Announcement = payload.Announcement
@@ -277,7 +278,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
oldSetting.Domains = payload.Domains
case "value.workspace_profile.enforce_identity_domain":
if payload.EnforceIdentityDomain {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_USER_EMAIL_DOMAIN_RESTRICTION); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_USER_EMAIL_DOMAIN_RESTRICTION); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
}
@@ -287,11 +288,11 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
case "value.workspace_profile.disallow_password_signin":
if payload.DisallowPasswordSignin {
// We should still allow users to turn it off.
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DISALLOW_PASSWORD_SIGNIN); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DISALLOW_PASSWORD_SIGNIN); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
- identityProviders, err := s.store.ListIdentityProviders(ctx, &store.FindIdentityProviderMessage{})
+ identityProviders, err := s.store.ListIdentityProviders(ctx, &store.FindIdentityProviderMessage{Workspace: common.GetWorkspaceIDFromContext(ctx)})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list identity providers: %v", err))
}
@@ -305,7 +306,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
case "value.workspace_profile.enable_audit_log_stdout":
if payload.EnableAuditLogStdout {
// Require TEAM or ENTERPRISE license
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
}
@@ -313,13 +314,13 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
oldSetting.EnableAuditLogStdout = payload.EnableAuditLogStdout
case "value.workspace_profile.watermark":
if payload.Watermark {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_WATERMARK); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_WATERMARK); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
}
oldSetting.Watermark = payload.Watermark
case "value.workspace_profile.directory_sync_token":
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DIRECTORY_SYNC); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DIRECTORY_SYNC); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
// Generate a new token if the payload is empty.
@@ -329,12 +330,12 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}
oldSetting.DirectorySyncToken = payload.DirectorySyncToken
case "value.workspace_profile.branding_logo":
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_CUSTOM_LOGO); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_CUSTOM_LOGO); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
oldSetting.BrandingLogo = payload.BrandingLogo
case "value.workspace_profile.password_restriction":
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_PASSWORD_RESTRICTIONS); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_PASSWORD_RESTRICTIONS); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
if payload.PasswordRestriction != nil && payload.PasswordRestriction.MinLength < 8 {
@@ -355,7 +356,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}
storeSettingValue = oldSetting
case storepb.SettingName_WORKSPACE_APPROVAL:
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_APPROVAL_WORKFLOW); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_APPROVAL_WORKFLOW); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
@@ -473,7 +474,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
storeSettingValue = payload
case storepb.SettingName_DATA_CLASSIFICATION:
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DATA_CLASSIFICATION); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_DATA_CLASSIFICATION); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
payload := convertDataClassificationSetting(request.Msg.Setting.Value.GetDataClassification())
@@ -512,7 +513,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("API endpoint and model are required"))
}
if existedSetting != nil {
- existedAISetting, err := convertToSettingMessage(existedSetting, s.profile)
+ existedAISetting, err := convertToSettingMessage(existedSetting)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to unmarshal existed ai setting with error: %v", err))
}
@@ -527,12 +528,12 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
storeSettingValue = aiSetting
case storepb.SettingName_ENVIRONMENT:
- if serr := s.validateEnvironments(request.Msg.Setting.Value.GetEnvironment().GetEnvironments()); serr != nil {
+ if serr := s.validateEnvironments(ctx, workspaceID, request.Msg.Setting.Value.GetEnvironment().GetEnvironments()); serr != nil {
return nil, serr
}
environmentSetting := convertEnvironmentSetting(request.Msg.Setting.Value.GetEnvironment())
- oldEnvironmentSetting, err := s.store.GetEnvironment(ctx)
+ oldEnvironmentSetting, err := s.store.GetEnvironment(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get old environment setting with error: %v", err))
}
@@ -547,6 +548,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
if _, err := s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{
EnvironmentID: &emptyStr,
FindByEnvironmentID: &env.Id,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
}); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to unset environment %v for instances", env.Id))
}
@@ -571,13 +573,9 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}), nil
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
setting, err := s.store.UpsertSetting(ctx, &store.SettingMessage{
Name: storeSettingName,
- Workspace: workspace.ResourceID,
+ Workspace: workspaceID,
Value: storeSettingValue,
})
if err != nil {
@@ -586,7 +584,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
// Dynamically update audit logger runtime flag if enable_audit_log_stdout was changed
if resetAuditLogStdout {
- workspaceProfile, err := s.store.GetWorkspaceProfileSetting(ctx)
+ workspaceProfile, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get workspace setting message: %v", err))
}
@@ -595,7 +593,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
// It's a temporary solution to map the classification to all projects before we support it in the UX.
if resetClassification {
- classification, err := s.store.GetDataClassificationSetting(ctx)
+ classification, err := s.store.GetDataClassificationSetting(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get classification setting message: %v", err))
}
@@ -604,7 +602,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
classificationID = classification.Configs[0].Id
}
- projects, err := s.store.ListProjects(ctx, &store.FindProjectMessage{ShowDeleted: false})
+ projects, err := s.store.ListProjects(ctx, &store.FindProjectMessage{Workspace: workspaceID, ShowDeleted: false})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list projects with error: %v", err))
}
@@ -615,6 +613,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
setting.DataClassificationConfigId = classificationID
batchUpdate = append(batchUpdate, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
+ Workspace: project.Workspace,
Setting: setting,
})
}
@@ -623,7 +622,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}
}
- settingMessage, err := convertToSettingMessage(setting, s.profile)
+ settingMessage, err := convertToSettingMessage(setting)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to convert setting message: %v", err))
}
@@ -637,7 +636,7 @@ func (s *SettingService) checkSettingPermission(ctx context.Context, req connect
return connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- ok, err := s.iamManager.CheckPermission(ctx, perm, user)
+ ok, err := s.iamManager.CheckPermission(ctx, perm, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -708,7 +707,7 @@ func validateDomains(domains []string) error {
return nil
}
-func (s *SettingService) validateEnvironments(envs []*v1pb.EnvironmentSetting_Environment) error {
+func (s *SettingService) validateEnvironments(ctx context.Context, workspaceID string, envs []*v1pb.EnvironmentSetting_Environment) error {
used := map[string]bool{}
for _, env := range envs {
if env.Title == "" {
@@ -721,7 +720,7 @@ func (s *SettingService) validateEnvironments(envs []*v1pb.EnvironmentSetting_En
return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("duplicate environment ID %v", env.Id))
}
if v, ok := env.Tags["protected"]; ok && v == "protected" {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_ENVIRONMENT_TIERS); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_ENVIRONMENT_TIERS); err != nil {
return connect.NewError(connect.CodePermissionDenied, err)
}
}
diff --git a/backend/api/v1/setting_service_converter.go b/backend/api/v1/setting_service_converter.go
index 8686cc83eb..a33ed20b17 100644
--- a/backend/api/v1/setting_service_converter.go
+++ b/backend/api/v1/setting_service_converter.go
@@ -7,13 +7,12 @@ import (
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/common"
- "github.com/bytebase/bytebase/backend/component/config"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/store"
)
-func convertToSettingMessage(setting *store.SettingMessage, profile *config.Profile) (*v1pb.Setting, error) {
+func convertToSettingMessage(setting *store.SettingMessage) (*v1pb.Setting, error) {
settingName := fmt.Sprintf("%s%s", common.SettingNamePrefix, convertStoreSettingNameToV1(setting.Name).String())
switch setting.Name {
case storepb.SettingName_APP_IM:
@@ -36,7 +35,6 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Prof
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("invalid setting value type for %s", setting.Name))
}
v1Value := convertToWorkspaceProfileSetting(storeValue)
- v1Value.DisallowSignup = v1Value.DisallowSignup || profile.SaaS
return &v1pb.Setting{
Name: settingName,
Value: &v1pb.SettingValue{
diff --git a/backend/api/v1/sheet_service.go b/backend/api/v1/sheet_service.go
index 9d40fc3878..dca946d09b 100644
--- a/backend/api/v1/sheet_service.go
+++ b/backend/api/v1/sheet_service.go
@@ -37,6 +37,7 @@ func (s *SheetService) CreateSheet(ctx context.Context, request *connect.Request
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
@@ -69,6 +70,7 @@ func (s *SheetService) BatchCreateSheets(ctx context.Context, request *connect.R
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
@@ -115,6 +117,7 @@ func (s *SheetService) GetSheet(ctx context.Context, request *connect.Request[v1
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index e3ef0f0cc2..d159fabcf5 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -67,7 +67,7 @@ func NewSQLService(
// AdminExecute executes the SQL statement.
func (s *SQLService) AdminExecute(ctx context.Context, stream *connect.BidiStream[v1pb.AdminExecuteRequest, v1pb.AdminExecuteResponse]) error {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_SQL_EDITOR_ADMIN_MODE); err != nil {
+ if err := s.licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_SQL_EDITOR_ADMIN_MODE); err != nil {
return connect.NewError(connect.CodePermissionDenied, err)
}
var driver db.Driver
@@ -167,6 +167,7 @@ func (s *SQLService) AdminExecute(ctx context.Context, stream *connect.BidiStrea
// and expiry, then prefers the grant with unmask=true if available.
func (s *SQLService) preCheckAccess(ctx context.Context, request *v1pb.QueryRequest, database *store.DatabaseMessage) *store.AccessGrantMessage {
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &database.ProjectID,
})
if err != nil {
@@ -384,8 +385,8 @@ func getEffectiveQueryDataPolicy(
MaximumResultSize: common.DefaultMaximumSQLResultSize,
MaximumResultRows: math.MaxInt32,
}
- if err := licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_QUERY_POLICY); err == nil {
- policy, err := stores.GetEffectiveQueryDataPolicy(ctx, common.FormatProject(projectID))
+ if err := licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_QUERY_POLICY); err == nil {
+ policy, err := stores.GetEffectiveQueryDataPolicy(ctx, common.GetWorkspaceIDFromContext(ctx), common.FormatProject(projectID))
if err != nil {
slog.Error("failed to get the query data policy", log.BBError(err))
return value
@@ -449,6 +450,7 @@ func replaceBackupTableWithSource(ctx context.Context, stores *store.Store, inst
}
}
dbMetadata, err := stores.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -573,7 +575,7 @@ func queryRetry(
}
slog.Debug("optional access check", slog.String("instance", instance.ResourceID), slog.String("database", database.DatabaseName))
}
- if !queryContext.SkipMasking && licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
+ if !queryContext.SkipMasking && licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
sensitivePredicateColumns, err = masker.ExtractSensitivePredicateColumns(ctx, spans, instance, user)
if err != nil {
@@ -584,7 +586,7 @@ func queryRetry(
}
maskingEnabled := !queryContext.Explain && !queryContext.SkipMasking &&
- licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil
+ licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil
if maskingEnabled {
if err := preExecuteMaskingCheck(ctx, stores, instance.Metadata.GetEngine(), database, spans); err != nil {
@@ -658,7 +660,7 @@ func queryRetry(
if err := replaceBackupTableWithSource(ctx, stores, instance, database, spans); err != nil {
slog.Debug("failed to replace backup table with source", log.BBError(err))
}
- if !queryContext.SkipMasking && licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
+ if !queryContext.SkipMasking && licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
sensitivePredicateColumns, err = masker.ExtractSensitivePredicateColumns(ctx, spans, instance, user)
if err != nil {
@@ -943,7 +945,7 @@ func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string)
if exportArchiveID == "" {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("issue %v has no export archive", requestName))
}
- exportArchive, err := s.store.GetExportArchive(ctx, exportArchiveID)
+ exportArchive, err := s.store.GetExportArchive(ctx, common.GetWorkspaceIDFromContext(ctx), exportArchiveID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get export archive: %v", err))
}
@@ -1070,7 +1072,7 @@ func doExport(
return nil, duration, queryErr
}
- if licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
+ if licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
if err := masker.MaskResults(ctx, spans, results, instance, user); err != nil {
return nil, duration, err
@@ -1334,6 +1336,7 @@ func BuildGetLinkedDatabaseMetadataFunc(storeInstance *store.Store, engine store
var linkedMeta *storepb.LinkedDatabaseMetadata
for _, database := range databases {
meta, err := storeInstance.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -1361,7 +1364,7 @@ func BuildGetLinkedDatabaseMetadataFunc(storeInstance *store.Store, engine store
return "", "", nil, err
}
for _, database := range databaseList {
- instance, err := storeInstance.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})
+ instance, err := storeInstance.GetInstance(ctx, &store.FindInstanceMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &database.InstanceID})
if err != nil {
return "", "", nil, err
}
@@ -1382,6 +1385,7 @@ func BuildGetLinkedDatabaseMetadataFunc(storeInstance *store.Store, engine store
}
// Get the linked database metadata.
linkedDatabaseMetadata, err := storeInstance.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: linkedDatabase.InstanceID,
DatabaseName: linkedDatabase.DatabaseName,
})
@@ -1398,6 +1402,7 @@ func BuildGetLinkedDatabaseMetadataFunc(storeInstance *store.Store, engine store
func BuildGetDatabaseMetadataFunc(storeInstance *store.Store) parserbase.GetDatabaseMetadataFunc {
return func(ctx context.Context, instanceID, databaseName string) (string, *model.DatabaseMetadata, error) {
databaseMetadata, err := storeInstance.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
InstanceID: instanceID,
DatabaseName: databaseName,
})
@@ -1436,7 +1441,7 @@ func (s *SQLService) accessCheck(
spans []*parserbase.QuerySpan,
isExplain bool,
) error {
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &database.ProjectID})
if err != nil {
return err
}
@@ -1444,12 +1449,12 @@ func (s *SQLService) accessCheck(
return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("project %q not found", database.ProjectID))
}
- workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx)
+ workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workspace iam policy"))
}
- projectPolicy, err := s.store.GetProjectIamPolicy(ctx, project.ResourceID)
+ projectPolicy, err := s.store.GetProjectIamPolicy(ctx, common.GetWorkspaceIDFromContext(ctx), project.ResourceID)
if err != nil {
return connect.NewError(connect.CodeInternal, errors.New(err.Error()))
}
@@ -1622,6 +1627,7 @@ func (s *SQLService) prepareRelatedMessage(ctx context.Context, requestName stri
}
instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &database.InstanceID,
})
if err != nil {
@@ -1672,9 +1678,9 @@ func (s *SQLService) hasDatabaseAccessRights(
attributes map[string]any,
iamPolicies ...*storepb.IamPolicy,
) (bool, error) {
- bindings := utils.GetUserIAMPolicyBindings(ctx, s.store, user, iamPolicies...)
+ bindings := utils.GetUserIAMPolicyBindings(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), user, iamPolicies...)
for _, binding := range bindings {
- permissions, err := s.iamManager.GetPermissions(ctx, binding.Role)
+ permissions, err := s.iamManager.GetPermissions(ctx, common.GetWorkspaceIDFromContext(ctx), binding.Role)
if err != nil {
return false, errors.Wrapf(err, "failed to get permissions")
}
@@ -1771,7 +1777,7 @@ func checkAndGetDataSourceQueriable(
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("data source id is required"))
}
- instance, err := storeInstance.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})
+ instance, err := storeInstance.GetInstance(ctx, &store.FindInstanceMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &database.InstanceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get instance %v with error: %v", database.InstanceID, err.Error()))
}
@@ -1792,18 +1798,18 @@ func checkAndGetDataSourceQueriable(
// Always allow non-admin data source.
if dataSource.GetType() != storepb.DataSourceType_ADMIN {
- if err := licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_INSTANCE_READ_ONLY_CONNECTION, instance); err != nil {
+ if err := licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_INSTANCE_READ_ONLY_CONNECTION, instance); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, errors.New(err.Error()))
}
return dataSource, nil
}
//nolint:nilerr
- if err := licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_QUERY_POLICY); err != nil {
+ if err := licenseService.IsFeatureEnabled(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_QUERY_POLICY); err != nil {
return dataSource, nil
}
- queryDataPolicy, err := storeInstance.GetEffectiveQueryDataPolicy(ctx, common.FormatProject(database.ProjectID))
+ queryDataPolicy, err := storeInstance.GetEffectiveQueryDataPolicy(ctx, common.GetWorkspaceIDFromContext(ctx), common.FormatProject(database.ProjectID))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get query data policy with error: %v", err.Error()))
}
diff --git a/backend/api/v1/sql_service_ai.go b/backend/api/v1/sql_service_ai.go
index caaa5cd372..9ce5dd86a3 100644
--- a/backend/api/v1/sql_service_ai.go
+++ b/backend/api/v1/sql_service_ai.go
@@ -14,6 +14,7 @@ import (
"github.com/pkg/errors"
+ "github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
)
@@ -102,7 +103,7 @@ type claudeResponse struct {
// AICompletion is the mixer for AI completion.
func (s *SQLService) AICompletion(ctx context.Context, req *connect.Request[v1pb.AICompletionRequest]) (*connect.Response[v1pb.AICompletionResponse], error) {
request := req.Msg
- aiSetting, err := s.store.GetAISetting(ctx)
+ aiSetting, err := s.store.GetAISetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, err
}
diff --git a/backend/api/v1/sql_service_converter.go b/backend/api/v1/sql_service_converter.go
index 6c5772162d..4debc7dad1 100644
--- a/backend/api/v1/sql_service_converter.go
+++ b/backend/api/v1/sql_service_converter.go
@@ -38,7 +38,7 @@ func convertAdviceStatus(status storepb.Advice_Status) v1pb.Advice_Level {
}
func (s *SQLService) convertToV1QueryHistory(ctx context.Context, history *store.QueryHistoryMessage) (*v1pb.QueryHistory, error) {
- creator, err := s.store.GetPrincipalByEmail(ctx, history.Creator)
+ creator, err := s.store.GetAccountByEmail(ctx, history.Creator)
if err != nil {
return nil, err
}
diff --git a/backend/api/v1/subscription_service.go b/backend/api/v1/subscription_service.go
index d3c7022725..b044fd9215 100644
--- a/backend/api/v1/subscription_service.go
+++ b/backend/api/v1/subscription_service.go
@@ -31,8 +31,9 @@ func NewSubscriptionService(
}
// GetSubscription gets the subscription.
+// allow_without_credential: if no workspace in context, falls back to free subscription.
func (s *SubscriptionService) GetSubscription(ctx context.Context, _ *connect.Request[v1pb.GetSubscriptionRequest]) (*connect.Response[v1pb.Subscription], error) {
- subscription := s.licenseService.LoadSubscription(ctx)
+ subscription := s.licenseService.LoadSubscription(ctx, common.GetWorkspaceIDFromContext(ctx))
return connect.NewResponse(subscription), nil
}
@@ -41,13 +42,13 @@ func (s *SubscriptionService) UpdateSubscription(ctx context.Context, req *conne
if s.profile.SaaS {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot update license in the SaaS mode"))
}
- if err := s.licenseService.StoreLicense(ctx, req.Msg.License); err != nil {
+ if err := s.licenseService.StoreLicense(ctx, common.GetWorkspaceIDFromContext(ctx), req.Msg.License); err != nil {
if common.ErrorCode(err) == common.Invalid {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to store license"))
}
- subscription := s.licenseService.LoadSubscription(ctx)
+ subscription := s.licenseService.LoadSubscription(ctx, common.GetWorkspaceIDFromContext(ctx))
return connect.NewResponse(subscription), nil
}
diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.go
index 5ad300f20b..309d3a4982 100644
--- a/backend/api/v1/user_service.go
+++ b/backend/api/v1/user_service.go
@@ -49,7 +49,7 @@ func NewUserService(store *store.Store, licenseService *enterprise.LicenseServic
}
}
-// GetUser gets a user.
+// GetUser gets a user. Only returns the user if they are a member of the caller's workspace.
func (s *UserService) GetUser(ctx context.Context, request *connect.Request[v1pb.GetUserRequest]) (*connect.Response[v1pb.User], error) {
email, err := common.GetUserEmail(request.Msg.Name)
if err != nil {
@@ -59,14 +59,15 @@ func (s *UserService) GetUser(ctx context.Context, request *connect.Request[v1pb
return nil, err
}
- user, err := s.store.GetUserByEmail(ctx, email)
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ users, err := s.store.BatchGetUsersByEmails(ctx, workspaceID, []string{email})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user"))
}
- if user == nil {
+ if len(users) == 0 {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("user %q not found", email))
}
- v1User, err := convertToUser(ctx, s.iamManager, user)
+ v1User, err := convertToUser(ctx, s.iamManager, users[0])
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))
}
@@ -88,8 +89,8 @@ func (s *UserService) BatchGetUsers(ctx context.Context, request *connect.Reques
emails = append(emails, email)
}
- // Batch get from store
- users, err := s.store.BatchGetUsersByEmails(ctx, emails)
+ // Batch get from store — scoped to the caller's workspace.
+ users, err := s.store.BatchGetUsersByEmails(ctx, common.GetWorkspaceIDFromContext(ctx), emails)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to batch get users"))
}
@@ -136,6 +137,7 @@ func (s *UserService) ListUsers(ctx context.Context, request *connect.Request[v1
Limit: &limitPlusOne,
Offset: &offset.offset,
ShowDeleted: request.Msg.ShowDeleted,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
}
filterResult, err := store.GetAccountListFilter(request.Msg.Filter)
if err != nil {
@@ -149,7 +151,7 @@ func (s *UserService) ListUsers(ctx context.Context, request *connect.Request[v1
if !ok {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- hasPermission, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, *v)
+ hasPermission, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, common.GetWorkspaceIDFromContext(ctx), *v)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check user permission"))
}
@@ -184,27 +186,13 @@ func (s *UserService) ListUsers(ctx context.Context, request *connect.Request[v1
return connect.NewResponse(response), nil
}
-// CreateUser creates a user.
+// CreateUser creates a user in the caller's workspace (admin action, self-hosted only).
+// In SaaS mode, admins should add users via workspace IAM policy instead.
func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v1pb.CreateUserRequest]) (*connect.Response[v1pb.User], error) {
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DISALLOW_SELF_SERVICE_SIGNUP); err == nil {
- setting, err := s.store.GetWorkspaceProfileSetting(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace setting"))
- }
- if setting.DisallowSignup || s.profile.SaaS {
- callerUser, ok := GetUserFromContext(ctx)
- if !ok {
- return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("sign up is disallowed"))
- }
- ok, err := s.iamManager.CheckPermission(ctx, permission.UsersCreate, callerUser)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
- }
- if !ok {
- return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("user does not have permission %q", permission.UsersCreate))
- }
- }
+ if s.profile.SaaS {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.Errorf("CreateUser is not available in SaaS mode, add users via workspace IAM policy instead"))
}
+
if request.Msg.User == nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("user must be set"))
}
@@ -214,38 +202,35 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v
if request.Msg.User.Title == "" {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("user title must be set"))
}
-
- if err := s.userCountGuard(ctx); err != nil {
- return nil, err
- }
-
- count, err := s.store.CountActiveEndUsers(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to count users"))
- }
- firstEndUser := count == 0
-
if request.Msg.User.Phone != "" {
if err := common.ValidatePhone(request.Msg.User.Phone); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "invalid phone %q", request.Msg.User.Phone))
}
}
- // Skip domain restrictions for service accounts and workload identities
- if err := validateEmailWithDomains(ctx, s.licenseService, s.store, request.Msg.User.Email, false); err != nil {
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ email := request.Msg.User.Email
+
+ if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID); err != nil {
return nil, err
}
- existingUser, err := s.store.GetUserByEmail(ctx, request.Msg.User.Email)
+
+ if err := validateEmailWithDomains(ctx, s.licenseService, s.store, workspaceID, email, false); err != nil {
+ return nil, err
+ }
+
+ existingUser, err := s.store.GetUserByEmail(ctx, email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find user by email"))
}
if existingUser != nil {
- return nil, connect.NewError(connect.CodeAlreadyExists, errors.Errorf("email %s exists", request.Msg.User.Email))
+ return nil, connect.NewError(connect.CodeAlreadyExists, errors.Errorf("email %s exists", email))
}
+ // Validate password.
password := request.Msg.User.Password
if password != "" {
- if err := s.validatePassword(ctx, password); err != nil {
+ if err := validatePassword(ctx, s.store, workspaceID, password); err != nil {
return nil, err
}
} else {
@@ -255,45 +240,32 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v
}
password = pwd
}
-
passwordHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to generate password hash"))
}
- userMessage := &store.UserMessage{
- Email: request.Msg.User.Email,
+ user, err := s.store.CreateUser(ctx, &store.UserMessage{
+ Email: email,
Name: request.Msg.User.Title,
Phone: request.Msg.User.Phone,
PasswordHash: string(passwordHash),
Profile: &storepb.UserProfile{},
- }
-
- user, err := s.store.CreateUser(ctx, userMessage)
+ })
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create user"))
}
- if firstEndUser {
- // The first end user should be workspace admin.
- updateRole := &store.PatchIamPolicyMessage{
- Member: common.FormatUserEmail(user.Email),
- Roles: []string{common.FormatRole(store.WorkspaceAdminRole)},
- }
- if _, err := s.store.PatchWorkspaceIamPolicy(ctx, updateRole); err != nil {
- return nil, connect.NewError(connect.CodeInternal, err)
- }
- }
-
userResponse, err := convertToUser(ctx, s.iamManager, user)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))
}
+ userResponse.Workspace = common.FormatWorkspace(workspaceID)
return connect.NewResponse(userResponse), nil
}
-func (s *UserService) validatePassword(ctx context.Context, password string) error {
- setting, err := s.store.GetWorkspaceProfileSetting(ctx)
+func validatePassword(ctx context.Context, store *store.Store, workspace, password string) error {
+ setting, err := store.GetWorkspaceProfileSetting(ctx, workspace)
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Errorf("failed to get password restriction with error: %v", err))
}
@@ -343,7 +315,7 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[v
}
if user == nil {
if request.Msg.AllowMissing {
- ok, err := s.iamManager.CheckPermission(ctx, permission.UsersCreate, callerUser)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.UsersCreate, callerUser, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -361,7 +333,12 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[v
}
if callerUser.ID != user.ID {
- ok, err := s.iamManager.CheckPermission(ctx, permission.UsersUpdate, callerUser)
+ // In SaaS mode, only self-updates are allowed. A workspace admin should not
+ // edit another user's profile since the principal is global.
+ if s.profile.SaaS {
+ return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("updating other users is not allowed in SaaS mode"))
+ }
+ ok, err := s.iamManager.CheckPermission(ctx, permission.UsersUpdate, callerUser, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -383,7 +360,7 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[v
if user.Type != storepb.PrincipalType_END_USER {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("password can be mutated for end users only"))
}
- if err := s.validatePassword(ctx, request.Msg.User.Password); err != nil {
+ if err := validatePassword(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), request.Msg.User.Password); err != nil {
return nil, err
}
passwordPatch = &request.Msg.User.Password
@@ -404,12 +381,12 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[v
TempOtpSecretCreatedTime: nil,
}
} else {
- setting, err := s.store.GetWorkspaceProfileSetting(ctx)
+ setting, err := s.store.GetWorkspaceProfileSetting(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace setting"))
}
if setting.Require_2Fa {
- isWorkspaceAdmin, err := isUserWorkspaceAdmin(ctx, s.store, callerUser)
+ isWorkspaceAdmin, err := isUserWorkspaceAdmin(ctx, s.store, callerUser, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check user roles"))
}
@@ -510,11 +487,15 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[v
// DeleteUser deletes a user.
func (s *UserService) DeleteUser(ctx context.Context, request *connect.Request[v1pb.DeleteUserRequest]) (*connect.Response[emptypb.Empty], error) {
+ if s.profile.SaaS {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.Errorf("CreateUser is not available in SaaS mode, add users via workspace IAM policy instead"))
+ }
+
callerUser, ok := GetUserFromContext(ctx)
if !ok {
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("failed to get caller user"))
}
- ok, err := s.iamManager.CheckPermission(ctx, permission.UsersDelete, callerUser)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.UsersDelete, callerUser, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -541,7 +522,7 @@ func (s *UserService) DeleteUser(ctx context.Context, request *connect.Request[v
}
// Check if there is still workspace admin if the current user is deleted.
- policy, err := s.store.GetWorkspaceIamPolicy(ctx)
+ policy, err := s.store.GetWorkspaceIamPolicy(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, err
}
@@ -559,14 +540,6 @@ func (s *UserService) DeleteUser(ctx context.Context, request *connect.Request[v
return connect.NewResponse(&emptypb.Empty{}), nil
}
-func (s *UserService) getActiveUserCount(ctx context.Context) (int, error) {
- count, err := s.store.CountActiveEndUsers(ctx)
- if err != nil {
- return 0, connect.NewError(connect.CodeInternal, errors.Errorf("failed to stat users with error: %v", err.Error()))
- }
- return count, nil
-}
-
func (s *UserService) hasExtraWorkspaceAdmin(ctx context.Context, policy *storepb.IamPolicy, user *store.UserMessage) (bool, error) {
workspaceAdminRole := common.FormatRole(store.WorkspaceAdminRole)
userMember := common.FormatUserEmail(user.Email)
@@ -579,14 +552,16 @@ func (s *UserService) hasExtraWorkspaceAdmin(ctx context.Context, policy *storep
if member == userMember {
continue
}
- if member == common.AllUsers {
- activeEndUserCount, err := s.getActiveUserCount(ctx)
+ if member == common.AllUsers && !s.profile.SaaS {
+ // allUsers means every user is an admin. Count all active end users
+ // (not just workspace members) since allUsers includes everyone.
+ count, err := s.store.CountAllActivePrincipals(ctx)
if err != nil {
return false, err
}
- return activeEndUserCount > 1, nil
+ return count > 1, nil
}
- users := utils.GetUsersByMember(ctx, s.store, member)
+ users := utils.GetUsersByMember(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), member)
for _, user := range users {
if !user.MemberDeleted && user.Type == storepb.PrincipalType_END_USER {
return true, nil
@@ -599,11 +574,16 @@ func (s *UserService) hasExtraWorkspaceAdmin(ctx context.Context, policy *storep
// UndeleteUser undeletes a user.
func (s *UserService) UndeleteUser(ctx context.Context, request *connect.Request[v1pb.UndeleteUserRequest]) (*connect.Response[v1pb.User], error) {
+ if s.profile.SaaS {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.Errorf("CreateUser is not available in SaaS mode, add users via workspace IAM policy instead"))
+ }
+
callerUser, ok := GetUserFromContext(ctx)
if !ok {
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("failed to get caller user"))
}
- ok, err := s.iamManager.CheckPermission(ctx, permission.UsersUndelete, callerUser)
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.UsersUndelete, callerUser, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -629,7 +609,7 @@ func (s *UserService) UndeleteUser(ctx context.Context, request *connect.Request
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("user %q is already active", email))
}
if user.Type == storepb.PrincipalType_END_USER {
- if err := s.userCountGuard(ctx); err != nil {
+ if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID); err != nil {
return nil, err
}
}
@@ -647,11 +627,15 @@ func (s *UserService) UndeleteUser(ctx context.Context, request *connect.Request
// UpdateEmail updates a user's email address.
func (s *UserService) UpdateEmail(ctx context.Context, request *connect.Request[v1pb.UpdateEmailRequest]) (*connect.Response[v1pb.User], error) {
+ if s.profile.SaaS {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.Errorf("CreateUser is not available in SaaS mode, add users via workspace IAM policy instead"))
+ }
+
callerUser, ok := GetUserFromContext(ctx)
if !ok {
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("failed to get caller user"))
}
- ok, err := s.iamManager.CheckPermission(ctx, permission.UsersUpdateEmail, callerUser)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.UsersUpdateEmail, callerUser, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -681,7 +665,7 @@ func (s *UserService) UpdateEmail(ctx context.Context, request *connect.Request[
}
// Validate email format and domain restrictions
- if err := validateEmailWithDomains(ctx, s.licenseService, s.store, request.Msg.Email, false); err != nil {
+ if err := validateEmailWithDomains(ctx, s.licenseService, s.store, common.GetWorkspaceIDFromContext(ctx), request.Msg.Email, false); err != nil {
return nil, err
}
@@ -708,10 +692,12 @@ func (s *UserService) UpdateEmail(ctx context.Context, request *connect.Request[
}
func convertToUser(ctx context.Context, iamManager *iam.Manager, user *store.UserMessage) (*v1pb.User, error) {
- groups, err := iamManager.GetUserGroups(ctx, user.Email)
+ groups, err := iamManager.GetUserGroups(ctx, common.GetWorkspaceIDFromContext(ctx), user.Email)
if err != nil {
return nil, err
}
+
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
convertedUser := &v1pb.User{
Name: common.FormatUserEmail(user.Email),
State: convertDeletedToState(user.MemberDeleted),
@@ -723,7 +709,8 @@ func convertToUser(ctx context.Context, iamManager *iam.Manager, user *store.Use
LastChangePasswordTime: user.Profile.LastChangePasswordTime,
Source: user.Profile.Source,
},
- Groups: groups,
+ Groups: groups,
+ Workspace: common.FormatWorkspace(workspaceID),
}
if user.MFAConfig != nil {
@@ -748,11 +735,11 @@ func validateEndUserEmail(email string) error {
return nil
}
-func validateEmailWithDomains(ctx context.Context, licenseService *enterprise.LicenseService, stores *store.Store, email string, checkDomainSetting bool) error {
+func validateEmailWithDomains(ctx context.Context, licenseService *enterprise.LicenseService, stores *store.Store, workspaceID, email string, checkDomainSetting bool) error {
if err := validateEndUserEmail(email); err != nil {
return err
}
- if licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_USER_EMAIL_DOMAIN_RESTRICTION) != nil {
+ if licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_USER_EMAIL_DOMAIN_RESTRICTION) != nil {
// nolint:nilerr
// feature not enabled, only validate email and skip domain restriction.
if err := common.ValidateEmail(email); err != nil {
@@ -760,7 +747,7 @@ func validateEmailWithDomains(ctx context.Context, licenseService *enterprise.Li
}
return nil
}
- setting, err := stores.GetWorkspaceProfileSetting(ctx)
+ setting, err := stores.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace setting"))
}
@@ -849,10 +836,10 @@ func generateRecoveryCodes(n int) ([]string, error) {
return recoveryCodes, nil
}
-func (s *UserService) userCountGuard(ctx context.Context) error {
- userLimit := s.licenseService.GetUserLimit(ctx)
+func userCountGuard(ctx context.Context, store *store.Store, licenseService *enterprise.LicenseService, workspaceID string) error {
+ userLimit := licenseService.GetUserLimit(ctx, workspaceID)
- count, err := s.store.CountActiveEndUsers(ctx)
+ count, err := store.CountActiveEndUsersPerWorkspace(ctx, workspaceID)
if err != nil {
return connect.NewError(connect.CodeInternal, err)
}
@@ -862,11 +849,11 @@ func (s *UserService) userCountGuard(ctx context.Context) error {
return nil
}
-func isUserWorkspaceAdmin(ctx context.Context, stores *store.Store, user *store.UserMessage) (bool, error) {
- workspacePolicy, err := stores.GetWorkspaceIamPolicy(ctx)
+func isUserWorkspaceAdmin(ctx context.Context, stores *store.Store, user *store.UserMessage, workspaceID string) (bool, error) {
+ workspacePolicy, err := stores.GetWorkspaceIamPolicy(ctx, workspaceID)
if err != nil {
return false, err
}
- roles := utils.GetUserFormattedRolesMap(ctx, stores, user, workspacePolicy.Policy)
+ roles := utils.GetUserFormattedRolesMap(ctx, stores, workspaceID, user, workspacePolicy.Policy)
return roles[common.FormatRole(store.WorkspaceAdminRole)], nil
}
diff --git a/backend/api/v1/workload_identity_service.go b/backend/api/v1/workload_identity_service.go
index 658af7755e..3d98f5f909 100644
--- a/backend/api/v1/workload_identity_service.go
+++ b/backend/api/v1/workload_identity_service.go
@@ -69,7 +69,7 @@ func (s *WorkloadIdentityService) CreateWorkloadIdentity(ctx context.Context, re
email := common.BuildWorkloadIdentityEmail(workloadIdentityID, projectIDStr)
// Check for duplicate email
- existingWI, err := s.store.GetWorkloadIdentityByEmail(ctx, email)
+ existingWI, err := s.store.GetWorkloadIdentity(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check for existing workload identity"))
}
@@ -84,12 +84,8 @@ func (s *WorkloadIdentityService) CreateWorkloadIdentity(ctx context.Context, re
}
// Create the workload identity
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace"))
- }
createdWI, err := s.store.CreateWorkloadIdentity(ctx, &store.CreateWorkloadIdentityMessage{
- Workspace: workspace.ResourceID,
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
Email: email,
Name: wi.Title,
Project: projectID,
@@ -109,7 +105,7 @@ func (s *WorkloadIdentityService) GetWorkloadIdentity(ctx context.Context, reque
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- wi, err := s.store.GetWorkloadIdentityByEmail(ctx, email)
+ wi, err := s.store.GetWorkloadIdentity(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workload identity"))
}
@@ -159,6 +155,7 @@ func (s *WorkloadIdentityService) ListWorkloadIdentities(ctx context.Context, re
// List workload identities using the store method with project filtering
wis, err := s.store.ListWorkloadIdentities(ctx, &store.FindWorkloadIdentityMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
Project: projectID,
Limit: &limitPlusOne,
Offset: &offset.offset,
@@ -201,7 +198,7 @@ func (s *WorkloadIdentityService) UpdateWorkloadIdentity(ctx context.Context, re
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- wi, err := s.store.GetWorkloadIdentityByEmail(ctx, email)
+ wi, err := s.store.GetWorkloadIdentity(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workload identity"))
}
@@ -244,7 +241,7 @@ func (s *WorkloadIdentityService) DeleteWorkloadIdentity(ctx context.Context, re
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- wi, err := s.store.GetWorkloadIdentityByEmail(ctx, email)
+ wi, err := s.store.GetWorkloadIdentity(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workload identity"))
}
@@ -270,7 +267,7 @@ func (s *WorkloadIdentityService) UndeleteWorkloadIdentity(ctx context.Context,
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- wi, err := s.store.GetWorkloadIdentityByEmail(ctx, email)
+ wi, err := s.store.GetWorkloadIdentity(ctx, common.GetWorkspaceIDFromContext(ctx), email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workload identity"))
}
diff --git a/backend/api/v1/worksheet_service.go b/backend/api/v1/worksheet_service.go
index f3e318df62..50da2ba5f7 100644
--- a/backend/api/v1/worksheet_service.go
+++ b/backend/api/v1/worksheet_service.go
@@ -52,6 +52,7 @@ func (s *WorksheetService) CreateWorksheet(
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &projectResourceID,
})
if err != nil {
@@ -412,7 +413,7 @@ func (s *WorksheetService) canWriteWorksheet(ctx context.Context, worksheet *sto
if worksheet.Creator == user.Email {
return true, nil
}
- ok, err := s.iamManager.CheckPermission(ctx, permission.WorksheetsManage, user)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.WorksheetsManage, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return false, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -449,7 +450,7 @@ func (s *WorksheetService) canReadWorksheet(ctx context.Context, worksheet *stor
if worksheet.Creator == user.Email {
return true, nil
}
- ok, err := s.iamManager.CheckPermission(ctx, permission.WorksheetsManage, user)
+ ok, err := s.iamManager.CheckPermission(ctx, permission.WorksheetsManage, user, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return false, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
@@ -474,13 +475,15 @@ func (s *WorksheetService) checkWorksheetPermission(
user *store.UserMessage,
permission permission.Permission,
) (bool, error) {
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
return false, err
}
- ok, err := s.iamManager.CheckPermission(ctx, permission, user, project.ResourceID)
+ ok, err := s.iamManager.CheckPermission(ctx, permission, user, workspaceID, project.ResourceID)
if err != nil {
return false, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
diff --git a/backend/api/v1/workspace_service.go b/backend/api/v1/workspace_service.go
index e3dfec98e6..13f0c4fdd9 100644
--- a/backend/api/v1/workspace_service.go
+++ b/backend/api/v1/workspace_service.go
@@ -9,6 +9,7 @@ import (
"google.golang.org/protobuf/encoding/protojson"
"github.com/bytebase/bytebase/backend/common"
+ "github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/iam"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -22,22 +23,20 @@ type WorkspaceService struct {
v1connect.UnimplementedWorkspaceServiceHandler
store *store.Store
iamManager *iam.Manager
+ profile *config.Profile
}
// NewWorkspaceService creates a new WorkspaceService.
-func NewWorkspaceService(store *store.Store, iamManager *iam.Manager) *WorkspaceService {
+func NewWorkspaceService(store *store.Store, iamManager *iam.Manager, profile *config.Profile) *WorkspaceService {
return &WorkspaceService{
store: store,
iamManager: iamManager,
+ profile: profile,
}
}
-func (s *WorkspaceService) GetIamPolicy(ctx context.Context, req *connect.Request[v1pb.GetIamPolicyRequest]) (*connect.Response[v1pb.IamPolicy], error) {
- if err := s.validateWorkspaceResource(ctx, req.Msg.Resource); err != nil {
- return nil, err
- }
-
- policy, err := s.store.GetWorkspaceIamPolicy(ctx)
+func (s *WorkspaceService) GetIamPolicy(ctx context.Context, _ *connect.Request[v1pb.GetIamPolicyRequest]) (*connect.Response[v1pb.IamPolicy], error) {
+ policy, err := s.store.GetWorkspaceIamPolicy(ctx, common.GetWorkspaceIDFromContext(ctx))
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find iam policy"))
}
@@ -50,27 +49,11 @@ func (s *WorkspaceService) GetIamPolicy(ctx context.Context, req *connect.Reques
return connect.NewResponse(v1Policy), nil
}
-func (s *WorkspaceService) validateWorkspaceResource(ctx context.Context, resource string) error {
- workspaceID, err := common.GetWorkspaceID(resource)
- if err != nil {
- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid workspace resource %q", resource))
- }
- workspaceResourceName, err := s.store.GetWorkspaceResourceName(ctx)
- if err != nil {
- return connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace resource name"))
- }
- if resource != workspaceResourceName {
- return connect.NewError(connect.CodeNotFound, errors.Errorf("workspace %q not found", workspaceID))
- }
- return nil
-}
-
func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Request[v1pb.SetIamPolicyRequest]) (*connect.Response[v1pb.IamPolicy], error) {
request := req.Msg
- if err := s.validateWorkspaceResource(ctx, request.Resource); err != nil {
- return nil, err
- }
- policyMessage, err := s.store.GetWorkspaceIamPolicy(ctx)
+
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ policyMessage, err := s.store.GetWorkspaceIamPolicy(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace iam policy"))
}
@@ -82,11 +65,24 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques
return nil, err
}
+ // In SaaS mode, allUsers is not allowed in workspace IAM policies.
+ // Members must be explicitly added.
+ if s.profile.SaaS {
+ for _, binding := range request.Policy.Bindings {
+ for _, member := range binding.Members {
+ if member == common.AllUsers {
+ return nil, connect.NewError(connect.CodeInvalidArgument,
+ errors.New("allUsers is not allowed in workspace IAM policy in SaaS mode, add members explicitly"))
+ }
+ }
+ }
+ }
+
iamPolicy, err := convertToStoreIamPolicy(request.Policy)
if err != nil {
return nil, err
}
- users := utils.GetUsersByRoleInIAMPolicy(ctx, s.store, store.WorkspaceAdminRole, iamPolicy)
+ users := utils.GetUsersByRoleInIAMPolicy(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), store.WorkspaceAdminRole, iamPolicy)
if !containsActiveEndUser(users) {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("workspace must have at least one admin"))
}
@@ -100,6 +96,7 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques
ResourceType: storepb.Policy_WORKSPACE,
Resource: request.Resource,
Type: storepb.Policy_IAM,
+ Workspace: workspaceID,
Payload: &payloadStr,
}
@@ -111,7 +108,7 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques
return nil, err
}
- policy, err := s.store.GetWorkspaceIamPolicy(ctx)
+ policy, err := s.store.GetWorkspaceIamPolicy(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find iam policy"))
}
diff --git a/backend/common/const.go b/backend/common/const.go
index ae2f7fffa0..48d26106cb 100644
--- a/backend/common/const.go
+++ b/backend/common/const.go
@@ -21,8 +21,23 @@ const (
)
const (
- // DefaultProjectID is the resource ID for the default project.
- DefaultProjectID = "default"
+ // defaultProjectPrefix is the prefix for the default project resource ID.
+ // Each workspace has its own default project: "default-{workspaceID}".
+ defaultProjectPrefix = "default-"
+)
+
+// DefaultProjectID returns the default project resource ID for a workspace.
+func DefaultProjectID(workspaceID string) string {
+ return defaultProjectPrefix + workspaceID
+}
+
+// IsDefaultProject returns whether a project resource ID is the default project.
+// Handles both new format ("default-{workspaceID}") and legacy format ("default").
+func IsDefaultProject(workspaceID, projectID string) bool {
+ return projectID == DefaultProjectID(workspaceID) || projectID == "default"
+}
+
+const (
// DefaultTestEnvironmentID is the initial resource ID for the test environment.
// This can be mutated by the user. But for now this is only used by onboarding flow to create
// a test instance after first signup, so it's safe to refer it.
diff --git a/backend/common/context.go b/backend/common/context.go
index 6ec318b2d8..860cf212da 100644
--- a/backend/common/context.go
+++ b/backend/common/context.go
@@ -15,6 +15,7 @@ const (
UserContextKey ContextKey = iota
AuthContextKey
ServiceDataKey
+ WorkspaceIDContextKey
)
func WithSetServiceData(ctx context.Context, setServiceData func(a *anypb.Any)) context.Context {
@@ -26,6 +27,14 @@ func GetSetServiceDataFromContext(ctx context.Context) (func(a *anypb.Any), bool
return setServiceData, ok
}
+// GetWorkspaceIDFromContext returns the workspace ID from the request context.
+func GetWorkspaceIDFromContext(ctx context.Context) string {
+ if v, ok := ctx.Value(WorkspaceIDContextKey).(string); ok {
+ return v
+ }
+ return ""
+}
+
type AuthMethod int
const (
@@ -34,11 +43,21 @@ const (
AuthMethodCustom
)
+// ResourceType indicates whether a resource is workspace-scoped or project-scoped.
+type ResourceType int
+
+const (
+ ResourceTypeWorkspace ResourceType = iota
+ ResourceTypeProject
+)
+
+// Resource represents a resource extracted from an API request for authorization and audit.
type Resource struct {
- Type string
- Name string
- ProjectID string
- Workspace bool
+ Type ResourceType
+ // ID is the resource identifier:
+ // - For workspace: the workspace resource ID
+ // - For project: the project resource ID
+ ID string
}
type AuthContext struct {
@@ -53,26 +72,3 @@ func GetAuthContextFromContext(ctx context.Context) (*AuthContext, bool) {
authCtx, ok := ctx.Value(AuthContextKey).(*AuthContext)
return authCtx, ok
}
-
-func (c *AuthContext) HasWorkspaceResource() bool {
- for _, r := range c.Resources {
- if r.Workspace {
- return true
- }
- }
- return false
-}
-
-func (c *AuthContext) GetProjectResources() []string {
- projectIDMap := make(map[string]bool)
- for _, r := range c.Resources {
- if r.ProjectID != "" {
- projectIDMap[r.ProjectID] = true
- }
- }
- var projectIDs []string
- for projectID := range projectIDMap {
- projectIDs = append(projectIDs, projectID)
- }
- return projectIDs
-}
diff --git a/backend/component/config/profile.go b/backend/component/config/profile.go
index cf4aaf75e7..751f508818 100644
--- a/backend/component/config/profile.go
+++ b/backend/component/config/profile.go
@@ -5,7 +5,6 @@ import (
"sync/atomic"
"github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
)
// Profile is the configuration to start main server.
@@ -61,9 +60,7 @@ func (prof *Profile) UseEmbedDB() bool {
return len(prof.PgURL) == 0
}
-var saasFeatureControlMap = map[string]bool{
- storepb.SettingName_AI.String(): true,
-}
+var saasFeatureControlMap = map[string]bool{}
// IsFeatureUnavailable returns if the feature is unavailable in SaaS mode.
func (prof *Profile) IsFeatureUnavailable(feature string) bool {
diff --git a/backend/component/dbfactory/dbfactory.go b/backend/component/dbfactory/dbfactory.go
index a8bc688ddf..c2b15c197e 100644
--- a/backend/component/dbfactory/dbfactory.go
+++ b/backend/component/dbfactory/dbfactory.go
@@ -44,7 +44,7 @@ func (d *DBFactory) GetAdminDatabaseDriver(ctx context.Context, instance *store.
// GetDataSourceDriver returns the database driver for a data source.
func (d *DBFactory) GetDataSourceDriver(ctx context.Context, instance *store.InstanceMessage, dataSource *storepb.DataSource, connectionContext db.ConnectionContext) (db.Driver, error) {
password := dataSource.GetPassword()
- if err := d.licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_EXTERNAL_SECRET_MANAGER, instance); err == nil {
+ if err := d.licenseService.IsFeatureEnabledForInstance(ctx, instance.Workspace, v1pb.PlanFeature_FEATURE_EXTERNAL_SECRET_MANAGER, instance); err == nil {
p, err := secretlib.ReplaceExternalSecret(ctx, dataSource.GetPassword(), dataSource.GetExternalSecret())
if err != nil {
return nil, err
diff --git a/backend/component/export/resources.go b/backend/component/export/resources.go
index 7f8f778c4c..64aa1ac956 100644
--- a/backend/component/export/resources.go
+++ b/backend/component/export/resources.go
@@ -101,6 +101,7 @@ func getResourcesForMySQL(
}
dbMetadata, err := storeInstance.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -129,6 +130,7 @@ func getResourcesForMySQL(
continue
}
resourceDBSchema, err := storeInstance.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: resourceDB.InstanceID,
DatabaseName: resourceDB.DatabaseName,
})
@@ -188,6 +190,7 @@ func getResourcesForPostgres(
}
dbMetadata, err := storeInstance.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -258,6 +261,7 @@ func getResourcesForRedshift(
}
dbMetadata, err := storeInstance.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
diff --git a/backend/component/iam/manager.go b/backend/component/iam/manager.go
index 4c1fa198ba..77969e3e7d 100644
--- a/backend/component/iam/manager.go
+++ b/backend/component/iam/manager.go
@@ -18,12 +18,14 @@ import (
type Manager struct {
store *store.Store
licenseService *enterprise.LicenseService
+ saas bool
}
-func NewManager(store *store.Store, licenseService *enterprise.LicenseService) (*Manager, error) {
+func NewManager(store *store.Store, licenseService *enterprise.LicenseService, saas bool) (*Manager, error) {
m := &Manager{
store: store,
licenseService: licenseService,
+ saas: saas,
}
return m, nil
}
@@ -31,21 +33,22 @@ func NewManager(store *store.Store, licenseService *enterprise.LicenseService) (
// Check if the user has permission on the resource hierarchy.
// CEL on the binding is not considered.
// When multiple projects are specified, the user should have permission on every projects.
-func (m *Manager) CheckPermission(ctx context.Context, p permission.Permission, user *store.UserMessage, projectIDs ...string) (bool, error) {
+func (m *Manager) CheckPermission(ctx context.Context, p permission.Permission, user *store.UserMessage, workspaceID string, projectIDs ...string) (bool, error) {
getPermissions := func(role string) map[permission.Permission]bool {
- perms, _ := m.GetPermissions(ctx, role)
+ perms, _ := m.GetPermissions(ctx, workspaceID, role)
return perms
}
getGroupMembers := func(groupName string) map[string]bool {
- members, _ := m.store.GetGroupMembersSnapshot(ctx, groupName)
+ members, _ := m.store.GetGroupMembersSnapshot(ctx, workspaceID, groupName)
return members
}
- policyMessage, err := m.store.GetWorkspaceIamPolicySnapshot(ctx)
+ policyMessage, err := m.store.GetWorkspaceIamPolicySnapshot(ctx, workspaceID)
if err != nil {
return false, err
}
- if ok := check(user, p, policyMessage.Policy, getPermissions, getGroupMembers); ok {
+ // In SaaS mode, skip allUsers for workspace-level IAM (members must be explicit).
+ if ok := check(user, p, policyMessage.Policy, getPermissions, getGroupMembers, m.saas); ok {
return true, nil
}
@@ -53,6 +56,7 @@ func (m *Manager) CheckPermission(ctx context.Context, p permission.Permission,
allOK := true
for _, projectID := range projectIDs {
project, err := m.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
ShowDeleted: true,
})
@@ -62,11 +66,12 @@ func (m *Manager) CheckPermission(ctx context.Context, p permission.Permission,
if project == nil {
return false, errors.Errorf("project %q not found", projectID)
}
- policyMessage, err := m.store.GetProjectIamPolicySnapshot(ctx, project.ResourceID)
+ policyMessage, err := m.store.GetProjectIamPolicySnapshot(ctx, workspaceID, project.ResourceID)
if err != nil {
return false, err
}
- if ok := check(user, p, policyMessage.Policy, getPermissions, getGroupMembers); !ok {
+ // Project-level: allUsers means "all workspace members", which is safe.
+ if ok := check(user, p, policyMessage.Policy, getPermissions, getGroupMembers, false); !ok {
allOK = false
break
}
@@ -83,9 +88,9 @@ func (m *Manager) ReloadCache(_ context.Context) error {
// GetPermissions returns all permissions for the given role.
// Role format is roles/{role}.
-func (m *Manager) GetPermissions(ctx context.Context, roleName string) (map[permission.Permission]bool, error) {
+func (m *Manager) GetPermissions(ctx context.Context, workspaceID string, roleName string) (map[permission.Permission]bool, error) {
resourceID := strings.TrimPrefix(roleName, "roles/")
- role, err := m.store.GetRoleSnapshot(ctx, resourceID)
+ role, err := m.store.GetRoleSnapshot(ctx, workspaceID, resourceID)
if err != nil {
return nil, err
}
@@ -95,11 +100,11 @@ func (m *Manager) GetPermissions(ctx context.Context, roleName string) (map[perm
return maps.Clone(role.Permissions), nil
}
-func (m *Manager) GetUserGroups(ctx context.Context, email string) ([]string, error) {
- return m.store.GetUserGroupsSnapshot(ctx, common.FormatUserEmail(email))
+func (m *Manager) GetUserGroups(ctx context.Context, workspaceID string, email string) ([]string, error) {
+ return m.store.GetUserGroupsSnapshot(ctx, workspaceID, common.FormatUserEmail(email))
}
-func check(user *store.UserMessage, p permission.Permission, policy *storepb.IamPolicy, getPermissions func(role string) map[permission.Permission]bool, getGroupMembers func(groupName string) map[string]bool) bool {
+func check(user *store.UserMessage, p permission.Permission, policy *storepb.IamPolicy, getPermissions func(role string) map[permission.Permission]bool, getGroupMembers func(groupName string) map[string]bool, skipAllUsers bool) bool {
userName := formatUserNameByType(user)
for _, binding := range policy.GetBindings() {
@@ -114,7 +119,7 @@ func check(user *store.UserMessage, p permission.Permission, policy *storepb.Iam
continue
}
for _, member := range binding.GetMembers() {
- if member == common.AllUsers {
+ if member == common.AllUsers && !skipAllUsers {
return true
}
if member == userName {
diff --git a/backend/component/iam/manager_test.go b/backend/component/iam/manager_test.go
index 5967a08de4..08ed5f1eee 100644
--- a/backend/component/iam/manager_test.go
+++ b/backend/component/iam/manager_test.go
@@ -109,7 +109,7 @@ func TestCheck(t *testing.T) {
}
return test.groupMembers[groupName]
}
- got := check(testUser, test.permission, test.policy, getPermissions, getGroupMembers)
+ got := check(testUser, test.permission, test.policy, getPermissions, getGroupMembers, false)
if got != test.want {
require.Equal(t, test.want, got, i)
}
diff --git a/backend/component/sampleinstance/manager.go b/backend/component/sampleinstance/manager.go
index 81565f32a0..36c3257a7b 100644
--- a/backend/component/sampleinstance/manager.go
+++ b/backend/component/sampleinstance/manager.go
@@ -27,6 +27,10 @@ type Manager struct {
port int // The base port for sample instances
}
+func isSampleInstanceID(instanceID string) bool {
+ return instanceID == "test-sample-instance" || instanceID == "prod-sample-instance"
+}
+
// NewManager creates a new sample instance manager.
func NewManager(store *store.Store, profile *config.Profile) *Manager {
// Using profile.Port + 3 as our sample database port.
@@ -41,9 +45,9 @@ func NewManager(store *store.Store, profile *config.Profile) *Manager {
}
// StartIfExist starts sample instances if they exist in the database.
-func (m *Manager) StartIfExist(ctx context.Context) error {
+func (m *Manager) StartIfExist(ctx context.Context, workspaceID string) error {
// Check if sample instances exist in the database
- hasSampleInstances, err := m.store.HasSampleInstances(ctx)
+ hasSampleInstances, err := m.store.HasSampleInstances(ctx, workspaceID)
if err != nil {
slog.Warn("failed to check for sample instances", log.BBError(err))
return nil // Non-fatal error
@@ -68,14 +72,13 @@ func (m *Manager) StartIfExist(ctx context.Context) error {
// HandleInstanceDeletion handles the deletion of a sample instance.
// We stop all sample instances only when both have been deleted.
-func (m *Manager) HandleInstanceDeletion(ctx context.Context, instanceID string) error {
- if instanceID != "test-sample-instance" && instanceID != "prod-sample-instance" {
- // Not a sample instance
+func (m *Manager) HandleInstanceDeletion(ctx context.Context, workspaceID string, instanceID string) error {
+ if !isSampleInstanceID(instanceID) {
return nil
}
// Check if any sample instances still exist after this deletion
- hasSampleInstances, err := m.store.HasSampleInstances(ctx)
+ hasSampleInstances, err := m.store.HasSampleInstances(ctx, workspaceID)
if err != nil {
slog.Warn("failed to check for remaining sample instances", log.BBError(err))
return nil // Non-fatal error
@@ -110,8 +113,7 @@ func (m *Manager) HandleInstanceDeletion(ctx context.Context, instanceID string)
// HandleInstanceCreation handles the creation of a sample instance.
// When any sample instance is created, we start all sample instances.
func (m *Manager) HandleInstanceCreation(ctx context.Context, instanceID string) error {
- if instanceID != "test-sample-instance" && instanceID != "prod-sample-instance" {
- // Not a sample instance
+ if !isSampleInstanceID(instanceID) {
return nil
}
@@ -151,21 +153,19 @@ func (m *Manager) Port() int {
}
// GenerateOnboardingData generates onboarding data including project and instance.
-func (m *Manager) GenerateOnboardingData(ctx context.Context, user *store.UserMessage, schemaSyncer *schemasync.Syncer) error {
+func (m *Manager) GenerateOnboardingData(ctx context.Context, workspaceID string, user *store.UserMessage, schemaSyncer *schemasync.Syncer) error {
+ // Sample instances are only for self-hosted (non-SaaS), so IDs are static.
projectID := "project-sample"
project, err := m.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: workspaceID,
ResourceID: &projectID,
})
if err != nil {
return errors.Wrapf(err, "failed to find onboarding project %v", projectID)
}
if project == nil {
- workspace, err := m.store.GetWorkspace(ctx)
- if err != nil {
- return errors.Wrapf(err, "failed to get workspace")
- }
sampleProject, err := m.store.CreateProject(ctx, &store.ProjectMessage{
- Workspace: workspace.ResourceID,
+ Workspace: workspaceID,
ResourceID: "project-sample",
Title: "Sample Project",
Setting: &storepb.Project{},
@@ -182,6 +182,7 @@ func (m *Manager) GenerateOnboardingData(ctx context.Context, user *store.UserMe
{
ResourceID: "test-sample-instance",
EnvironmentID: &testEnvID,
+ Workspace: workspaceID,
Metadata: &storepb.Instance{
Title: "Test Sample Instance",
DataSources: []*storepb.DataSource{
@@ -195,6 +196,7 @@ func (m *Manager) GenerateOnboardingData(ctx context.Context, user *store.UserMe
{
ResourceID: "prod-sample-instance",
EnvironmentID: &prodEnvID,
+ Workspace: workspaceID,
Metadata: &storepb.Instance{
Title: "Prod Sample Instance",
DataSources: []*storepb.DataSource{
@@ -223,18 +225,15 @@ func (m *Manager) generateInstance(
) error {
// Generate Sample Instance
instance, err := m.store.GetInstance(ctx, &store.FindInstanceMessage{
+ Workspace: instanceMessage.Workspace,
ResourceID: &instanceMessage.ResourceID,
})
if err != nil {
return errors.Wrapf(err, "failed to find onboarding instance %v", instanceMessage.ResourceID)
}
if instance == nil {
- workspace, err := m.store.GetWorkspace(ctx)
- if err != nil {
- return errors.Wrapf(err, "failed to get workspace")
- }
sampleInstance, err := m.store.CreateInstance(ctx, &store.InstanceMessage{
- Workspace: workspace.ResourceID,
+ Workspace: instanceMessage.Workspace,
ResourceID: instanceMessage.ResourceID,
EnvironmentID: instanceMessage.EnvironmentID,
Metadata: &storepb.Instance{
diff --git a/backend/component/webhook/event.go b/backend/component/webhook/event.go
index 1bf3274f0c..872ac58d1a 100644
--- a/backend/component/webhook/event.go
+++ b/backend/component/webhook/event.go
@@ -35,6 +35,7 @@ func NewIssue(i *store.IssueMessage) *Issue {
func NewProject(p *store.ProjectMessage) *Project {
return &Project{
ResourceID: p.ResourceID,
+ Workspace: p.Workspace,
Title: p.Title,
}
}
@@ -58,6 +59,7 @@ type Issue struct {
type Project struct {
ResourceID string
+ Workspace string
Title string
}
diff --git a/backend/component/webhook/manager.go b/backend/component/webhook/manager.go
index e84ffe2612..e3bbabc7c6 100644
--- a/backend/component/webhook/manager.go
+++ b/backend/component/webhook/manager.go
@@ -57,7 +57,7 @@ func (m *Manager) CreateEvent(ctx context.Context, e *Event) {
return
}
// Call external webhook endpoint in Go routine to avoid blocking web serving thread.
- go m.postWebhookList(ctx, webhookCtx, webhookList)
+ go m.postWebhookList(ctx, webhookCtx, webhookList, e.Project.Workspace)
}
func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, eventType storepb.Activity_Type) (*webhook.Context, error) {
@@ -65,7 +65,7 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, even
var mentionUsers []*store.UserMessage
// Use command-line flag value if set, otherwise use database value
- externalURL, err := utils.GetEffectiveExternalURL(ctx, m.store, m.profile)
+ externalURL, err := utils.GetEffectiveExternalURL(ctx, m.store, m.profile, e.Project.Workspace)
if err != nil {
return nil, err
}
@@ -182,13 +182,13 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, even
// Set issue information if available
if issue != nil {
creatorName := issue.Title // Fallback
- creatorUser, err := m.store.GetPrincipalByEmail(ctx, actor.Email)
+ creatorAccount, err := m.store.GetAccountByEmail(ctx, actor.Email)
if err != nil {
slog.Warn("failed to get creator user for webhook context",
slog.String("issue_title", issue.Title),
log.BBError(err))
- } else {
- creatorName = creatorUser.Name
+ } else if creatorAccount != nil {
+ creatorName = creatorAccount.Name
}
webhookCtx.Issue = &webhook.Issue{
ID: issue.UID,
@@ -214,9 +214,9 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, even
return &webhookCtx, nil
}
-func (m *Manager) postWebhookList(ctx context.Context, webhookCtx *webhook.Context, webhookList []*store.ProjectWebhookMessage) {
+func (m *Manager) postWebhookList(ctx context.Context, webhookCtx *webhook.Context, webhookList []*store.ProjectWebhookMessage, workspaceID string) {
ctx = context.WithoutCancel(ctx)
- setting, err := m.store.GetAppIMSetting(ctx)
+ setting, err := m.store.GetAppIMSetting(ctx, workspaceID)
if err != nil {
slog.Error("failed to get app im setting", log.BBError(err))
} else {
diff --git a/backend/enterprise/license.go b/backend/enterprise/license.go
index b61d9040d9..460e62968e 100644
--- a/backend/enterprise/license.go
+++ b/backend/enterprise/license.go
@@ -132,6 +132,7 @@ type replicaCacheState struct {
type LicenseService struct {
store *store.Store
config *Config
+ saas bool
sfGroup singleflight.Group
cache *expirable.LRU[string, *v1pb.Subscription]
replicaCache atomic.Pointer[replicaCacheState]
@@ -152,7 +153,7 @@ type claims struct {
}
// NewLicenseService will create a new enterprise license service.
-func NewLicenseService(mode common.ReleaseMode, store *store.Store) (*LicenseService, error) {
+func NewLicenseService(mode common.ReleaseMode, store *store.Store, saas bool) (*LicenseService, error) {
config, err := NewConfig(mode)
if err != nil {
return nil, err
@@ -161,6 +162,7 @@ func NewLicenseService(mode common.ReleaseMode, store *store.Store) (*LicenseSer
service := &LicenseService{
store: store,
config: config,
+ saas: saas,
cache: expirable.NewLRU[string, *v1pb.Subscription](1, nil, 1*time.Minute),
}
service.replicaCache.Store(&replicaCacheState{
@@ -171,28 +173,30 @@ func NewLicenseService(mode common.ReleaseMode, store *store.Store) (*LicenseSer
return service, nil
}
-const (
- cacheKey = "license"
-)
+func licenseCacheKey(workspaceID string) string {
+ return "license/" + workspaceID
+}
// LoadSubscription will load subscription.
// If there is no license, we will return a free plan subscription without expiration time.
// If there is expired license, we will return a free plan subscription with the expiration time of the expired license.
-func (s *LicenseService) LoadSubscription(ctx context.Context) *v1pb.Subscription {
+func (s *LicenseService) LoadSubscription(ctx context.Context, workspaceID string) *v1pb.Subscription {
+ key := licenseCacheKey(workspaceID)
+
// Fast path: cache hit (TTL handled automatically by expirable.LRU)
- if sub, ok := s.cache.Get(cacheKey); ok {
+ if sub, ok := s.cache.Get(key); ok {
return sub
}
// Slow path: load from DB with singleflight to prevent thundering herd
- v, _, _ := s.sfGroup.Do(cacheKey, func() (any, error) {
+ v, _, _ := s.sfGroup.Do(key, func() (any, error) {
// Double check after entering singleflight
- if sub, ok := s.cache.Get(cacheKey); ok {
+ if sub, ok := s.cache.Get(key); ok {
return sub, nil
}
- subscription := s.loadSubscriptionFromDB(ctx)
- s.cache.Add(cacheKey, subscription)
+ subscription := s.loadSubscriptionFromDB(ctx, workspaceID)
+ s.cache.Add(key, subscription)
return subscription, nil
})
@@ -202,8 +206,8 @@ func (s *LicenseService) LoadSubscription(ctx context.Context) *v1pb.Subscriptio
return defaultFreeSubscription
}
-func (s *LicenseService) loadSubscriptionFromDB(ctx context.Context) *v1pb.Subscription {
- setting, err := s.store.GetSystemSetting(ctx)
+func (s *LicenseService) loadSubscriptionFromDB(ctx context.Context, workspaceID string) *v1pb.Subscription {
+ setting, err := s.store.GetSystemSetting(ctx, workspaceID)
if err != nil {
slog.Debug("failed to get system setting", log.BBError(err))
return defaultFreeSubscription
@@ -213,13 +217,7 @@ func (s *LicenseService) loadSubscriptionFromDB(ctx context.Context) *v1pb.Subsc
return defaultFreeSubscription
}
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- slog.Debug("failed to get workspace", log.BBError(err))
- return defaultFreeSubscription
- }
-
- subscription, err := s.parseLicense(setting.License, workspace.ResourceID)
+ subscription, err := s.parseLicense(setting.License, workspaceID)
if err != nil {
slog.Debug("failed to parse enterprise license", log.BBError(err))
return defaultFreeSubscription
@@ -253,14 +251,13 @@ func isExpired(sub *v1pb.Subscription) bool {
}
// GetEffectivePlan gets the effective plan.
-func (s *LicenseService) GetEffectivePlan() v1pb.PlanType {
- ctx := context.Background()
- return s.LoadSubscription(ctx).Plan
+func (s *LicenseService) GetEffectivePlan(ctx context.Context, workspaceID string) v1pb.PlanType {
+ return s.LoadSubscription(ctx, workspaceID).Plan
}
// IsFeatureEnabled returns whether a feature is enabled.
-func (s *LicenseService) IsFeatureEnabled(f v1pb.PlanFeature) error {
- plan := s.GetEffectivePlan()
+func (s *LicenseService) IsFeatureEnabled(ctx context.Context, workspaceID string, f v1pb.PlanFeature) error {
+ plan := s.GetEffectivePlan(ctx, workspaceID)
features, ok := planFeatureMatrix[plan]
if !ok || !features[f] {
minimalPlan := v1pb.PlanType_ENTERPRISE
@@ -273,13 +270,13 @@ func (s *LicenseService) IsFeatureEnabled(f v1pb.PlanFeature) error {
}
// IsFeatureEnabledForInstance returns whether a feature is enabled for the instance.
-func (s *LicenseService) IsFeatureEnabledForInstance(f v1pb.PlanFeature, instance *store.InstanceMessage) error {
- plan := s.GetEffectivePlan()
+func (s *LicenseService) IsFeatureEnabledForInstance(ctx context.Context, workspaceID string, f v1pb.PlanFeature, instance *store.InstanceMessage) error {
+ plan := s.GetEffectivePlan(ctx, workspaceID)
// DO NOT check instance license fo FREE plan.
if plan == v1pb.PlanType_FREE {
- return s.IsFeatureEnabled(f)
+ return s.IsFeatureEnabled(ctx, workspaceID, f)
}
- if err := s.IsFeatureEnabled(f); err != nil {
+ if err := s.IsFeatureEnabled(ctx, workspaceID, f); err != nil {
return err
}
if !instance.Metadata.GetActivation() {
@@ -289,8 +286,8 @@ func (s *LicenseService) IsFeatureEnabledForInstance(f v1pb.PlanFeature, instanc
}
// GetActivatedInstanceLimit returns the activated instance limit for the current subscription.
-func (s *LicenseService) GetActivatedInstanceLimit(ctx context.Context) int {
- limit := s.LoadSubscription(ctx).ActiveInstances
+func (s *LicenseService) GetActivatedInstanceLimit(ctx context.Context, workspaceID string) int {
+ limit := s.LoadSubscription(ctx, workspaceID).ActiveInstances
if limit < 0 {
return math.MaxInt
}
@@ -298,8 +295,8 @@ func (s *LicenseService) GetActivatedInstanceLimit(ctx context.Context) int {
}
// GetUserLimit gets the user limit value for the plan.
-func (s *LicenseService) GetUserLimit(ctx context.Context) int {
- subscription := s.LoadSubscription(ctx)
+func (s *LicenseService) GetUserLimit(ctx context.Context, workspaceID string) int {
+ subscription := s.LoadSubscription(ctx, workspaceID)
// Prefer to take values from the license first.
if subscription.Seats > 0 {
return int(subscription.Seats)
@@ -320,8 +317,8 @@ func (s *LicenseService) GetUserLimit(ctx context.Context) int {
}
// GetInstanceLimit gets the instance limit value for the plan.
-func (s *LicenseService) GetInstanceLimit(ctx context.Context) int {
- subscription := s.LoadSubscription(ctx)
+func (s *LicenseService) GetInstanceLimit(ctx context.Context, workspaceID string) int {
+ subscription := s.LoadSubscription(ctx, workspaceID)
// Prefer to take values from the license first.
if subscription.Instances > 0 {
return int(subscription.Instances)
@@ -339,23 +336,19 @@ func (s *LicenseService) GetInstanceLimit(ctx context.Context) int {
}
// StoreLicense will store license into file.
-func (s *LicenseService) StoreLicense(ctx context.Context, license string) error {
+func (s *LicenseService) StoreLicense(ctx context.Context, workspaceID string, license string) error {
if license != "" {
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return errors.Wrapf(err, "failed to get workspace")
- }
- if _, err := s.parseLicense(license, workspace.ResourceID); err != nil {
+ if _, err := s.parseLicense(license, workspaceID); err != nil {
return err
}
}
- if err := s.store.UpdateLicense(ctx, license); err != nil {
+ if err := s.store.UpdateLicense(ctx, workspaceID, license); err != nil {
return err
}
// Invalidate cache
- s.cache.Remove(cacheKey)
+ s.cache.Remove(licenseCacheKey(workspaceID))
return nil
}
@@ -365,8 +358,8 @@ func (s *LicenseService) StoreLicense(ctx context.Context, license string) error
// - 0: No access (FREE plan)
// - positive number: Days of retention (TEAM plan = 7 days)
// - -1: Unlimited retention (ENTERPRISE plan)
-func (s *LicenseService) GetAuditLogRetentionDays() int {
- plan := s.GetEffectivePlan()
+func (s *LicenseService) GetAuditLogRetentionDays(ctx context.Context, workspaceID string) int {
+ plan := s.GetEffectivePlan(ctx, workspaceID)
switch plan {
case v1pb.PlanType_FREE:
return 0
@@ -381,8 +374,8 @@ func (s *LicenseService) GetAuditLogRetentionDays() int {
// GetAuditLogRetentionCutoff returns the earliest timestamp for accessible audit logs.
// Returns nil for unlimited retention (ENTERPRISE plan) or no access (FREE plan).
-func (s *LicenseService) GetAuditLogRetentionCutoff() *time.Time {
- days := s.GetAuditLogRetentionDays()
+func (s *LicenseService) GetAuditLogRetentionCutoff(ctx context.Context, workspaceID string) *time.Time {
+ days := s.GetAuditLogRetentionDays(ctx, workspaceID)
if days <= 0 {
return nil // Either no access (0) or unlimited (-1)
}
@@ -417,8 +410,14 @@ func (s *LicenseService) CountActiveReplicas(ctx context.Context) int {
// CheckReplicaLimit checks if the current replica count exceeds the allowed limit.
// Returns error if HA is not allowed and there are multiple active replicas.
+// CheckReplicaLimit checks if the deployment exceeds the replica limit.
+// In SaaS mode, replica limits are managed by the operator — skip this check.
func (s *LicenseService) CheckReplicaLimit(ctx context.Context) error {
- if s.LoadSubscription(ctx).Ha {
+ if s.saas {
+ return nil
+ }
+ workspaceID, _ := s.store.GetWorkspaceID(ctx)
+ if s.LoadSubscription(ctx, workspaceID).Ha {
return nil // HA license, no limit
}
diff --git a/backend/generated-go/store/server_config.pb.go b/backend/generated-go/store/server_config.pb.go
new file mode 100644
index 0000000000..9b30b1944a
--- /dev/null
+++ b/backend/generated-go/store/server_config.pb.go
@@ -0,0 +1,129 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.36.11
+// protoc (unknown)
+// source: store/server_config.proto
+
+package store
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+ unsafe "unsafe"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// ServerConfigPayload stores global server-level infrastructure configuration.
+// Only contains settings that are truly cross-workspace and cannot be derived
+// from any workspace context (e.g., JWT signing secret).
+// All other settings live in per-workspace WORKSPACE_PROFILE.
+type ServerConfigPayload struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ // Authentication secret for token signing (32-character random string).
+ AuthSecret string `protobuf:"bytes,1,opt,name=auth_secret,json=authSecret,proto3" json:"auth_secret,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *ServerConfigPayload) Reset() {
+ *x = ServerConfigPayload{}
+ mi := &file_store_server_config_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *ServerConfigPayload) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServerConfigPayload) ProtoMessage() {}
+
+func (x *ServerConfigPayload) ProtoReflect() protoreflect.Message {
+ mi := &file_store_server_config_proto_msgTypes[0]
+ if x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServerConfigPayload.ProtoReflect.Descriptor instead.
+func (*ServerConfigPayload) Descriptor() ([]byte, []int) {
+ return file_store_server_config_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ServerConfigPayload) GetAuthSecret() string {
+ if x != nil {
+ return x.AuthSecret
+ }
+ return ""
+}
+
+var File_store_server_config_proto protoreflect.FileDescriptor
+
+const file_store_server_config_proto_rawDesc = "" +
+ "\n" +
+ "\x19store/server_config.proto\x12\x0ebytebase.store\"6\n" +
+ "\x13ServerConfigPayload\x12\x1f\n" +
+ "\vauth_secret\x18\x01 \x01(\tR\n" +
+ "authSecretB\x94\x01\n" +
+ "\x12com.bytebase.storeB\x11ServerConfigProtoP\x01Z\x12generated-go/store\xa2\x02\x03BSX\xaa\x02\x0eBytebase.Store\xca\x02\x0eBytebase\\Store\xe2\x02\x1aBytebase\\Store\\GPBMetadata\xea\x02\x0fBytebase::Storeb\x06proto3"
+
+var (
+ file_store_server_config_proto_rawDescOnce sync.Once
+ file_store_server_config_proto_rawDescData []byte
+)
+
+func file_store_server_config_proto_rawDescGZIP() []byte {
+ file_store_server_config_proto_rawDescOnce.Do(func() {
+ file_store_server_config_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_store_server_config_proto_rawDesc), len(file_store_server_config_proto_rawDesc)))
+ })
+ return file_store_server_config_proto_rawDescData
+}
+
+var file_store_server_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_store_server_config_proto_goTypes = []any{
+ (*ServerConfigPayload)(nil), // 0: bytebase.store.ServerConfigPayload
+}
+var file_store_server_config_proto_depIdxs = []int32{
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_store_server_config_proto_init() }
+func file_store_server_config_proto_init() {
+ if File_store_server_config_proto != nil {
+ return
+ }
+ type x struct{}
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_server_config_proto_rawDesc), len(file_store_server_config_proto_rawDesc)),
+ NumEnums: 0,
+ NumMessages: 1,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_store_server_config_proto_goTypes,
+ DependencyIndexes: file_store_server_config_proto_depIdxs,
+ MessageInfos: file_store_server_config_proto_msgTypes,
+ }.Build()
+ File_store_server_config_proto = out.File
+ file_store_server_config_proto_goTypes = nil
+ file_store_server_config_proto_depIdxs = nil
+}
diff --git a/backend/generated-go/store/server_config_equal.pb.go b/backend/generated-go/store/server_config_equal.pb.go
new file mode 100644
index 0000000000..273fa81e0a
--- /dev/null
+++ b/backend/generated-go/store/server_config_equal.pb.go
@@ -0,0 +1,17 @@
+// Code generated by protoc-gen-equal-go. DO NOT EDIT.
+// source: store/server_config.proto
+
+package store
+
+func (x *ServerConfigPayload) Equal(y *ServerConfigPayload) bool {
+ if x == y {
+ return true
+ }
+ if x == nil || y == nil {
+ return x == nil && y == nil
+ }
+ if x.AuthSecret != y.AuthSecret {
+ return false
+ }
+ return true
+}
diff --git a/backend/generated-go/store/setting.pb.go b/backend/generated-go/store/setting.pb.go
index 6e7e2646fc..13103dde5b 100644
--- a/backend/generated-go/store/setting.pb.go
+++ b/backend/generated-go/store/setting.pb.go
@@ -360,8 +360,6 @@ func (AISetting_Provider) EnumDescriptor() ([]byte, []int) {
type SystemSetting struct {
state protoimpl.MessageState `protogen:"open.v1"`
- // Authentication secret for token signing (32-character random string).
- AuthSecret string `protobuf:"bytes,1,opt,name=auth_secret,json=authSecret,proto3" json:"auth_secret,omitempty"`
// Enterprise license JWT token.
License string `protobuf:"bytes,3,opt,name=license,proto3" json:"license,omitempty"`
unknownFields protoimpl.UnknownFields
@@ -398,13 +396,6 @@ func (*SystemSetting) Descriptor() ([]byte, []int) {
return file_store_setting_proto_rawDescGZIP(), []int{0}
}
-func (x *SystemSetting) GetAuthSecret() string {
- if x != nil {
- return x.AuthSecret
- }
- return ""
-}
-
func (x *SystemSetting) GetLicense() string {
if x != nil {
return x.License
@@ -2404,10 +2395,8 @@ var File_store_setting_proto protoreflect.FileDescriptor
const file_store_setting_proto_rawDesc = "" +
"\n" +
"\x13store/setting.proto\x12\x0ebytebase.store\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x12store/common.proto\"P\n" +
- "\rSystemSetting\x12\x1f\n" +
- "\vauth_secret\x18\x01 \x01(\tR\n" +
- "authSecret\x12\x18\n" +
- "\alicense\x18\x03 \x01(\tR\alicenseJ\x04\b\x02\x10\x03\"\xcf\x0f\n" +
+ "\rSystemSetting\x12\x18\n" +
+ "\alicense\x18\x03 \x01(\tR\alicenseJ\x04\b\x01\x10\x02J\x04\b\x02\x10\x03R\vauth_secretR\fworkspace_id\"\xcf\x0f\n" +
"\x17WorkspaceProfileSetting\x12!\n" +
"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +
"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +
diff --git a/backend/generated-go/store/setting_equal.pb.go b/backend/generated-go/store/setting_equal.pb.go
index dbf16712d7..b45a1be928 100644
--- a/backend/generated-go/store/setting_equal.pb.go
+++ b/backend/generated-go/store/setting_equal.pb.go
@@ -15,9 +15,6 @@ func (x *SystemSetting) Equal(y *SystemSetting) bool {
if x == nil || y == nil {
return x == nil && y == nil
}
- if x.AuthSecret != y.AuthSecret {
- return false
- }
if x.License != y.License {
return false
}
diff --git a/backend/generated-go/v1/actuator_service.pb.go b/backend/generated-go/v1/actuator_service.pb.go
index abc5a48277..8492551aaa 100644
--- a/backend/generated-go/v1/actuator_service.pb.go
+++ b/backend/generated-go/v1/actuator_service.pb.go
@@ -26,7 +26,10 @@ const (
// Request message for getting branding resources.
type GetResourcePackageRequest struct {
- state protoimpl.MessageState `protogen:"open.v1"`
+ state protoimpl.MessageState `protogen:"open.v1"`
+ // Optional workspace name, format: workspaces/{workspace}.
+ // Set when using the workspace-scoped URL pattern.
+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -61,6 +64,13 @@ func (*GetResourcePackageRequest) Descriptor() ([]byte, []int) {
return file_v1_actuator_service_proto_rawDescGZIP(), []int{0}
}
+func (x *GetResourcePackageRequest) GetName() string {
+ if x != nil {
+ return x.Name
+ }
+ return ""
+}
+
// Custom branding resources for the Bytebase instance.
type ResourcePackage struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -181,6 +191,52 @@ func (*GetActuatorInfoRequest) Descriptor() ([]byte, []int) {
return file_v1_actuator_service_proto_rawDescGZIP(), []int{3}
}
+// Request message for getting workspace-scoped actuator information.
+type GetWorkspaceActuatorInfoRequest struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ // The workspace name, format: workspaces/{workspace}.
+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *GetWorkspaceActuatorInfoRequest) Reset() {
+ *x = GetWorkspaceActuatorInfoRequest{}
+ mi := &file_v1_actuator_service_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *GetWorkspaceActuatorInfoRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetWorkspaceActuatorInfoRequest) ProtoMessage() {}
+
+func (x *GetWorkspaceActuatorInfoRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_v1_actuator_service_proto_msgTypes[4]
+ if x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetWorkspaceActuatorInfoRequest.ProtoReflect.Descriptor instead.
+func (*GetWorkspaceActuatorInfoRequest) Descriptor() ([]byte, []int) {
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *GetWorkspaceActuatorInfoRequest) GetName() string {
+ if x != nil {
+ return x.Name
+ }
+ return ""
+}
+
// Request message for deleting cache.
type DeleteCacheRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -190,7 +246,7 @@ type DeleteCacheRequest struct {
func (x *DeleteCacheRequest) Reset() {
*x = DeleteCacheRequest{}
- mi := &file_v1_actuator_service_proto_msgTypes[4]
+ mi := &file_v1_actuator_service_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -202,7 +258,7 @@ func (x *DeleteCacheRequest) String() string {
func (*DeleteCacheRequest) ProtoMessage() {}
func (x *DeleteCacheRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[4]
+ mi := &file_v1_actuator_service_proto_msgTypes[5]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -215,7 +271,7 @@ func (x *DeleteCacheRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use DeleteCacheRequest.ProtoReflect.Descriptor instead.
func (*DeleteCacheRequest) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{4}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{5}
}
type Restriction struct {
@@ -232,7 +288,7 @@ type Restriction struct {
func (x *Restriction) Reset() {
*x = Restriction{}
- mi := &file_v1_actuator_service_proto_msgTypes[5]
+ mi := &file_v1_actuator_service_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -244,7 +300,7 @@ func (x *Restriction) String() string {
func (*Restriction) ProtoMessage() {}
func (x *Restriction) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[5]
+ mi := &file_v1_actuator_service_proto_msgTypes[6]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -257,7 +313,7 @@ func (x *Restriction) ProtoReflect() protoreflect.Message {
// Deprecated: Use Restriction.ProtoReflect.Descriptor instead.
func (*Restriction) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{5}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{6}
}
func (x *Restriction) GetDisallowSignup() bool {
@@ -306,7 +362,8 @@ type ActuatorInfo struct {
// The last time any API call was made, refreshed on each request.
LastActiveTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=last_active_time,json=lastActiveTime,proto3" json:"last_active_time,omitempty"`
// The unique identifier for the workspace.
- WorkspaceId string `protobuf:"bytes,13,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
+ // Format: workspaces/{id}
+ Workspace string `protobuf:"bytes,13,opt,name=workspace,proto3" json:"workspace,omitempty"`
// List of features that are not licensed.
UnlicensedFeatures []string `protobuf:"bytes,15,rep,name=unlicensed_features,json=unlicensedFeatures,proto3" json:"unlicensed_features,omitempty"`
// Whether the Bytebase instance is running in Docker.
@@ -322,15 +379,18 @@ type ActuatorInfo struct {
// Whether the external URL is set via command-line flag (and thus cannot be changed via UI).
ExternalUrlFromFlag bool `protobuf:"varint,23,opt,name=external_url_from_flag,json=externalUrlFromFlag,proto3" json:"external_url_from_flag,omitempty"`
// The number of active replicas (servers sharing the same database).
- ReplicaCount int32 `protobuf:"varint,24,opt,name=replica_count,json=replicaCount,proto3" json:"replica_count,omitempty"`
- Restriction *Restriction `protobuf:"bytes,25,opt,name=restriction,proto3" json:"restriction,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ ReplicaCount int32 `protobuf:"varint,24,opt,name=replica_count,json=replicaCount,proto3" json:"replica_count,omitempty"`
+ Restriction *Restriction `protobuf:"bytes,25,opt,name=restriction,proto3" json:"restriction,omitempty"`
+ // The default project for unassigned databases.
+ // Format: projects/{id}
+ DefaultProject string `protobuf:"bytes,26,opt,name=default_project,json=defaultProject,proto3" json:"default_project,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *ActuatorInfo) Reset() {
*x = ActuatorInfo{}
- mi := &file_v1_actuator_service_proto_msgTypes[6]
+ mi := &file_v1_actuator_service_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -342,7 +402,7 @@ func (x *ActuatorInfo) String() string {
func (*ActuatorInfo) ProtoMessage() {}
func (x *ActuatorInfo) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[6]
+ mi := &file_v1_actuator_service_proto_msgTypes[7]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -355,7 +415,7 @@ func (x *ActuatorInfo) ProtoReflect() protoreflect.Message {
// Deprecated: Use ActuatorInfo.ProtoReflect.Descriptor instead.
func (*ActuatorInfo) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{6}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{7}
}
func (x *ActuatorInfo) GetVersion() string {
@@ -428,9 +488,9 @@ func (x *ActuatorInfo) GetLastActiveTime() *timestamppb.Timestamp {
return nil
}
-func (x *ActuatorInfo) GetWorkspaceId() string {
+func (x *ActuatorInfo) GetWorkspace() string {
if x != nil {
- return x.WorkspaceId
+ return x.Workspace
}
return ""
}
@@ -498,21 +558,32 @@ func (x *ActuatorInfo) GetRestriction() *Restriction {
return nil
}
+func (x *ActuatorInfo) GetDefaultProject() string {
+ if x != nil {
+ return x.DefaultProject
+ }
+ return ""
+}
+
var File_v1_actuator_service_proto protoreflect.FileDescriptor
const file_v1_actuator_service_proto_rawDesc = "" +
"\n" +
- "\x19v1/actuator_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\x1a\x18v1/setting_service.proto\"\x1b\n" +
- "\x19GetResourcePackageRequest\"%\n" +
+ "\x19v1/actuator_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\x1a\x18v1/setting_service.proto\"/\n" +
+ "\x19GetResourcePackageRequest\x12\x12\n" +
+ "\x04name\x18\x01 \x01(\tR\x04name\"%\n" +
"\x0fResourcePackage\x12\x12\n" +
"\x04logo\x18\x01 \x01(\fR\x04logo\"\x14\n" +
"\x12SetupSampleRequest\"\x18\n" +
- "\x16GetActuatorInfoRequest\"\x14\n" +
+ "\x16GetActuatorInfoRequest\"U\n" +
+ "\x1fGetWorkspaceActuatorInfoRequest\x122\n" +
+ "\x04name\x18\x01 \x01(\tB\x1e\xe0A\x02\xfaA\x18\n" +
+ "\x16bytebase.com/WorkspaceR\x04name\"\x14\n" +
"\x12DeleteCacheRequest\"\xec\x01\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\"\x8d\a\n" +
+ "\x14password_restriction\x18\x03 \x01(\v28.bytebase.v1.WorkspaceProfileSetting.PasswordRestrictionB\x03\xe0A\x03R\x13passwordRestriction\"\xb6\a\n" +
"\fActuatorInfo\x12\x1d\n" +
"\aversion\x18\x01 \x01(\tB\x03\xe0A\x03R\aversion\x12\"\n" +
"\n" +
@@ -524,8 +595,8 @@ const file_v1_actuator_service_proto_rawDesc = "" +
"\x04port\x18\a \x01(\tB\x03\xe0A\x03R\x04port\x12&\n" +
"\fexternal_url\x18\b \x01(\tB\x03\xe0A\x03R\vexternalUrl\x12-\n" +
"\x10need_admin_setup\x18\t \x01(\bB\x03\xe0A\x03R\x0eneedAdminSetup\x12I\n" +
- "\x10last_active_time\x18\v \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\x0elastActiveTime\x12&\n" +
- "\fworkspace_id\x18\r \x01(\tB\x03\xe0A\x03R\vworkspaceId\x124\n" +
+ "\x10last_active_time\x18\v \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\x0elastActiveTime\x12!\n" +
+ "\tworkspace\x18\r \x01(\tB\x03\xe0A\x03R\tworkspace\x124\n" +
"\x13unlicensed_features\x18\x0f \x03(\tB\x03\xe0A\x03R\x12unlicensedFeatures\x12\x1b\n" +
"\x06docker\x18\x12 \x01(\bB\x03\xe0A\x03R\x06docker\x125\n" +
"\x14activated_user_count\x18\x13 \x01(\x05B\x03\xe0A\x03R\x12activatedUserCount\x12=\n" +
@@ -534,13 +605,15 @@ const file_v1_actuator_service_proto_rawDesc = "" +
"\renable_sample\x18\x16 \x01(\bB\x03\xe0A\x03R\fenableSample\x128\n" +
"\x16external_url_from_flag\x18\x17 \x01(\bB\x03\xe0A\x03R\x13externalUrlFromFlag\x12(\n" +
"\rreplica_count\x18\x18 \x01(\x05B\x03\xe0A\x03R\freplicaCount\x12?\n" +
- "\vrestriction\x18\x19 \x01(\v2\x18.bytebase.v1.RestrictionB\x03\xe0A\x03R\vrestrictionJ\x04\b\n" +
- "\x10\vJ\x04\b\f\x10\rJ\x04\b\x10\x10\x11J\x04\b\x11\x10\x12J\x04\b\x0e\x10\x0f2\xf7\x03\n" +
+ "\vrestriction\x18\x19 \x01(\v2\x18.bytebase.v1.RestrictionB\x03\xe0A\x03R\vrestriction\x12,\n" +
+ "\x0fdefault_project\x18\x1a \x01(\tB\x03\xe0A\x03R\x0edefaultProjectJ\x04\b\n" +
+ "\x10\vJ\x04\b\f\x10\rJ\x04\b\x10\x10\x11J\x04\b\x11\x10\x12J\x04\b\x0e\x10\x0f2\xe8\x05\n" +
"\x0fActuatorService\x12s\n" +
"\x0fGetActuatorInfo\x12#.bytebase.v1.GetActuatorInfoRequest\x1a\x19.bytebase.v1.ActuatorInfo\" \xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02\x13\x12\x11/v1/actuator/info\x12\x82\x01\n" +
"\vSetupSample\x12\x1f.bytebase.v1.SetupSampleRequest\x1a\x16.google.protobuf.Empty\":\x8a\xea0\x12bb.projects.create\x90\xea0\x01\x82\xd3\xe4\x93\x02\x1a\"\x18/v1/actuator:setupSample\x12f\n" +
- "\vDeleteCache\x12\x1f.bytebase.v1.DeleteCacheRequest\x1a\x16.google.protobuf.Empty\"\x1e\x80\xea0\x01\x82\xd3\xe4\x93\x02\x14*\x12/v1/actuator/cache\x12\x81\x01\n" +
- "\x12GetResourcePackage\x12&.bytebase.v1.GetResourcePackageRequest\x1a\x1c.bytebase.v1.ResourcePackage\"%\xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02\x18\x12\x16/v1/actuator/resourcesB\xaa\x01\n" +
+ "\vDeleteCache\x12\x1f.bytebase.v1.DeleteCacheRequest\x1a\x16.google.protobuf.Empty\"\x1e\x80\xea0\x01\x82\xd3\xe4\x93\x02\x14*\x12/v1/actuator/cache\x12\xaf\x01\n" +
+ "\x12GetResourcePackage\x12&.bytebase.v1.GetResourcePackageRequest\x1a\x1c.bytebase.v1.ResourcePackage\"S\xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02FZ,\x12*/v1/{name=workspaces/*}/actuator/resources\x12\x16/v1/actuator/resources\x12\xc0\x01\n" +
+ "\x18GetWorkspaceActuatorInfo\x12,.bytebase.v1.GetWorkspaceActuatorInfoRequest\x1a\x19.bytebase.v1.ActuatorInfo\"[\xdaA\x04name\x8a\xea0\x1fbb.settings.getWorkspaceProfile\x90\xea0\x01\x82\xd3\xe4\x93\x02'\x12%/v1/{name=workspaces/*}/actuator/infoB\xaa\x01\n" +
"\x0fcom.bytebase.v1B\x14ActuatorServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"
var (
@@ -555,36 +628,39 @@ func file_v1_actuator_service_proto_rawDescGZIP() []byte {
return file_v1_actuator_service_proto_rawDescData
}
-var file_v1_actuator_service_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_v1_actuator_service_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
var file_v1_actuator_service_proto_goTypes = []any{
(*GetResourcePackageRequest)(nil), // 0: bytebase.v1.GetResourcePackageRequest
(*ResourcePackage)(nil), // 1: bytebase.v1.ResourcePackage
(*SetupSampleRequest)(nil), // 2: bytebase.v1.SetupSampleRequest
(*GetActuatorInfoRequest)(nil), // 3: bytebase.v1.GetActuatorInfoRequest
- (*DeleteCacheRequest)(nil), // 4: bytebase.v1.DeleteCacheRequest
- (*Restriction)(nil), // 5: bytebase.v1.Restriction
- (*ActuatorInfo)(nil), // 6: bytebase.v1.ActuatorInfo
- (*WorkspaceProfileSetting_PasswordRestriction)(nil), // 7: bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
- (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp
- (*emptypb.Empty)(nil), // 9: google.protobuf.Empty
+ (*GetWorkspaceActuatorInfoRequest)(nil), // 4: bytebase.v1.GetWorkspaceActuatorInfoRequest
+ (*DeleteCacheRequest)(nil), // 5: bytebase.v1.DeleteCacheRequest
+ (*Restriction)(nil), // 6: bytebase.v1.Restriction
+ (*ActuatorInfo)(nil), // 7: bytebase.v1.ActuatorInfo
+ (*WorkspaceProfileSetting_PasswordRestriction)(nil), // 8: bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
+ (*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp
+ (*emptypb.Empty)(nil), // 10: google.protobuf.Empty
}
var file_v1_actuator_service_proto_depIdxs = []int32{
- 7, // 0: bytebase.v1.Restriction.password_restriction:type_name -> bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
- 8, // 1: bytebase.v1.ActuatorInfo.last_active_time:type_name -> google.protobuf.Timestamp
- 5, // 2: bytebase.v1.ActuatorInfo.restriction:type_name -> bytebase.v1.Restriction
- 3, // 3: bytebase.v1.ActuatorService.GetActuatorInfo:input_type -> bytebase.v1.GetActuatorInfoRequest
- 2, // 4: bytebase.v1.ActuatorService.SetupSample:input_type -> bytebase.v1.SetupSampleRequest
- 4, // 5: bytebase.v1.ActuatorService.DeleteCache:input_type -> bytebase.v1.DeleteCacheRequest
- 0, // 6: bytebase.v1.ActuatorService.GetResourcePackage:input_type -> bytebase.v1.GetResourcePackageRequest
- 6, // 7: bytebase.v1.ActuatorService.GetActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
- 9, // 8: bytebase.v1.ActuatorService.SetupSample:output_type -> google.protobuf.Empty
- 9, // 9: bytebase.v1.ActuatorService.DeleteCache:output_type -> google.protobuf.Empty
- 1, // 10: bytebase.v1.ActuatorService.GetResourcePackage:output_type -> bytebase.v1.ResourcePackage
- 7, // [7:11] is the sub-list for method output_type
- 3, // [3:7] is the sub-list for method input_type
- 3, // [3:3] is the sub-list for extension type_name
- 3, // [3:3] is the sub-list for extension extendee
- 0, // [0:3] is the sub-list for field type_name
+ 8, // 0: bytebase.v1.Restriction.password_restriction:type_name -> bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
+ 9, // 1: bytebase.v1.ActuatorInfo.last_active_time:type_name -> google.protobuf.Timestamp
+ 6, // 2: bytebase.v1.ActuatorInfo.restriction:type_name -> bytebase.v1.Restriction
+ 3, // 3: bytebase.v1.ActuatorService.GetActuatorInfo:input_type -> bytebase.v1.GetActuatorInfoRequest
+ 2, // 4: bytebase.v1.ActuatorService.SetupSample:input_type -> bytebase.v1.SetupSampleRequest
+ 5, // 5: bytebase.v1.ActuatorService.DeleteCache:input_type -> bytebase.v1.DeleteCacheRequest
+ 0, // 6: bytebase.v1.ActuatorService.GetResourcePackage:input_type -> bytebase.v1.GetResourcePackageRequest
+ 4, // 7: bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo:input_type -> bytebase.v1.GetWorkspaceActuatorInfoRequest
+ 7, // 8: bytebase.v1.ActuatorService.GetActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
+ 10, // 9: bytebase.v1.ActuatorService.SetupSample:output_type -> google.protobuf.Empty
+ 10, // 10: bytebase.v1.ActuatorService.DeleteCache:output_type -> google.protobuf.Empty
+ 1, // 11: bytebase.v1.ActuatorService.GetResourcePackage:output_type -> bytebase.v1.ResourcePackage
+ 7, // 12: bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
+ 8, // [8:13] is the sub-list for method output_type
+ 3, // [3:8] is the sub-list for method input_type
+ 3, // [3:3] is the sub-list for extension type_name
+ 3, // [3:3] is the sub-list for extension extendee
+ 0, // [0:3] is the sub-list for field type_name
}
func init() { file_v1_actuator_service_proto_init() }
@@ -600,7 +676,7 @@ func file_v1_actuator_service_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_actuator_service_proto_rawDesc), len(file_v1_actuator_service_proto_rawDesc)),
NumEnums: 0,
- NumMessages: 7,
+ NumMessages: 8,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/backend/generated-go/v1/actuator_service.pb.gw.go b/backend/generated-go/v1/actuator_service.pb.gw.go
index e6ed584b40..6386786504 100644
--- a/backend/generated-go/v1/actuator_service.pb.gw.go
+++ b/backend/generated-go/v1/actuator_service.pb.gw.go
@@ -98,6 +98,8 @@ func local_request_ActuatorService_DeleteCache_0(ctx context.Context, marshaler
return msg, metadata, err
}
+var filter_ActuatorService_GetResourcePackage_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+
func request_ActuatorService_GetResourcePackage_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
protoReq GetResourcePackageRequest
@@ -106,6 +108,12 @@ func request_ActuatorService_GetResourcePackage_0(ctx context.Context, marshaler
if req.Body != nil {
_, _ = io.Copy(io.Discard, req.Body)
}
+ if err := req.ParseForm(); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ActuatorService_GetResourcePackage_0); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
msg, err := client.GetResourcePackage(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
@@ -115,10 +123,94 @@ func local_request_ActuatorService_GetResourcePackage_0(ctx context.Context, mar
protoReq GetResourcePackageRequest
metadata runtime.ServerMetadata
)
+ if err := req.ParseForm(); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ActuatorService_GetResourcePackage_0); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
msg, err := server.GetResourcePackage(ctx, &protoReq)
return msg, metadata, err
}
+func request_ActuatorService_GetResourcePackage_1(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq GetResourcePackageRequest
+ metadata runtime.ServerMetadata
+ err error
+ )
+ if req.Body != nil {
+ _, _ = io.Copy(io.Discard, req.Body)
+ }
+ val, ok := pathParams["name"]
+ if !ok {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
+ }
+ protoReq.Name, err = runtime.String(val)
+ if err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
+ }
+ msg, err := client.GetResourcePackage(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ return msg, metadata, err
+}
+
+func local_request_ActuatorService_GetResourcePackage_1(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq GetResourcePackageRequest
+ metadata runtime.ServerMetadata
+ err error
+ )
+ val, ok := pathParams["name"]
+ if !ok {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
+ }
+ protoReq.Name, err = runtime.String(val)
+ if err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
+ }
+ msg, err := server.GetResourcePackage(ctx, &protoReq)
+ return msg, metadata, err
+}
+
+func request_ActuatorService_GetWorkspaceActuatorInfo_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq GetWorkspaceActuatorInfoRequest
+ metadata runtime.ServerMetadata
+ err error
+ )
+ if req.Body != nil {
+ _, _ = io.Copy(io.Discard, req.Body)
+ }
+ val, ok := pathParams["name"]
+ if !ok {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
+ }
+ protoReq.Name, err = runtime.String(val)
+ if err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
+ }
+ msg, err := client.GetWorkspaceActuatorInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ return msg, metadata, err
+}
+
+func local_request_ActuatorService_GetWorkspaceActuatorInfo_0(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq GetWorkspaceActuatorInfoRequest
+ metadata runtime.ServerMetadata
+ err error
+ )
+ val, ok := pathParams["name"]
+ if !ok {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
+ }
+ protoReq.Name, err = runtime.String(val)
+ if err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
+ }
+ msg, err := server.GetWorkspaceActuatorInfo(ctx, &protoReq)
+ return msg, metadata, err
+}
+
// RegisterActuatorServiceHandlerServer registers the http handlers for service ActuatorService to "mux".
// UnaryRPC :call ActuatorServiceServer directly.
// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
@@ -205,6 +297,46 @@ func RegisterActuatorServiceHandlerServer(ctx context.Context, mux *runtime.Serv
}
forward_ActuatorService_GetResourcePackage_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodGet, pattern_ActuatorService_GetResourcePackage_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ ctx, cancel := context.WithCancel(req.Context())
+ defer cancel()
+ var stream runtime.ServerTransportStream
+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.ActuatorService/GetResourcePackage", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*}/actuator/resources"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := local_request_ActuatorService_GetResourcePackage_1(annotatedContext, inboundMarshaler, server, req, pathParams)
+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_ActuatorService_GetResourcePackage_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
+ mux.Handle(http.MethodGet, pattern_ActuatorService_GetWorkspaceActuatorInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ ctx, cancel := context.WithCancel(req.Context())
+ defer cancel()
+ var stream runtime.ServerTransportStream
+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.ActuatorService/GetWorkspaceActuatorInfo", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*}/actuator/info"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := local_request_ActuatorService_GetWorkspaceActuatorInfo_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_ActuatorService_GetWorkspaceActuatorInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
return nil
}
@@ -313,19 +445,57 @@ func RegisterActuatorServiceHandlerClient(ctx context.Context, mux *runtime.Serv
}
forward_ActuatorService_GetResourcePackage_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodGet, pattern_ActuatorService_GetResourcePackage_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ ctx, cancel := context.WithCancel(req.Context())
+ defer cancel()
+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.ActuatorService/GetResourcePackage", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*}/actuator/resources"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := request_ActuatorService_GetResourcePackage_1(annotatedContext, inboundMarshaler, client, req, pathParams)
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_ActuatorService_GetResourcePackage_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
+ mux.Handle(http.MethodGet, pattern_ActuatorService_GetWorkspaceActuatorInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ ctx, cancel := context.WithCancel(req.Context())
+ defer cancel()
+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.ActuatorService/GetWorkspaceActuatorInfo", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*}/actuator/info"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := request_ActuatorService_GetWorkspaceActuatorInfo_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_ActuatorService_GetWorkspaceActuatorInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
return nil
}
var (
- pattern_ActuatorService_GetActuatorInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "info"}, ""))
- pattern_ActuatorService_SetupSample_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "actuator"}, "setupSample"))
- pattern_ActuatorService_DeleteCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "cache"}, ""))
- pattern_ActuatorService_GetResourcePackage_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "resources"}, ""))
+ pattern_ActuatorService_GetActuatorInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "info"}, ""))
+ pattern_ActuatorService_SetupSample_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "actuator"}, "setupSample"))
+ pattern_ActuatorService_DeleteCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "cache"}, ""))
+ pattern_ActuatorService_GetResourcePackage_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "resources"}, ""))
+ pattern_ActuatorService_GetResourcePackage_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3, 2, 4}, []string{"v1", "workspaces", "name", "actuator", "resources"}, ""))
+ pattern_ActuatorService_GetWorkspaceActuatorInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3, 2, 4}, []string{"v1", "workspaces", "name", "actuator", "info"}, ""))
)
var (
- forward_ActuatorService_GetActuatorInfo_0 = runtime.ForwardResponseMessage
- forward_ActuatorService_SetupSample_0 = runtime.ForwardResponseMessage
- forward_ActuatorService_DeleteCache_0 = runtime.ForwardResponseMessage
- forward_ActuatorService_GetResourcePackage_0 = runtime.ForwardResponseMessage
+ forward_ActuatorService_GetActuatorInfo_0 = runtime.ForwardResponseMessage
+ forward_ActuatorService_SetupSample_0 = runtime.ForwardResponseMessage
+ forward_ActuatorService_DeleteCache_0 = runtime.ForwardResponseMessage
+ forward_ActuatorService_GetResourcePackage_0 = runtime.ForwardResponseMessage
+ forward_ActuatorService_GetResourcePackage_1 = runtime.ForwardResponseMessage
+ forward_ActuatorService_GetWorkspaceActuatorInfo_0 = runtime.ForwardResponseMessage
)
diff --git a/backend/generated-go/v1/actuator_service_equal.pb.go b/backend/generated-go/v1/actuator_service_equal.pb.go
index 8370481609..18061e9478 100644
--- a/backend/generated-go/v1/actuator_service_equal.pb.go
+++ b/backend/generated-go/v1/actuator_service_equal.pb.go
@@ -10,6 +10,9 @@ func (x *GetResourcePackageRequest) Equal(y *GetResourcePackageRequest) bool {
if x == nil || y == nil {
return x == nil && y == nil
}
+ if x.Name != y.Name {
+ return false
+ }
return true
}
@@ -46,6 +49,19 @@ func (x *GetActuatorInfoRequest) Equal(y *GetActuatorInfoRequest) bool {
return true
}
+func (x *GetWorkspaceActuatorInfoRequest) Equal(y *GetWorkspaceActuatorInfoRequest) bool {
+ if x == y {
+ return true
+ }
+ if x == nil || y == nil {
+ return x == nil && y == nil
+ }
+ if x.Name != y.Name {
+ return false
+ }
+ return true
+}
+
func (x *DeleteCacheRequest) Equal(y *DeleteCacheRequest) bool {
if x == y {
return true
@@ -112,7 +128,7 @@ func (x *ActuatorInfo) Equal(y *ActuatorInfo) bool {
if p, q := x.LastActiveTime, y.LastActiveTime; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {
return false
}
- if x.WorkspaceId != y.WorkspaceId {
+ if x.Workspace != y.Workspace {
return false
}
if len(x.UnlicensedFeatures) != len(y.UnlicensedFeatures) {
@@ -147,5 +163,8 @@ func (x *ActuatorInfo) Equal(y *ActuatorInfo) bool {
if !x.Restriction.Equal(y.Restriction) {
return false
}
+ if x.DefaultProject != y.DefaultProject {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/actuator_service_grpc.pb.go b/backend/generated-go/v1/actuator_service_grpc.pb.go
index 65f801ded1..b032ec617e 100644
--- a/backend/generated-go/v1/actuator_service_grpc.pb.go
+++ b/backend/generated-go/v1/actuator_service_grpc.pb.go
@@ -20,10 +20,11 @@ import (
const _ = grpc.SupportPackageIsVersion9
const (
- ActuatorService_GetActuatorInfo_FullMethodName = "/bytebase.v1.ActuatorService/GetActuatorInfo"
- ActuatorService_SetupSample_FullMethodName = "/bytebase.v1.ActuatorService/SetupSample"
- ActuatorService_DeleteCache_FullMethodName = "/bytebase.v1.ActuatorService/DeleteCache"
- ActuatorService_GetResourcePackage_FullMethodName = "/bytebase.v1.ActuatorService/GetResourcePackage"
+ ActuatorService_GetActuatorInfo_FullMethodName = "/bytebase.v1.ActuatorService/GetActuatorInfo"
+ ActuatorService_SetupSample_FullMethodName = "/bytebase.v1.ActuatorService/SetupSample"
+ ActuatorService_DeleteCache_FullMethodName = "/bytebase.v1.ActuatorService/DeleteCache"
+ ActuatorService_GetResourcePackage_FullMethodName = "/bytebase.v1.ActuatorService/GetResourcePackage"
+ ActuatorService_GetWorkspaceActuatorInfo_FullMethodName = "/bytebase.v1.ActuatorService/GetWorkspaceActuatorInfo"
)
// ActuatorServiceClient is the client API for ActuatorService service.
@@ -44,6 +45,8 @@ type ActuatorServiceClient interface {
// Gets custom branding resources such as logos.
// Permissions required: None
GetResourcePackage(ctx context.Context, in *GetResourcePackageRequest, opts ...grpc.CallOption) (*ResourcePackage, error)
+ // Gets workspace-scoped actuator info. Requires authentication.
+ GetWorkspaceActuatorInfo(ctx context.Context, in *GetWorkspaceActuatorInfoRequest, opts ...grpc.CallOption) (*ActuatorInfo, error)
}
type actuatorServiceClient struct {
@@ -94,6 +97,16 @@ func (c *actuatorServiceClient) GetResourcePackage(ctx context.Context, in *GetR
return out, nil
}
+func (c *actuatorServiceClient) GetWorkspaceActuatorInfo(ctx context.Context, in *GetWorkspaceActuatorInfoRequest, opts ...grpc.CallOption) (*ActuatorInfo, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(ActuatorInfo)
+ err := c.cc.Invoke(ctx, ActuatorService_GetWorkspaceActuatorInfo_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
// ActuatorServiceServer is the server API for ActuatorService service.
// All implementations must embed UnimplementedActuatorServiceServer
// for forward compatibility.
@@ -112,6 +125,8 @@ type ActuatorServiceServer interface {
// Gets custom branding resources such as logos.
// Permissions required: None
GetResourcePackage(context.Context, *GetResourcePackageRequest) (*ResourcePackage, error)
+ // Gets workspace-scoped actuator info. Requires authentication.
+ GetWorkspaceActuatorInfo(context.Context, *GetWorkspaceActuatorInfoRequest) (*ActuatorInfo, error)
mustEmbedUnimplementedActuatorServiceServer()
}
@@ -134,6 +149,9 @@ func (UnimplementedActuatorServiceServer) DeleteCache(context.Context, *DeleteCa
func (UnimplementedActuatorServiceServer) GetResourcePackage(context.Context, *GetResourcePackageRequest) (*ResourcePackage, error) {
return nil, status.Error(codes.Unimplemented, "method GetResourcePackage not implemented")
}
+func (UnimplementedActuatorServiceServer) GetWorkspaceActuatorInfo(context.Context, *GetWorkspaceActuatorInfoRequest) (*ActuatorInfo, error) {
+ return nil, status.Error(codes.Unimplemented, "method GetWorkspaceActuatorInfo not implemented")
+}
func (UnimplementedActuatorServiceServer) mustEmbedUnimplementedActuatorServiceServer() {}
func (UnimplementedActuatorServiceServer) testEmbeddedByValue() {}
@@ -227,6 +245,24 @@ func _ActuatorService_GetResourcePackage_Handler(srv interface{}, ctx context.Co
return interceptor(ctx, in, info, handler)
}
+func _ActuatorService_GetWorkspaceActuatorInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(GetWorkspaceActuatorInfoRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(ActuatorServiceServer).GetWorkspaceActuatorInfo(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: ActuatorService_GetWorkspaceActuatorInfo_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(ActuatorServiceServer).GetWorkspaceActuatorInfo(ctx, req.(*GetWorkspaceActuatorInfoRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
// ActuatorService_ServiceDesc is the grpc.ServiceDesc for ActuatorService service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@@ -250,6 +286,10 @@ var ActuatorService_ServiceDesc = grpc.ServiceDesc{
MethodName: "GetResourcePackage",
Handler: _ActuatorService_GetResourcePackage_Handler,
},
+ {
+ MethodName: "GetWorkspaceActuatorInfo",
+ Handler: _ActuatorService_GetWorkspaceActuatorInfo_Handler,
+ },
},
Streams: []grpc.StreamDesc{},
Metadata: "v1/actuator_service.proto",
diff --git a/backend/generated-go/v1/auth_service.pb.go b/backend/generated-go/v1/auth_service.pb.go
index 1cc0e092c2..872f9d194b 100644
--- a/backend/generated-go/v1/auth_service.pb.go
+++ b/backend/generated-go/v1/auth_service.pb.go
@@ -520,6 +520,69 @@ func (x *ExchangeTokenResponse) GetAccessToken() string {
return ""
}
+type SignupRequest struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ // The email for the new account.
+ Email string `protobuf:"bytes,1,opt,name=email,proto3" json:"email,omitempty"`
+ // The password for the new account.
+ Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+ // The display name of the user.
+ Title string `protobuf:"bytes,3,opt,name=title,proto3" json:"title,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *SignupRequest) Reset() {
+ *x = SignupRequest{}
+ mi := &file_v1_auth_service_proto_msgTypes[8]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *SignupRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SignupRequest) ProtoMessage() {}
+
+func (x *SignupRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_v1_auth_service_proto_msgTypes[8]
+ if x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use SignupRequest.ProtoReflect.Descriptor instead.
+func (*SignupRequest) Descriptor() ([]byte, []int) {
+ return file_v1_auth_service_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *SignupRequest) GetEmail() string {
+ if x != nil {
+ return x.Email
+ }
+ return ""
+}
+
+func (x *SignupRequest) GetPassword() string {
+ if x != nil {
+ return x.Password
+ }
+ return ""
+}
+
+func (x *SignupRequest) GetTitle() string {
+ if x != nil {
+ return x.Title
+ }
+ return ""
+}
+
// Request to refresh the access token.
type RefreshRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -529,7 +592,7 @@ type RefreshRequest struct {
func (x *RefreshRequest) Reset() {
*x = RefreshRequest{}
- mi := &file_v1_auth_service_proto_msgTypes[8]
+ mi := &file_v1_auth_service_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -541,7 +604,7 @@ func (x *RefreshRequest) String() string {
func (*RefreshRequest) ProtoMessage() {}
func (x *RefreshRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_auth_service_proto_msgTypes[8]
+ mi := &file_v1_auth_service_proto_msgTypes[9]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -554,7 +617,7 @@ func (x *RefreshRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use RefreshRequest.ProtoReflect.Descriptor instead.
func (*RefreshRequest) Descriptor() ([]byte, []int) {
- return file_v1_auth_service_proto_rawDescGZIP(), []int{8}
+ return file_v1_auth_service_proto_rawDescGZIP(), []int{9}
}
// Response from refreshing the access token.
@@ -566,7 +629,7 @@ type RefreshResponse struct {
func (x *RefreshResponse) Reset() {
*x = RefreshResponse{}
- mi := &file_v1_auth_service_proto_msgTypes[9]
+ mi := &file_v1_auth_service_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -578,7 +641,7 @@ func (x *RefreshResponse) String() string {
func (*RefreshResponse) ProtoMessage() {}
func (x *RefreshResponse) ProtoReflect() protoreflect.Message {
- mi := &file_v1_auth_service_proto_msgTypes[9]
+ mi := &file_v1_auth_service_proto_msgTypes[10]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -591,7 +654,7 @@ func (x *RefreshResponse) ProtoReflect() protoreflect.Message {
// Deprecated: Use RefreshResponse.ProtoReflect.Descriptor instead.
func (*RefreshResponse) Descriptor() ([]byte, []int) {
- return file_v1_auth_service_proto_rawDescGZIP(), []int{9}
+ return file_v1_auth_service_proto_rawDescGZIP(), []int{10}
}
var File_v1_auth_service_proto protoreflect.FileDescriptor
@@ -631,13 +694,18 @@ const file_v1_auth_service_proto_rawDesc = "" +
"\x05token\x18\x01 \x01(\tR\x05token\x12\x14\n" +
"\x05email\x18\x02 \x01(\tR\x05email\":\n" +
"\x15ExchangeTokenResponse\x12!\n" +
- "\faccess_token\x18\x01 \x01(\tR\vaccessToken\"\x10\n" +
+ "\faccess_token\x18\x01 \x01(\tR\vaccessToken\"W\n" +
+ "\rSignupRequest\x12\x14\n" +
+ "\x05email\x18\x01 \x01(\tR\x05email\x12\x1a\n" +
+ "\bpassword\x18\x02 \x01(\tR\bpassword\x12\x14\n" +
+ "\x05title\x18\x03 \x01(\tR\x05title\"\x10\n" +
"\x0eRefreshRequest\"\x11\n" +
- "\x0fRefreshResponse2\xbd\x03\n" +
+ "\x0fRefreshResponse2\xa3\x04\n" +
"\vAuthService\x12a\n" +
"\x05Login\x12\x19.bytebase.v1.LoginRequest\x1a\x1a.bytebase.v1.LoginResponse\"!\x80\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x13:\x01*\"\x0e/v1/auth/login\x12`\n" +
"\x06Logout\x12\x1a.bytebase.v1.LogoutRequest\x1a\x16.google.protobuf.Empty\"\"\x80\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x14:\x01*\"\x0f/v1/auth/logout\x12\x81\x01\n" +
- "\rExchangeToken\x12!.bytebase.v1.ExchangeTokenRequest\x1a\".bytebase.v1.ExchangeTokenResponse\")\x80\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/v1/auth:exchangeToken\x12e\n" +
+ "\rExchangeToken\x12!.bytebase.v1.ExchangeTokenRequest\x1a\".bytebase.v1.ExchangeTokenResponse\")\x80\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/v1/auth:exchangeToken\x12d\n" +
+ "\x06Signup\x12\x1a.bytebase.v1.SignupRequest\x1a\x1a.bytebase.v1.LoginResponse\"\"\x80\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x14:\x01*\"\x0f/v1/auth/signup\x12e\n" +
"\aRefresh\x12\x1b.bytebase.v1.RefreshRequest\x1a\x1c.bytebase.v1.RefreshResponse\"\x1f\x80\xea0\x01\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/v1/auth/refreshB\xa6\x01\n" +
"\x0fcom.bytebase.v1B\x10AuthServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"
@@ -653,7 +721,7 @@ func file_v1_auth_service_proto_rawDescGZIP() []byte {
return file_v1_auth_service_proto_rawDescData
}
-var file_v1_auth_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_v1_auth_service_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
var file_v1_auth_service_proto_goTypes = []any{
(*LoginRequest)(nil), // 0: bytebase.v1.LoginRequest
(*IdentityProviderContext)(nil), // 1: bytebase.v1.IdentityProviderContext
@@ -663,26 +731,29 @@ var file_v1_auth_service_proto_goTypes = []any{
(*LogoutRequest)(nil), // 5: bytebase.v1.LogoutRequest
(*ExchangeTokenRequest)(nil), // 6: bytebase.v1.ExchangeTokenRequest
(*ExchangeTokenResponse)(nil), // 7: bytebase.v1.ExchangeTokenResponse
- (*RefreshRequest)(nil), // 8: bytebase.v1.RefreshRequest
- (*RefreshResponse)(nil), // 9: bytebase.v1.RefreshResponse
- (*User)(nil), // 10: bytebase.v1.User
- (*emptypb.Empty)(nil), // 11: google.protobuf.Empty
+ (*SignupRequest)(nil), // 8: bytebase.v1.SignupRequest
+ (*RefreshRequest)(nil), // 9: bytebase.v1.RefreshRequest
+ (*RefreshResponse)(nil), // 10: bytebase.v1.RefreshResponse
+ (*User)(nil), // 11: bytebase.v1.User
+ (*emptypb.Empty)(nil), // 12: google.protobuf.Empty
}
var file_v1_auth_service_proto_depIdxs = []int32{
1, // 0: bytebase.v1.LoginRequest.idp_context:type_name -> bytebase.v1.IdentityProviderContext
2, // 1: bytebase.v1.IdentityProviderContext.oauth2_context:type_name -> bytebase.v1.OAuth2IdentityProviderContext
3, // 2: bytebase.v1.IdentityProviderContext.oidc_context:type_name -> bytebase.v1.OIDCIdentityProviderContext
- 10, // 3: bytebase.v1.LoginResponse.user:type_name -> bytebase.v1.User
+ 11, // 3: bytebase.v1.LoginResponse.user:type_name -> bytebase.v1.User
0, // 4: bytebase.v1.AuthService.Login:input_type -> bytebase.v1.LoginRequest
5, // 5: bytebase.v1.AuthService.Logout:input_type -> bytebase.v1.LogoutRequest
6, // 6: bytebase.v1.AuthService.ExchangeToken:input_type -> bytebase.v1.ExchangeTokenRequest
- 8, // 7: bytebase.v1.AuthService.Refresh:input_type -> bytebase.v1.RefreshRequest
- 4, // 8: bytebase.v1.AuthService.Login:output_type -> bytebase.v1.LoginResponse
- 11, // 9: bytebase.v1.AuthService.Logout:output_type -> google.protobuf.Empty
- 7, // 10: bytebase.v1.AuthService.ExchangeToken:output_type -> bytebase.v1.ExchangeTokenResponse
- 9, // 11: bytebase.v1.AuthService.Refresh:output_type -> bytebase.v1.RefreshResponse
- 8, // [8:12] is the sub-list for method output_type
- 4, // [4:8] is the sub-list for method input_type
+ 8, // 7: bytebase.v1.AuthService.Signup:input_type -> bytebase.v1.SignupRequest
+ 9, // 8: bytebase.v1.AuthService.Refresh:input_type -> bytebase.v1.RefreshRequest
+ 4, // 9: bytebase.v1.AuthService.Login:output_type -> bytebase.v1.LoginResponse
+ 12, // 10: bytebase.v1.AuthService.Logout:output_type -> google.protobuf.Empty
+ 7, // 11: bytebase.v1.AuthService.ExchangeToken:output_type -> bytebase.v1.ExchangeTokenResponse
+ 4, // 12: bytebase.v1.AuthService.Signup:output_type -> bytebase.v1.LoginResponse
+ 10, // 13: bytebase.v1.AuthService.Refresh:output_type -> bytebase.v1.RefreshResponse
+ 9, // [9:14] is the sub-list for method output_type
+ 4, // [4:9] is the sub-list for method input_type
4, // [4:4] is the sub-list for extension type_name
4, // [4:4] is the sub-list for extension extendee
0, // [0:4] is the sub-list for field type_name
@@ -707,7 +778,7 @@ func file_v1_auth_service_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_auth_service_proto_rawDesc), len(file_v1_auth_service_proto_rawDesc)),
NumEnums: 0,
- NumMessages: 10,
+ NumMessages: 11,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/backend/generated-go/v1/auth_service.pb.gw.go b/backend/generated-go/v1/auth_service.pb.gw.go
index b9d7185440..d68aea696d 100644
--- a/backend/generated-go/v1/auth_service.pb.gw.go
+++ b/backend/generated-go/v1/auth_service.pb.gw.go
@@ -116,6 +116,33 @@ func local_request_AuthService_ExchangeToken_0(ctx context.Context, marshaler ru
return msg, metadata, err
}
+func request_AuthService_Signup_0(ctx context.Context, marshaler runtime.Marshaler, client AuthServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq SignupRequest
+ metadata runtime.ServerMetadata
+ )
+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ if req.Body != nil {
+ _, _ = io.Copy(io.Discard, req.Body)
+ }
+ msg, err := client.Signup(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ return msg, metadata, err
+}
+
+func local_request_AuthService_Signup_0(ctx context.Context, marshaler runtime.Marshaler, server AuthServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq SignupRequest
+ metadata runtime.ServerMetadata
+ )
+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ msg, err := server.Signup(ctx, &protoReq)
+ return msg, metadata, err
+}
+
func request_AuthService_Refresh_0(ctx context.Context, marshaler runtime.Marshaler, client AuthServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
protoReq RefreshRequest
@@ -209,6 +236,26 @@ func RegisterAuthServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
}
forward_AuthService_ExchangeToken_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodPost, pattern_AuthService_Signup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ ctx, cancel := context.WithCancel(req.Context())
+ defer cancel()
+ var stream runtime.ServerTransportStream
+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.AuthService/Signup", runtime.WithHTTPPathPattern("/v1/auth/signup"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := local_request_AuthService_Signup_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_AuthService_Signup_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
mux.Handle(http.MethodPost, pattern_AuthService_Refresh_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -320,6 +367,23 @@ func RegisterAuthServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
}
forward_AuthService_ExchangeToken_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodPost, pattern_AuthService_Signup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ ctx, cancel := context.WithCancel(req.Context())
+ defer cancel()
+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.AuthService/Signup", runtime.WithHTTPPathPattern("/v1/auth/signup"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := request_AuthService_Signup_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_AuthService_Signup_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
mux.Handle(http.MethodPost, pattern_AuthService_Refresh_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -344,6 +408,7 @@ var (
pattern_AuthService_Login_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "auth", "login"}, ""))
pattern_AuthService_Logout_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "auth", "logout"}, ""))
pattern_AuthService_ExchangeToken_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "auth"}, "exchangeToken"))
+ pattern_AuthService_Signup_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "auth", "signup"}, ""))
pattern_AuthService_Refresh_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "auth", "refresh"}, ""))
)
@@ -351,5 +416,6 @@ var (
forward_AuthService_Login_0 = runtime.ForwardResponseMessage
forward_AuthService_Logout_0 = runtime.ForwardResponseMessage
forward_AuthService_ExchangeToken_0 = runtime.ForwardResponseMessage
+ forward_AuthService_Signup_0 = runtime.ForwardResponseMessage
forward_AuthService_Refresh_0 = runtime.ForwardResponseMessage
)
diff --git a/backend/generated-go/v1/auth_service_equal.pb.go b/backend/generated-go/v1/auth_service_equal.pb.go
index dcd20dcb23..b8671dfaa5 100644
--- a/backend/generated-go/v1/auth_service_equal.pb.go
+++ b/backend/generated-go/v1/auth_service_equal.pb.go
@@ -140,6 +140,25 @@ func (x *ExchangeTokenResponse) Equal(y *ExchangeTokenResponse) bool {
return true
}
+func (x *SignupRequest) Equal(y *SignupRequest) bool {
+ if x == y {
+ return true
+ }
+ if x == nil || y == nil {
+ return x == nil && y == nil
+ }
+ if x.Email != y.Email {
+ return false
+ }
+ if x.Password != y.Password {
+ return false
+ }
+ if x.Title != y.Title {
+ return false
+ }
+ return true
+}
+
func (x *RefreshRequest) Equal(y *RefreshRequest) bool {
if x == y {
return true
diff --git a/backend/generated-go/v1/auth_service_grpc.pb.go b/backend/generated-go/v1/auth_service_grpc.pb.go
index 5c9fa53130..cefc68ab37 100644
--- a/backend/generated-go/v1/auth_service_grpc.pb.go
+++ b/backend/generated-go/v1/auth_service_grpc.pb.go
@@ -23,6 +23,7 @@ const (
AuthService_Login_FullMethodName = "/bytebase.v1.AuthService/Login"
AuthService_Logout_FullMethodName = "/bytebase.v1.AuthService/Logout"
AuthService_ExchangeToken_FullMethodName = "/bytebase.v1.AuthService/ExchangeToken"
+ AuthService_Signup_FullMethodName = "/bytebase.v1.AuthService/Signup"
AuthService_Refresh_FullMethodName = "/bytebase.v1.AuthService/Refresh"
)
@@ -42,6 +43,11 @@ type AuthServiceClient interface {
// Used by CI/CD pipelines with Workload Identity Federation.
// Permissions required: None (validates via OIDC token)
ExchangeToken(ctx context.Context, in *ExchangeTokenRequest, opts ...grpc.CallOption) (*ExchangeTokenResponse, error)
+ // Registers a new user account. Creates a principal and assigns a workspace:
+ // - If the user's email was pre-invited to a workspace, joins that workspace.
+ // - Otherwise, creates a new workspace with the user as admin.
+ // Returns access tokens so the user is logged in immediately after signup.
+ Signup(ctx context.Context, in *SignupRequest, opts ...grpc.CallOption) (*LoginResponse, error)
// Refreshes the access token using the refresh token cookie.
// Permissions required: None (validates via refresh token cookie)
Refresh(ctx context.Context, in *RefreshRequest, opts ...grpc.CallOption) (*RefreshResponse, error)
@@ -85,6 +91,16 @@ func (c *authServiceClient) ExchangeToken(ctx context.Context, in *ExchangeToken
return out, nil
}
+func (c *authServiceClient) Signup(ctx context.Context, in *SignupRequest, opts ...grpc.CallOption) (*LoginResponse, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(LoginResponse)
+ err := c.cc.Invoke(ctx, AuthService_Signup_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
func (c *authServiceClient) Refresh(ctx context.Context, in *RefreshRequest, opts ...grpc.CallOption) (*RefreshResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(RefreshResponse)
@@ -111,6 +127,11 @@ type AuthServiceServer interface {
// Used by CI/CD pipelines with Workload Identity Federation.
// Permissions required: None (validates via OIDC token)
ExchangeToken(context.Context, *ExchangeTokenRequest) (*ExchangeTokenResponse, error)
+ // Registers a new user account. Creates a principal and assigns a workspace:
+ // - If the user's email was pre-invited to a workspace, joins that workspace.
+ // - Otherwise, creates a new workspace with the user as admin.
+ // Returns access tokens so the user is logged in immediately after signup.
+ Signup(context.Context, *SignupRequest) (*LoginResponse, error)
// Refreshes the access token using the refresh token cookie.
// Permissions required: None (validates via refresh token cookie)
Refresh(context.Context, *RefreshRequest) (*RefreshResponse, error)
@@ -133,6 +154,9 @@ func (UnimplementedAuthServiceServer) Logout(context.Context, *LogoutRequest) (*
func (UnimplementedAuthServiceServer) ExchangeToken(context.Context, *ExchangeTokenRequest) (*ExchangeTokenResponse, error) {
return nil, status.Error(codes.Unimplemented, "method ExchangeToken not implemented")
}
+func (UnimplementedAuthServiceServer) Signup(context.Context, *SignupRequest) (*LoginResponse, error) {
+ return nil, status.Error(codes.Unimplemented, "method Signup not implemented")
+}
func (UnimplementedAuthServiceServer) Refresh(context.Context, *RefreshRequest) (*RefreshResponse, error) {
return nil, status.Error(codes.Unimplemented, "method Refresh not implemented")
}
@@ -211,6 +235,24 @@ func _AuthService_ExchangeToken_Handler(srv interface{}, ctx context.Context, de
return interceptor(ctx, in, info, handler)
}
+func _AuthService_Signup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(SignupRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(AuthServiceServer).Signup(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: AuthService_Signup_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(AuthServiceServer).Signup(ctx, req.(*SignupRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
func _AuthService_Refresh_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(RefreshRequest)
if err := dec(in); err != nil {
@@ -248,6 +290,10 @@ var AuthService_ServiceDesc = grpc.ServiceDesc{
MethodName: "ExchangeToken",
Handler: _AuthService_ExchangeToken_Handler,
},
+ {
+ MethodName: "Signup",
+ Handler: _AuthService_Signup_Handler,
+ },
{
MethodName: "Refresh",
Handler: _AuthService_Refresh_Handler,
diff --git a/backend/generated-go/v1/user_service.pb.go b/backend/generated-go/v1/user_service.pb.go
index c5fe45163e..7b9a9dfefd 100644
--- a/backend/generated-go/v1/user_service.pb.go
+++ b/backend/generated-go/v1/user_service.pb.go
@@ -616,7 +616,7 @@ type User struct {
Title string `protobuf:"bytes,4,opt,name=title,proto3" json:"title,omitempty"`
// The password for authentication. Only used during user creation or password updates.
Password string `protobuf:"bytes,6,opt,name=password,proto3" json:"password,omitempty"`
- // The service key for service account authentication. Only used for service accounts.
+ // The service key for service account authentication.
ServiceKey string `protobuf:"bytes,7,opt,name=service_key,json=serviceKey,proto3" json:"service_key,omitempty"`
// The mfa_enabled flag means if the user has enabled MFA.
MfaEnabled bool `protobuf:"varint,8,opt,name=mfa_enabled,json=mfaEnabled,proto3" json:"mfa_enabled,omitempty"`
@@ -633,7 +633,10 @@ type User struct {
Profile *User_Profile `protobuf:"bytes,13,opt,name=profile,proto3" json:"profile,omitempty"`
// The groups for the user.
// Format: groups/{email}
- Groups []string `protobuf:"bytes,14,rep,name=groups,proto3" json:"groups,omitempty"`
+ Groups []string `protobuf:"bytes,14,rep,name=groups,proto3" json:"groups,omitempty"`
+ // The current workspace.
+ // Format: workspaces/{id}
+ Workspace string `protobuf:"bytes,16,opt,name=workspace,proto3" json:"workspace,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -759,6 +762,13 @@ func (x *User) GetGroups() []string {
return nil
}
+func (x *User) GetWorkspace() string {
+ if x != nil {
+ return x.Workspace
+ }
+ return ""
+}
+
type User_Profile struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The last time the user successfully logged in.
@@ -864,14 +874,14 @@ const file_v1_user_service_proto_rawDesc = "" +
"\x12UpdateEmailRequest\x12-\n" +
"\x04name\x18\x01 \x01(\tB\x19\xe0A\x02\xfaA\x13\n" +
"\x11bytebase.com/UserR\x04name\x12\x19\n" +
- "\x05email\x18\x02 \x01(\tB\x03\xe0A\x02R\x05email\"\xf5\x05\n" +
+ "\x05email\x18\x02 \x01(\tB\x03\xe0A\x02R\x05email\"\x93\x06\n" +
"\x04User\x12\x17\n" +
"\x04name\x18\x01 \x01(\tB\x03\xe0A\x03R\x04name\x12(\n" +
"\x05state\x18\x02 \x01(\x0e2\x12.bytebase.v1.StateR\x05state\x12\x14\n" +
"\x05email\x18\x03 \x01(\tR\x05email\x12\x1e\n" +
"\x05title\x18\x04 \x01(\tB\b\xbaH\x05r\x03\x18\xc8\x01R\x05title\x12\x1f\n" +
- "\bpassword\x18\x06 \x01(\tB\x03\xe0A\x04R\bpassword\x12$\n" +
- "\vservice_key\x18\a \x01(\tB\x03\xe0A\x04R\n" +
+ "\bpassword\x18\x06 \x01(\tB\x03\xe0A\x04R\bpassword\x12\x1f\n" +
+ "\vservice_key\x18\a \x01(\tR\n" +
"serviceKey\x12\x1f\n" +
"\vmfa_enabled\x18\b \x01(\bR\n" +
"mfaEnabled\x12&\n" +
@@ -881,19 +891,20 @@ const file_v1_user_service_proto_rawDesc = "" +
"\x1ctemp_otp_secret_created_time\x18\v \x01(\v2\x1a.google.protobuf.TimestampR\x18tempOtpSecretCreatedTime\x12\x14\n" +
"\x05phone\x18\f \x01(\tR\x05phone\x123\n" +
"\aprofile\x18\r \x01(\v2\x19.bytebase.v1.User.ProfileR\aprofile\x12\x1b\n" +
- "\x06groups\x18\x0e \x03(\tB\x03\xe0A\x03R\x06groups\x1a\xbc\x01\n" +
+ "\x06groups\x18\x0e \x03(\tB\x03\xe0A\x03R\x06groups\x12!\n" +
+ "\tworkspace\x18\x10 \x01(\tB\x03\xe0A\x03R\tworkspace\x1a\xbc\x01\n" +
"\aProfile\x12B\n" +
"\x0flast_login_time\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\rlastLoginTime\x12U\n" +
"\x19last_change_password_time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x16lastChangePasswordTime\x12\x16\n" +
"\x06source\x18\x03 \x01(\tR\x06source:%\xeaA\"\n" +
- "\x11bytebase.com/User\x12\rusers/{email}J\x04\b\x05\x10\x06J\x04\b\x0f\x10\x102\xd3\b\n" +
+ "\x11bytebase.com/User\x12\rusers/{email}J\x04\b\x05\x10\x06J\x04\b\x0f\x10\x102\xe2\b\n" +
"\vUserService\x12p\n" +
"\aGetUser\x12\x1b.bytebase.v1.GetUserRequest\x1a\x11.bytebase.v1.User\"5\xdaA\x04name\x8a\xea0\fbb.users.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\x14\x12\x12/v1/{name=users/*}\x12\x86\x01\n" +
"\rBatchGetUsers\x12!.bytebase.v1.BatchGetUsersRequest\x1a\".bytebase.v1.BatchGetUsersResponse\".\x8a\xea0\fbb.users.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\x14\x12\x12/v1/users:batchGet\x12Y\n" +
"\x0eGetCurrentUser\x12\x16.google.protobuf.Empty\x1a\x11.bytebase.v1.User\"\x1c\x80\xea0\x01\x90\xea0\x02\x82\xd3\xe4\x93\x02\x0e\x12\f/v1/users/me\x12{\n" +
- "\tListUsers\x12\x1d.bytebase.v1.ListUsersRequest\x1a\x1e.bytebase.v1.ListUsersResponse\"/\xdaA\x06parent\x8a\xea0\rbb.users.list\x90\xea0\x01\x82\xd3\xe4\x93\x02\v\x12\t/v1/users\x12k\n" +
+ "\tListUsers\x12\x1d.bytebase.v1.ListUsersRequest\x1a\x1e.bytebase.v1.ListUsersResponse\"/\xdaA\x06parent\x8a\xea0\rbb.users.list\x90\xea0\x01\x82\xd3\xe4\x93\x02\v\x12\t/v1/users\x12z\n" +
"\n" +
- "CreateUser\x12\x1e.bytebase.v1.CreateUserRequest\x1a\x11.bytebase.v1.User\"*\xdaA\x04user\x80\xea0\x01\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02\x11:\x04user\"\t/v1/users\x12\x81\x01\n" +
+ "CreateUser\x12\x1e.bytebase.v1.CreateUserRequest\x1a\x11.bytebase.v1.User\"9\xdaA\x04user\x8a\xea0\x0fbb.users.create\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x11:\x04user\"\t/v1/users\x12\x81\x01\n" +
"\n" +
"UpdateUser\x12\x1e.bytebase.v1.UpdateUserRequest\x1a\x11.bytebase.v1.User\"@\xdaA\x10user,update_mask\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02\x1f:\x04user2\x17/v1/{user.name=users/*}\x12o\n" +
"\n" +
diff --git a/backend/generated-go/v1/user_service_equal.pb.go b/backend/generated-go/v1/user_service_equal.pb.go
index 2756ada926..c351f8776d 100644
--- a/backend/generated-go/v1/user_service_equal.pb.go
+++ b/backend/generated-go/v1/user_service_equal.pb.go
@@ -262,5 +262,8 @@ func (x *User) Equal(y *User) bool {
return false
}
}
+ if x.Workspace != y.Workspace {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/user_service_grpc.pb.go b/backend/generated-go/v1/user_service_grpc.pb.go
index abf857d00b..c967c55358 100644
--- a/backend/generated-go/v1/user_service_grpc.pb.go
+++ b/backend/generated-go/v1/user_service_grpc.pb.go
@@ -52,8 +52,9 @@ type UserServiceClient interface {
// Any authenticated user can list users.
// Permissions required: bb.users.list
ListUsers(ctx context.Context, in *ListUsersRequest, opts ...grpc.CallOption) (*ListUsersResponse, error)
- // Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
- // Permissions required: bb.users.create (only when Disallow Signup is enabled)
+ // Creates a user in the caller's workspace (admin action, self-hosted only).
+ // In SaaS mode, admins should add users via workspace IAM policy instead.
+ // Permissions required: bb.users.create
CreateUser(ctx context.Context, in *CreateUserRequest, opts ...grpc.CallOption) (*User, error)
// Updates a user. Users can update their own profile, or users with bb.users.update permission can update any user.
// Note: Email updates are not supported through this API. Use UpdateEmail instead.
@@ -189,8 +190,9 @@ type UserServiceServer interface {
// Any authenticated user can list users.
// Permissions required: bb.users.list
ListUsers(context.Context, *ListUsersRequest) (*ListUsersResponse, error)
- // Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
- // Permissions required: bb.users.create (only when Disallow Signup is enabled)
+ // Creates a user in the caller's workspace (admin action, self-hosted only).
+ // In SaaS mode, admins should add users via workspace IAM policy instead.
+ // Permissions required: bb.users.create
CreateUser(context.Context, *CreateUserRequest) (*User, error)
// Updates a user. Users can update their own profile, or users with bb.users.update permission can update any user.
// Note: Email updates are not supported through this API. Use UpdateEmail instead.
diff --git a/backend/generated-go/v1/v1connect/actuator_service.connect.go b/backend/generated-go/v1/v1connect/actuator_service.connect.go
index acd3c20c8c..57e38dfe28 100644
--- a/backend/generated-go/v1/v1connect/actuator_service.connect.go
+++ b/backend/generated-go/v1/v1connect/actuator_service.connect.go
@@ -46,6 +46,9 @@ const (
// ActuatorServiceGetResourcePackageProcedure is the fully-qualified name of the ActuatorService's
// GetResourcePackage RPC.
ActuatorServiceGetResourcePackageProcedure = "/bytebase.v1.ActuatorService/GetResourcePackage"
+ // ActuatorServiceGetWorkspaceActuatorInfoProcedure is the fully-qualified name of the
+ // ActuatorService's GetWorkspaceActuatorInfo RPC.
+ ActuatorServiceGetWorkspaceActuatorInfoProcedure = "/bytebase.v1.ActuatorService/GetWorkspaceActuatorInfo"
)
// ActuatorServiceClient is a client for the bytebase.v1.ActuatorService service.
@@ -62,6 +65,8 @@ type ActuatorServiceClient interface {
// Gets custom branding resources such as logos.
// Permissions required: None
GetResourcePackage(context.Context, *connect.Request[v1.GetResourcePackageRequest]) (*connect.Response[v1.ResourcePackage], error)
+ // Gets workspace-scoped actuator info. Requires authentication.
+ GetWorkspaceActuatorInfo(context.Context, *connect.Request[v1.GetWorkspaceActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
}
// NewActuatorServiceClient constructs a client for the bytebase.v1.ActuatorService service. By
@@ -99,15 +104,22 @@ func NewActuatorServiceClient(httpClient connect.HTTPClient, baseURL string, opt
connect.WithSchema(actuatorServiceMethods.ByName("GetResourcePackage")),
connect.WithClientOptions(opts...),
),
+ getWorkspaceActuatorInfo: connect.NewClient[v1.GetWorkspaceActuatorInfoRequest, v1.ActuatorInfo](
+ httpClient,
+ baseURL+ActuatorServiceGetWorkspaceActuatorInfoProcedure,
+ connect.WithSchema(actuatorServiceMethods.ByName("GetWorkspaceActuatorInfo")),
+ connect.WithClientOptions(opts...),
+ ),
}
}
// actuatorServiceClient implements ActuatorServiceClient.
type actuatorServiceClient struct {
- getActuatorInfo *connect.Client[v1.GetActuatorInfoRequest, v1.ActuatorInfo]
- setupSample *connect.Client[v1.SetupSampleRequest, emptypb.Empty]
- deleteCache *connect.Client[v1.DeleteCacheRequest, emptypb.Empty]
- getResourcePackage *connect.Client[v1.GetResourcePackageRequest, v1.ResourcePackage]
+ getActuatorInfo *connect.Client[v1.GetActuatorInfoRequest, v1.ActuatorInfo]
+ setupSample *connect.Client[v1.SetupSampleRequest, emptypb.Empty]
+ deleteCache *connect.Client[v1.DeleteCacheRequest, emptypb.Empty]
+ getResourcePackage *connect.Client[v1.GetResourcePackageRequest, v1.ResourcePackage]
+ getWorkspaceActuatorInfo *connect.Client[v1.GetWorkspaceActuatorInfoRequest, v1.ActuatorInfo]
}
// GetActuatorInfo calls bytebase.v1.ActuatorService.GetActuatorInfo.
@@ -130,6 +142,11 @@ func (c *actuatorServiceClient) GetResourcePackage(ctx context.Context, req *con
return c.getResourcePackage.CallUnary(ctx, req)
}
+// GetWorkspaceActuatorInfo calls bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo.
+func (c *actuatorServiceClient) GetWorkspaceActuatorInfo(ctx context.Context, req *connect.Request[v1.GetWorkspaceActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error) {
+ return c.getWorkspaceActuatorInfo.CallUnary(ctx, req)
+}
+
// ActuatorServiceHandler is an implementation of the bytebase.v1.ActuatorService service.
type ActuatorServiceHandler interface {
// Gets system information and health status of the Bytebase instance.
@@ -144,6 +161,8 @@ type ActuatorServiceHandler interface {
// Gets custom branding resources such as logos.
// Permissions required: None
GetResourcePackage(context.Context, *connect.Request[v1.GetResourcePackageRequest]) (*connect.Response[v1.ResourcePackage], error)
+ // Gets workspace-scoped actuator info. Requires authentication.
+ GetWorkspaceActuatorInfo(context.Context, *connect.Request[v1.GetWorkspaceActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
}
// NewActuatorServiceHandler builds an HTTP handler from the service implementation. It returns the
@@ -177,6 +196,12 @@ func NewActuatorServiceHandler(svc ActuatorServiceHandler, opts ...connect.Handl
connect.WithSchema(actuatorServiceMethods.ByName("GetResourcePackage")),
connect.WithHandlerOptions(opts...),
)
+ actuatorServiceGetWorkspaceActuatorInfoHandler := connect.NewUnaryHandler(
+ ActuatorServiceGetWorkspaceActuatorInfoProcedure,
+ svc.GetWorkspaceActuatorInfo,
+ connect.WithSchema(actuatorServiceMethods.ByName("GetWorkspaceActuatorInfo")),
+ connect.WithHandlerOptions(opts...),
+ )
return "/bytebase.v1.ActuatorService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case ActuatorServiceGetActuatorInfoProcedure:
@@ -187,6 +212,8 @@ func NewActuatorServiceHandler(svc ActuatorServiceHandler, opts ...connect.Handl
actuatorServiceDeleteCacheHandler.ServeHTTP(w, r)
case ActuatorServiceGetResourcePackageProcedure:
actuatorServiceGetResourcePackageHandler.ServeHTTP(w, r)
+ case ActuatorServiceGetWorkspaceActuatorInfoProcedure:
+ actuatorServiceGetWorkspaceActuatorInfoHandler.ServeHTTP(w, r)
default:
http.NotFound(w, r)
}
@@ -211,3 +238,7 @@ func (UnimplementedActuatorServiceHandler) DeleteCache(context.Context, *connect
func (UnimplementedActuatorServiceHandler) GetResourcePackage(context.Context, *connect.Request[v1.GetResourcePackageRequest]) (*connect.Response[v1.ResourcePackage], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.ActuatorService.GetResourcePackage is not implemented"))
}
+
+func (UnimplementedActuatorServiceHandler) GetWorkspaceActuatorInfo(context.Context, *connect.Request[v1.GetWorkspaceActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error) {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo is not implemented"))
+}
diff --git a/backend/generated-go/v1/v1connect/auth_service.connect.go b/backend/generated-go/v1/v1connect/auth_service.connect.go
index 0a60628baf..b3f225dd21 100644
--- a/backend/generated-go/v1/v1connect/auth_service.connect.go
+++ b/backend/generated-go/v1/v1connect/auth_service.connect.go
@@ -41,6 +41,8 @@ const (
// AuthServiceExchangeTokenProcedure is the fully-qualified name of the AuthService's ExchangeToken
// RPC.
AuthServiceExchangeTokenProcedure = "/bytebase.v1.AuthService/ExchangeToken"
+ // AuthServiceSignupProcedure is the fully-qualified name of the AuthService's Signup RPC.
+ AuthServiceSignupProcedure = "/bytebase.v1.AuthService/Signup"
// AuthServiceRefreshProcedure is the fully-qualified name of the AuthService's Refresh RPC.
AuthServiceRefreshProcedure = "/bytebase.v1.AuthService/Refresh"
)
@@ -57,6 +59,11 @@ type AuthServiceClient interface {
// Used by CI/CD pipelines with Workload Identity Federation.
// Permissions required: None (validates via OIDC token)
ExchangeToken(context.Context, *connect.Request[v1.ExchangeTokenRequest]) (*connect.Response[v1.ExchangeTokenResponse], error)
+ // Registers a new user account. Creates a principal and assigns a workspace:
+ // - If the user's email was pre-invited to a workspace, joins that workspace.
+ // - Otherwise, creates a new workspace with the user as admin.
+ // Returns access tokens so the user is logged in immediately after signup.
+ Signup(context.Context, *connect.Request[v1.SignupRequest]) (*connect.Response[v1.LoginResponse], error)
// Refreshes the access token using the refresh token cookie.
// Permissions required: None (validates via refresh token cookie)
Refresh(context.Context, *connect.Request[v1.RefreshRequest]) (*connect.Response[v1.RefreshResponse], error)
@@ -91,6 +98,12 @@ func NewAuthServiceClient(httpClient connect.HTTPClient, baseURL string, opts ..
connect.WithSchema(authServiceMethods.ByName("ExchangeToken")),
connect.WithClientOptions(opts...),
),
+ signup: connect.NewClient[v1.SignupRequest, v1.LoginResponse](
+ httpClient,
+ baseURL+AuthServiceSignupProcedure,
+ connect.WithSchema(authServiceMethods.ByName("Signup")),
+ connect.WithClientOptions(opts...),
+ ),
refresh: connect.NewClient[v1.RefreshRequest, v1.RefreshResponse](
httpClient,
baseURL+AuthServiceRefreshProcedure,
@@ -105,6 +118,7 @@ type authServiceClient struct {
login *connect.Client[v1.LoginRequest, v1.LoginResponse]
logout *connect.Client[v1.LogoutRequest, emptypb.Empty]
exchangeToken *connect.Client[v1.ExchangeTokenRequest, v1.ExchangeTokenResponse]
+ signup *connect.Client[v1.SignupRequest, v1.LoginResponse]
refresh *connect.Client[v1.RefreshRequest, v1.RefreshResponse]
}
@@ -123,6 +137,11 @@ func (c *authServiceClient) ExchangeToken(ctx context.Context, req *connect.Requ
return c.exchangeToken.CallUnary(ctx, req)
}
+// Signup calls bytebase.v1.AuthService.Signup.
+func (c *authServiceClient) Signup(ctx context.Context, req *connect.Request[v1.SignupRequest]) (*connect.Response[v1.LoginResponse], error) {
+ return c.signup.CallUnary(ctx, req)
+}
+
// Refresh calls bytebase.v1.AuthService.Refresh.
func (c *authServiceClient) Refresh(ctx context.Context, req *connect.Request[v1.RefreshRequest]) (*connect.Response[v1.RefreshResponse], error) {
return c.refresh.CallUnary(ctx, req)
@@ -140,6 +159,11 @@ type AuthServiceHandler interface {
// Used by CI/CD pipelines with Workload Identity Federation.
// Permissions required: None (validates via OIDC token)
ExchangeToken(context.Context, *connect.Request[v1.ExchangeTokenRequest]) (*connect.Response[v1.ExchangeTokenResponse], error)
+ // Registers a new user account. Creates a principal and assigns a workspace:
+ // - If the user's email was pre-invited to a workspace, joins that workspace.
+ // - Otherwise, creates a new workspace with the user as admin.
+ // Returns access tokens so the user is logged in immediately after signup.
+ Signup(context.Context, *connect.Request[v1.SignupRequest]) (*connect.Response[v1.LoginResponse], error)
// Refreshes the access token using the refresh token cookie.
// Permissions required: None (validates via refresh token cookie)
Refresh(context.Context, *connect.Request[v1.RefreshRequest]) (*connect.Response[v1.RefreshResponse], error)
@@ -170,6 +194,12 @@ func NewAuthServiceHandler(svc AuthServiceHandler, opts ...connect.HandlerOption
connect.WithSchema(authServiceMethods.ByName("ExchangeToken")),
connect.WithHandlerOptions(opts...),
)
+ authServiceSignupHandler := connect.NewUnaryHandler(
+ AuthServiceSignupProcedure,
+ svc.Signup,
+ connect.WithSchema(authServiceMethods.ByName("Signup")),
+ connect.WithHandlerOptions(opts...),
+ )
authServiceRefreshHandler := connect.NewUnaryHandler(
AuthServiceRefreshProcedure,
svc.Refresh,
@@ -184,6 +214,8 @@ func NewAuthServiceHandler(svc AuthServiceHandler, opts ...connect.HandlerOption
authServiceLogoutHandler.ServeHTTP(w, r)
case AuthServiceExchangeTokenProcedure:
authServiceExchangeTokenHandler.ServeHTTP(w, r)
+ case AuthServiceSignupProcedure:
+ authServiceSignupHandler.ServeHTTP(w, r)
case AuthServiceRefreshProcedure:
authServiceRefreshHandler.ServeHTTP(w, r)
default:
@@ -207,6 +239,10 @@ func (UnimplementedAuthServiceHandler) ExchangeToken(context.Context, *connect.R
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.AuthService.ExchangeToken is not implemented"))
}
+func (UnimplementedAuthServiceHandler) Signup(context.Context, *connect.Request[v1.SignupRequest]) (*connect.Response[v1.LoginResponse], error) {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.AuthService.Signup is not implemented"))
+}
+
func (UnimplementedAuthServiceHandler) Refresh(context.Context, *connect.Request[v1.RefreshRequest]) (*connect.Response[v1.RefreshResponse], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.AuthService.Refresh is not implemented"))
}
diff --git a/backend/generated-go/v1/v1connect/user_service.connect.go b/backend/generated-go/v1/v1connect/user_service.connect.go
index 85a258942b..1ac316a536 100644
--- a/backend/generated-go/v1/v1connect/user_service.connect.go
+++ b/backend/generated-go/v1/v1connect/user_service.connect.go
@@ -74,8 +74,9 @@ type UserServiceClient interface {
// Any authenticated user can list users.
// Permissions required: bb.users.list
ListUsers(context.Context, *connect.Request[v1.ListUsersRequest]) (*connect.Response[v1.ListUsersResponse], error)
- // Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
- // Permissions required: bb.users.create (only when Disallow Signup is enabled)
+ // Creates a user in the caller's workspace (admin action, self-hosted only).
+ // In SaaS mode, admins should add users via workspace IAM policy instead.
+ // Permissions required: bb.users.create
CreateUser(context.Context, *connect.Request[v1.CreateUserRequest]) (*connect.Response[v1.User], error)
// Updates a user. Users can update their own profile, or users with bb.users.update permission can update any user.
// Note: Email updates are not supported through this API. Use UpdateEmail instead.
@@ -235,8 +236,9 @@ type UserServiceHandler interface {
// Any authenticated user can list users.
// Permissions required: bb.users.list
ListUsers(context.Context, *connect.Request[v1.ListUsersRequest]) (*connect.Response[v1.ListUsersResponse], error)
- // Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
- // Permissions required: bb.users.create (only when Disallow Signup is enabled)
+ // Creates a user in the caller's workspace (admin action, self-hosted only).
+ // In SaaS mode, admins should add users via workspace IAM policy instead.
+ // Permissions required: bb.users.create
CreateUser(context.Context, *connect.Request[v1.CreateUserRequest]) (*connect.Response[v1.User], error)
// Updates a user. Users can update their own profile, or users with bb.users.update permission can update any user.
// Note: Email updates are not supported through this API. Use UpdateEmail instead.
diff --git a/backend/migrator/migration/3.17/0009##add_workspace_table.sql b/backend/migrator/migration/3.17/0009##add_workspace_table.sql
index c06f40705e..d04d4c0fd7 100644
--- a/backend/migrator/migration/3.17/0009##add_workspace_table.sql
+++ b/backend/migrator/migration/3.17/0009##add_workspace_table.sql
@@ -1,126 +1,104 @@
--- Step 02: Create workspace table, add workspace to root tables, update indexes.
+-- Step 02: Create server_config, workspace table, add workspace to root tables, update indexes.
+
+------------------------------
+-- 0. Create server_config and migrate auth_secret from setting
+------------------------------
+CREATE TABLE IF NOT EXISTS server_config (
+ -- Stored as ServerConfigPayload (proto/store/store/server_config.proto)
+ payload jsonb NOT NULL DEFAULT '{}'
+);
+
+-- Migrate auth_secret from SYSTEM setting to server_config (only if empty).
+INSERT INTO server_config (payload)
+SELECT json_build_object('authSecret', COALESCE(value->>'authSecret', ''))
+FROM setting
+WHERE name = 'SYSTEM'
+ AND NOT EXISTS (SELECT 1 FROM server_config)
+LIMIT 1;
------------------------------
-- 1. Create workspace table
------------------------------
-CREATE TABLE workspace (
+CREATE TABLE IF NOT EXISTS workspace (
resource_id text PRIMARY KEY,
name text NOT NULL,
created_at timestamptz NOT NULL DEFAULT now(),
deleted boolean NOT NULL DEFAULT FALSE
);
--- Seed the default workspace from the existing SYSTEM setting.
+-- Seed the default workspace from the existing SYSTEM setting (only if no workspace exists).
INSERT INTO workspace (resource_id, name)
SELECT
COALESCE(NULLIF(value->>'workspaceId', ''), gen_random_uuid()::text),
'Default Workspace'
FROM setting
-WHERE name = 'SYSTEM';
+WHERE name = 'SYSTEM'
+ AND NOT EXISTS (SELECT 1 FROM workspace)
+LIMIT 1;
----------------------------------------------
--- 2. Add workspace to 12 root tables
+-- 2. Add workspace to root tables
----------------------------------------------
-
--- project
-ALTER TABLE project ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE project SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE project ALTER COLUMN workspace SET NOT NULL;
-
--- instance
-ALTER TABLE instance ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE instance SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE instance ALTER COLUMN workspace SET NOT NULL;
-
--- setting
-ALTER TABLE setting ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE setting SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE setting ALTER COLUMN workspace SET NOT NULL;
-
--- policy
-ALTER TABLE policy ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE policy SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE policy ALTER COLUMN workspace SET NOT NULL;
-
--- role
-ALTER TABLE role ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE role SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE role ALTER COLUMN workspace SET NOT NULL;
-
--- idp
-ALTER TABLE idp ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE idp SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE idp ALTER COLUMN workspace SET NOT NULL;
-
--- review_config
-ALTER TABLE review_config ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE review_config SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE review_config ALTER COLUMN workspace SET NOT NULL;
-
--- user_group
-ALTER TABLE user_group ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE user_group SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE user_group ALTER COLUMN workspace SET NOT NULL;
-
--- export_archive
-ALTER TABLE export_archive ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE export_archive SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE export_archive ALTER COLUMN workspace SET NOT NULL;
-
--- audit_log
-ALTER TABLE audit_log ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE audit_log SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE audit_log ALTER COLUMN workspace SET NOT NULL;
-
--- service_account
-ALTER TABLE service_account ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE service_account SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE service_account ALTER COLUMN workspace SET NOT NULL;
-
--- workload_identity
-ALTER TABLE workload_identity ADD COLUMN workspace text REFERENCES workspace(resource_id);
-UPDATE workload_identity SET workspace = (SELECT resource_id FROM workspace LIMIT 1);
-ALTER TABLE workload_identity ALTER COLUMN workspace SET NOT NULL;
+-- Add workspace column to root tables using NOT NULL DEFAULT to avoid table rewrite.
+-- PostgreSQL 11+ stores the default in pg_attribute — instant for large tables like audit_log.
+DO $$
+DECLARE
+ t text;
+ ws_id text;
+BEGIN
+ SELECT resource_id INTO ws_id FROM workspace LIMIT 1;
+ IF ws_id IS NULL THEN
+ RAISE EXCEPTION 'no workspace found';
+ END IF;
+
+ FOREACH t IN ARRAY ARRAY[
+ 'project', 'instance', 'setting', 'policy', 'role', 'idp',
+ 'review_config', 'user_group', 'export_archive', 'audit_log',
+ 'service_account', 'workload_identity', 'oauth2_client'
+ ] LOOP
+ IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = t AND column_name = 'workspace') THEN
+ -- ADD COLUMN ... NOT NULL DEFAULT is instant in PG11+ (no table rewrite).
+ EXECUTE format('ALTER TABLE %I ADD COLUMN workspace text NOT NULL DEFAULT %L', t, ws_id);
+ -- Add FK constraint separately (doesn't require table rewrite).
+ EXECUTE format('ALTER TABLE %I ADD CONSTRAINT %I FOREIGN KEY (workspace) REFERENCES workspace(resource_id)', t, t || '_workspace_fkey');
+ -- Remove the default so future inserts must provide workspace explicitly.
+ EXECUTE format('ALTER TABLE %I ALTER COLUMN workspace DROP DEFAULT', t);
+ END IF;
+ END LOOP;
+END $$;
----------------------------------------------
-- 3. Update unique indexes
----------------------------------------------
--- Current PKs (resource_id, name, email) already enforce global uniqueness.
--- These composite unique indexes prepare for multi-workspace where uniqueness
--- will be workspace-scoped (after a future PK migration).
-
--- project
-CREATE UNIQUE INDEX idx_project_unique_workspace_resource_id ON project(workspace, resource_id);
-
--- instance
-CREATE UNIQUE INDEX idx_instance_unique_workspace_resource_id ON instance(workspace, resource_id);
-
--- setting
-CREATE UNIQUE INDEX idx_setting_unique_workspace_name ON setting(workspace, name);
-
--- role
-CREATE UNIQUE INDEX idx_role_unique_workspace_resource_id ON role(workspace, resource_id);
+-- PKs (resource_id) are already globally unique — no composite unique index needed for
+-- project, instance, role, idp.
+-- Only tables where the PK is NOT the resource_id need workspace-scoped unique indexes.
--- idp
-CREATE UNIQUE INDEX idx_idp_unique_workspace_resource_id ON idp(workspace, resource_id);
+-- setting: PK is name, need workspace-scoped uniqueness
+CREATE UNIQUE INDEX IF NOT EXISTS idx_setting_unique_workspace_name ON setting(workspace, name);
-- user_group: replace existing email unique index with workspace-scoped one
-DROP INDEX idx_user_group_unique_email;
-CREATE UNIQUE INDEX idx_user_group_unique_email ON user_group(workspace, email) WHERE email IS NOT NULL;
+DROP INDEX IF EXISTS idx_user_group_unique_email;
+CREATE UNIQUE INDEX IF NOT EXISTS idx_user_group_unique_email ON user_group(workspace, email) WHERE email IS NOT NULL;
-- service_account
-CREATE UNIQUE INDEX idx_service_account_unique_workspace_email ON service_account(workspace, email);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_service_account_unique_workspace_email ON service_account(workspace, email);
-- workload_identity
-CREATE UNIQUE INDEX idx_workload_identity_unique_workspace_email ON workload_identity(workspace, email);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_workload_identity_unique_workspace_email ON workload_identity(workspace, email);
----------------------------------------------
-- 4. Workspace query performance indexes
----------------------------------------------
-CREATE INDEX idx_project_workspace ON project(workspace);
-CREATE INDEX idx_instance_workspace ON instance(workspace);
-CREATE INDEX idx_setting_workspace ON setting(workspace);
-CREATE INDEX idx_policy_workspace ON policy(workspace);
-CREATE INDEX idx_audit_log_workspace ON audit_log(workspace);
-CREATE INDEX idx_service_account_workspace ON service_account(workspace);
-CREATE INDEX idx_workload_identity_workspace ON workload_identity(workspace);
+CREATE INDEX IF NOT EXISTS idx_project_workspace ON project(workspace);
+CREATE INDEX IF NOT EXISTS idx_instance_workspace ON instance(workspace);
+CREATE INDEX IF NOT EXISTS idx_setting_workspace ON setting(workspace);
+CREATE INDEX IF NOT EXISTS idx_policy_workspace ON policy(workspace);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_policy_unique_workspace_resource ON policy(workspace, resource_type, resource, type);
+-- Replace separate workspace and created_at indexes with a composite index.
+DROP INDEX IF EXISTS idx_audit_log_workspace;
+DROP INDEX IF EXISTS idx_audit_log_created_at;
+CREATE INDEX IF NOT EXISTS idx_audit_log_workspace_created_at ON audit_log(workspace, created_at DESC);
+CREATE INDEX IF NOT EXISTS idx_service_account_workspace ON service_account(workspace);
+CREATE INDEX IF NOT EXISTS idx_workload_identity_workspace ON workload_identity(workspace);
+CREATE INDEX IF NOT EXISTS idx_oauth2_client_workspace ON oauth2_client(workspace);
diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sql
index 6080d5478f..a0f9b03725 100644
--- a/backend/migrator/migration/LATEST.sql
+++ b/backend/migrator/migration/LATEST.sql
@@ -3,6 +3,12 @@
-- We will use the IAM policy to list the principal's workspaces.
-----------------------
+-- Global server configuration (single row, not workspace-scoped).
+CREATE TABLE server_config (
+ -- Stored as ServerConfigPayload (proto/store/store/server_config.proto)
+ payload jsonb NOT NULL DEFAULT '{}'
+);
+
CREATE TABLE workspace (
resource_id text PRIMARY KEY,
name text NOT NULL,
@@ -58,8 +64,6 @@ CREATE TABLE role (
payload jsonb NOT NULL DEFAULT '{}'
);
-CREATE UNIQUE INDEX idx_role_unique_workspace_resource_id ON role(workspace, resource_id);
-
-- Policy
-- policy stores the policies for each resources.
CREATE TABLE policy (
@@ -87,6 +91,7 @@ CREATE TABLE policy (
);
CREATE INDEX idx_policy_workspace ON policy(workspace);
+CREATE UNIQUE INDEX idx_policy_unique_workspace_resource ON policy(workspace, resource_type, resource, type);
-- idp stores generic identity provider.
CREATE TABLE idp (
@@ -100,8 +105,6 @@ CREATE TABLE idp (
config jsonb NOT NULL DEFAULT '{}'
);
-CREATE UNIQUE INDEX idx_idp_unique_workspace_resource_id ON idp(workspace, resource_id);
-
CREATE TABLE user_group (
id text PRIMARY KEY DEFAULT gen_random_uuid()::text,
workspace text NOT NULL REFERENCES workspace(resource_id),
@@ -132,8 +135,9 @@ CREATE TABLE audit_log (
payload jsonb NOT NULL DEFAULT '{}'
);
-CREATE INDEX idx_audit_log_workspace ON audit_log(workspace);
-CREATE INDEX idx_audit_log_created_at ON audit_log(created_at);
+-- Composite index for the most common query: filter by workspace, order/range by time.
+CREATE INDEX idx_audit_log_workspace_created_at ON audit_log(workspace, created_at DESC);
+-- JSONB indexes for filtering by specific fields within a workspace.
CREATE INDEX idx_audit_log_payload_parent ON audit_log((payload->>'parent'));
CREATE INDEX idx_audit_log_payload_method ON audit_log((payload->>'method'));
CREATE INDEX idx_audit_log_payload_resource ON audit_log((payload->>'resource'));
@@ -161,7 +165,6 @@ CREATE TABLE project (
setting jsonb NOT NULL DEFAULT '{}'
);
-CREATE UNIQUE INDEX idx_project_unique_workspace_resource_id ON project(workspace, resource_id);
CREATE INDEX idx_project_workspace ON project(workspace);
-- service_account
@@ -405,7 +408,6 @@ CREATE TABLE instance (
metadata jsonb NOT NULL DEFAULT '{}'
);
-CREATE UNIQUE INDEX idx_instance_unique_workspace_resource_id ON instance(workspace, resource_id);
CREATE INDEX idx_instance_workspace ON instance(workspace);
CREATE INDEX idx_instance_metadata_engine ON instance((metadata->>'engine'));
@@ -564,6 +566,7 @@ CREATE TABLE task_run_log (
CREATE TABLE oauth2_client (
client_id text PRIMARY KEY,
+ workspace text NOT NULL REFERENCES workspace(resource_id),
client_secret_hash text NOT NULL,
config jsonb NOT NULL,
last_active_at timestamptz NOT NULL DEFAULT now()
@@ -587,6 +590,7 @@ CREATE TABLE oauth2_refresh_token (
CREATE INDEX idx_oauth2_authorization_code_expires_at ON oauth2_authorization_code(expires_at);
CREATE INDEX idx_oauth2_refresh_token_expires_at ON oauth2_refresh_token(expires_at);
CREATE INDEX idx_oauth2_client_last_active_at ON oauth2_client(last_active_at);
+CREATE INDEX idx_oauth2_client_workspace ON oauth2_client(workspace);
-- Web refresh tokens for session management
CREATE TABLE web_refresh_token (
@@ -602,37 +606,17 @@ CREATE INDEX idx_web_refresh_token_expires_at ON web_refresh_token(expires_at);
-- Seed data
-----------------------
--- Generate a workspace once, then use it everywhere.
+-- Global server config (auth secret only).
+-- Workspace and its settings/policies/project are created by the Go signup flow (store.CreateWorkspace).
DO $$
DECLARE
- ws_id text := gen_random_uuid()::text;
auth_secret text;
BEGIN
- -- Generate random alphanumeric auth_secret (0-9, a-z, A-Z) compatible with Go's common.RandomString
SELECT string_agg(substr('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', floor(random() * 62 + 1)::int, 1), '')
INTO auth_secret
FROM generate_series(1, 32);
- -- Create the default workspace.
- INSERT INTO workspace (resource_id, name) VALUES (ws_id, 'Default Workspace');
-
- -- Default project.
- INSERT INTO project (name, resource_id, workspace) VALUES ('Default', 'default', ws_id);
-
- -- Initialize settings.
- INSERT INTO setting (name, workspace, value) VALUES ('SYSTEM', ws_id,
- json_build_object('authSecret', auth_secret));
- INSERT INTO setting (name, workspace, value) VALUES ('APP_IM', ws_id, '{}'::jsonb);
- INSERT INTO setting (name, workspace, value) VALUES ('DATA_CLASSIFICATION', ws_id, '{}'::jsonb);
- INSERT INTO setting (name, workspace, value) VALUES ('WORKSPACE_APPROVAL', ws_id,
- '{"rules":[{"template":{"flow":{"roles":["roles/projectOwner"]},"title":"Fallback Rule","description":"Requires project owner approval when no other rules match."},"condition":{"expression":"true"}}]}'::jsonb);
- INSERT INTO setting (name, workspace, value) VALUES ('WORKSPACE_PROFILE', ws_id,
- ('{"enableMetricCollection":true,"directorySyncToken":"' || gen_random_uuid()::text || '","passwordRestriction":{"minLength":8}}')::jsonb);
- INSERT INTO setting (name, workspace, value) VALUES ('ENVIRONMENT', ws_id,
- '{"environments":[{"title":"Test","id":"test"},{"title":"Prod","id":"prod"}]}'::jsonb);
-
- -- Initialize workspace IAM policy — grant workspace member role to allUsers.
- INSERT INTO policy (workspace, resource_type, resource, type, payload, inherit_from_parent, enforce)
- VALUES (ws_id, 'WORKSPACE', 'workspaces/' || ws_id, 'IAM',
- '{"bindings":[{"role":"roles/workspaceMember","members":["allUsers"]}]}', FALSE, TRUE);
+ INSERT INTO server_config (payload) VALUES (
+ json_build_object('authSecret', auth_secret)
+ );
END $$;
diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.go
index ff4a4a8596..1b30dc5cc7 100644
--- a/backend/runner/approval/runner.go
+++ b/backend/runner/approval/runner.go
@@ -64,7 +64,14 @@ func (r *Runner) Run(ctx context.Context, wg *sync.WaitGroup) {
// This is a utility function that can be called synchronously (from issue creation)
// or asynchronously (from the event handler).
func FindAndApplyApprovalTemplate(ctx context.Context, stores *store.Store, webhookManager *webhook.Manager, licenseService *enterprise.LicenseService, issue *store.IssueMessage) error {
- approvalSetting, err := stores.GetWorkspaceApprovalSetting(ctx)
+ project, err := stores.GetProjectByResourceID(ctx, issue.ProjectID)
+ if err != nil {
+ return errors.Wrap(err, "failed to get project")
+ }
+ if project == nil {
+ return errors.Errorf("project %s not found", issue.ProjectID)
+ }
+ approvalSetting, err := stores.GetWorkspaceApprovalSetting(ctx, project.Workspace)
if err != nil {
return errors.Wrap(err, "failed to get workspace approval setting")
}
@@ -90,7 +97,16 @@ func (r *Runner) processIssue(ctx context.Context, ref bus.IssueRef) {
return // Issue deleted, nothing to do
}
- approvalSetting, err := r.store.GetWorkspaceApprovalSetting(ctx)
+ project, err := r.store.GetProjectByResourceID(ctx, ref.ProjectID)
+ if err != nil {
+ slog.Error("failed to get project", log.BBError(err))
+ return
+ }
+ if project == nil {
+ slog.Error("project not found", slog.String("project", ref.ProjectID))
+ return
+ }
+ approvalSetting, err := r.store.GetWorkspaceApprovalSetting(ctx, project.Workspace)
if err != nil {
slog.Error("failed to get workspace approval setting", log.BBError(err))
return
@@ -138,7 +154,7 @@ func findApprovalTemplateForIssue(ctx context.Context, stores *store.Store, webh
return nil
}
- project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ project, err := stores.GetProjectByResourceID(ctx, issue.ProjectID)
if err != nil {
return errors.Wrap(err, "failed to get project")
}
@@ -148,7 +164,7 @@ func findApprovalTemplateForIssue(ctx context.Context, stores *store.Store, webh
approvalTemplate, celVarsList, done, err := func() (*storepb.ApprovalTemplate, []map[string]any, bool, error) {
// no need to find if feature is not enabled
- if licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_APPROVAL_WORKFLOW) != nil {
+ if licenseService.IsFeatureEnabled(ctx, project.Workspace, v1pb.PlanFeature_FEATURE_APPROVAL_WORKFLOW) != nil {
// nolint:nilerr
return nil, nil, true, nil
}
@@ -694,7 +710,14 @@ func buildCELVariablesForRoleGrant(ctx context.Context, stores *store.Store, iss
// If no specific databases, create one entry per environment
if len(factors.Databases) == 0 {
- environments, err := stores.GetEnvironment(ctx)
+ issueProject, err := stores.GetProjectByResourceID(ctx, issue.ProjectID)
+ if err != nil {
+ return nil, false, err
+ }
+ if issueProject == nil {
+ return nil, false, errors.Errorf("project %s not found", issue.ProjectID)
+ }
+ environments, err := stores.GetEnvironment(ctx, issueProject.Workspace)
if err != nil {
return nil, false, err
}
@@ -917,20 +940,29 @@ func collectStatementTypes(celVarsList []map[string]any) []string {
// for the given project. It queries both project and workspace IAM policies.
// Only returns END_USER type principals (excludes service accounts, system bots, etc).
func getApproversForRole(ctx context.Context, stores *store.Store, projectID string, role string) ([]webhook.User, error) {
+ // Get project to determine workspace
+ project, err := stores.GetProjectByResourceID(ctx, projectID)
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to get project")
+ }
+ if project == nil {
+ return nil, errors.Errorf("project %s not found", projectID)
+ }
+
// Get project IAM policy
- projectIAM, err := stores.GetProjectIamPolicy(ctx, projectID)
+ projectIAM, err := stores.GetProjectIamPolicy(ctx, project.Workspace, projectID)
if err != nil {
return nil, errors.Wrap(err, "failed to get project IAM policy")
}
// Get workspace IAM policy
- workspaceIAM, err := stores.GetWorkspaceIamPolicy(ctx)
+ workspaceIAM, err := stores.GetWorkspaceIamPolicy(ctx, project.Workspace)
if err != nil {
return nil, errors.Wrap(err, "failed to get workspace IAM policy")
}
// Get all users with the specified role
- users := utils.GetUsersByRoleInIAMPolicy(ctx, stores, role, projectIAM.Policy, workspaceIAM.Policy)
+ users := utils.GetUsersByRoleInIAMPolicy(ctx, stores, project.Workspace, role, projectIAM.Policy, workspaceIAM.Policy)
// Convert to webhook.User format, filtering by END_USER principal type
approvers := make([]webhook.User, 0, len(users))
@@ -961,7 +993,7 @@ func NotifyApprovalRequested(ctx context.Context, stores *store.Store, webhookMa
}
// Get issue creator as actor
- creator, err := stores.GetPrincipalByEmail(ctx, issue.CreatorEmail)
+ creatorAccount, err := stores.GetAccountByEmail(ctx, issue.CreatorEmail)
if err != nil {
slog.Warn("failed to get issue creator", log.BBError(err))
return
@@ -980,8 +1012,8 @@ func NotifyApprovalRequested(ctx context.Context, stores *store.Store, webhookMa
Project: webhook.NewProject(project),
ApprovalRequested: &webhook.EventIssueApprovalRequested{
Creator: &webhook.User{
- Name: creator.Name,
- Email: creator.Email,
+ Name: creatorAccount.Name,
+ Email: creatorAccount.Email,
},
Issue: webhook.NewIssue(issue),
Approvers: approvers,
diff --git a/backend/runner/cleaner/data_cleaner.go b/backend/runner/cleaner/data_cleaner.go
index 23e9e94ef4..21c06fdda7 100644
--- a/backend/runner/cleaner/data_cleaner.go
+++ b/backend/runner/cleaner/data_cleaner.go
@@ -116,7 +116,7 @@ func (c *DataCleaner) cleanupStaleHeartbeats(ctx context.Context) {
}
func (c *DataCleaner) cleanupExportArchives(ctx context.Context) {
- rowsAffected, err := c.store.DeleteExpiredExportArchives(ctx, exportArchiveRetentionPeriod)
+ rowsAffected, err := c.store.DeleteExpiredExportArchivesAll(ctx, exportArchiveRetentionPeriod)
if err != nil {
slog.Error("Failed to clean up expired export archives", log.BBError(err))
return
diff --git a/backend/runner/plancheck/ghost_sync_executor.go b/backend/runner/plancheck/ghost_sync_executor.go
index af9e9b2760..d8b7398def 100644
--- a/backend/runner/plancheck/ghost_sync_executor.go
+++ b/backend/runner/plancheck/ghost_sync_executor.go
@@ -68,7 +68,7 @@ func (e *GhostSyncExecutor) RunForTarget(ctx context.Context, target *CheckTarge
return nil, errors.Wrapf(err, "failed to parse target %s", target.Target)
}
- instance, err := e.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})
+ instance, err := e.store.GetInstanceByResourceID(ctx, instanceID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get instance %s", instanceID)
}
diff --git a/backend/runner/plancheck/scheduler.go b/backend/runner/plancheck/scheduler.go
index e266eee338..77e836cec7 100644
--- a/backend/runner/plancheck/scheduler.go
+++ b/backend/runner/plancheck/scheduler.go
@@ -108,7 +108,7 @@ func (s *Scheduler) runPlanCheckRun(ctx context.Context, projectID string, uid i
return
}
- project, err := s.store.GetProject(ctxWithCancel, &store.FindProjectMessage{ResourceID: &plan.ProjectID})
+ project, err := s.store.GetProjectByResourceID(ctxWithCancel, plan.ProjectID)
if err != nil {
s.markPlanCheckRunFailed(ctxWithCancel, projectID, uid, err.Error())
return
diff --git a/backend/runner/plancheck/statement_advise_executor.go b/backend/runner/plancheck/statement_advise_executor.go
index 7a4dbdcf7d..ec12313b3e 100644
--- a/backend/runner/plancheck/statement_advise_executor.go
+++ b/backend/runner/plancheck/statement_advise_executor.go
@@ -66,7 +66,7 @@ func (e *StatementAdviseExecutor) RunForTarget(ctx context.Context, target *Chec
return nil, errors.Wrapf(err, "failed to parse target %s", target.Target)
}
- instance, err := e.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})
+ instance, err := e.store.GetInstanceByResourceID(ctx, instanceID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get instance %s", instanceID)
}
@@ -120,6 +120,7 @@ func (e *StatementAdviseExecutor) runReview(
enableGhost bool,
) ([]*storepb.PlanCheckRunResult_Result, error) {
dbMetadata, err := e.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -133,7 +134,7 @@ func (e *StatementAdviseExecutor) runReview(
return nil, errors.Errorf("database schema metadata %s not found", database.String())
}
- reviewConfig, err := e.store.GetReviewConfigForDatabase(ctx, database)
+ reviewConfig, err := e.store.GetReviewConfigForDatabase(ctx, instance.Workspace, database)
if err != nil {
if e, ok := err.(*common.Error); ok && e.Code == common.NotFound {
// Continue to check the builtin rules.
@@ -153,7 +154,7 @@ func (e *StatementAdviseExecutor) runReview(
}
finalMetadata := model.NewDatabaseMetadata(clonedMetadata, nil, nil, instance.Metadata.GetEngine(), store.IsObjectCaseSensitive(instance))
- project, err := e.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
+ project, err := e.store.GetProject(ctx, &store.FindProjectMessage{Workspace: instance.Workspace, ResourceID: &database.ProjectID})
if err != nil {
return nil, common.Wrapf(err, common.Internal, "failed to get project")
}
diff --git a/backend/runner/plancheck/statement_report_executor.go b/backend/runner/plancheck/statement_report_executor.go
index 23c384ba97..f9e3b427d0 100644
--- a/backend/runner/plancheck/statement_report_executor.go
+++ b/backend/runner/plancheck/statement_report_executor.go
@@ -71,7 +71,7 @@ func (e *StatementReportExecutor) RunForTarget(ctx context.Context, target *Chec
return nil, errors.Wrapf(err, "failed to parse target %s", target.Target)
}
- instance, err := e.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})
+ instance, err := e.store.GetInstanceByResourceID(ctx, instanceID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get instance %v", instanceID)
}
@@ -136,7 +136,15 @@ func (e *StatementReportExecutor) RunForTarget(ctx context.Context, target *Chec
// GetSQLSummaryReport gets the SQL summary report for the given statement and database.
func GetSQLSummaryReport(ctx context.Context, stores *store.Store, sheetManager *sheet.Manager, dbFactory *dbfactory.DBFactory, database *store.DatabaseMessage, statement string) (*storepb.PlanCheckRunResult_Result_SqlSummaryReport, error) {
+ instance, err := stores.GetInstanceByResourceID(ctx, database.InstanceID)
+ if err != nil {
+ return nil, err
+ }
+ if instance == nil {
+ return nil, errors.Errorf("instance not found: %s", database.InstanceID)
+ }
databaseSchema, err := stores.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
@@ -149,13 +157,6 @@ func GetSQLSummaryReport(ctx context.Context, stores *store.Store, sheetManager
if databaseSchema.GetProto() == nil {
return nil, errors.Errorf("database schema metadata %s not found", database.String())
}
- instance, err := stores.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})
- if err != nil {
- return nil, err
- }
- if instance == nil {
- return nil, errors.Errorf("instance not found: %s", database.InstanceID)
- }
stmts, syntaxAdvices := sheetManager.GetStatementsForChecks(instance.Metadata.GetEngine(), statement)
if len(syntaxAdvices) > 0 {
@@ -167,7 +168,7 @@ func GetSQLSummaryReport(ctx context.Context, stores *store.Store, sheetManager
var explainCalculator getAffectedRowsFromExplain
var sqlTypes []storepb.StatementType
var defaultSchema string
- project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{Workspace: instance.Workspace, ResourceID: &database.ProjectID})
if err != nil {
return nil, err
}
diff --git a/backend/runner/schemasync/syncer.go b/backend/runner/schemasync/syncer.go
index 361b18259c..167660a0a1 100644
--- a/backend/runner/schemasync/syncer.go
+++ b/backend/runner/schemasync/syncer.go
@@ -89,7 +89,7 @@ func (s *Syncer) Run(ctx context.Context, wg *sync.WaitGroup) {
slog.Warn("Database sync checker skipped due to HA license restriction", log.BBError(err))
continue
}
- instances, err := s.store.ListInstances(ctx, &store.FindInstanceMessage{})
+ instances, err := s.store.ListAllInstances(ctx, false)
if err != nil {
slog.Error("Failed to list instance", log.BBError(err))
return
@@ -170,7 +170,7 @@ func (s *Syncer) trySyncAll(ctx context.Context) {
}()
wp := pool.New().WithMaxGoroutines(MaximumOutstanding)
- instances, err := s.store.ListInstances(ctx, &store.FindInstanceMessage{})
+ instances, err := s.store.ListAllInstances(ctx, false)
if err != nil {
slog.Error("Failed to retrieve instances", log.BBError(err))
return
@@ -308,6 +308,7 @@ func (s *Syncer) SyncInstance(ctx context.Context, instance *store.InstanceMessa
updateInstance := &store.UpdateInstanceMessage{
ResourceID: &instance.ResourceID,
+ Workspace: instance.Workspace,
Metadata: metadata,
}
if instanceMeta.Version != instance.Metadata.GetVersion() {
@@ -334,10 +335,14 @@ func (s *Syncer) SyncInstance(ctx context.Context, instance *store.InstanceMessa
if idx < 0 {
// Create the database in the default project.
+ defaultProjectID, err := s.store.GetDefaultProjectID(ctx, instance.Workspace)
+ if err != nil {
+ return nil, nil, nil, errors.Wrapf(err, "failed to get default project ID for instance %q", instance.ResourceID)
+ }
newDatabase, err := s.store.CreateDatabaseDefault(ctx, &store.DatabaseMessage{
InstanceID: instance.ResourceID,
DatabaseName: databaseMetadata.Name,
- ProjectID: common.DefaultProjectID,
+ ProjectID: defaultProjectID,
})
if err != nil {
return nil, nil, nil, errors.Wrapf(err, "failed to create instance %q database %q in sync runner", instance.ResourceID, databaseMetadata.Name)
@@ -367,7 +372,7 @@ func (s *Syncer) SyncInstance(ctx context.Context, instance *store.InstanceMessa
// doSyncDatabaseSchema is the core implementation that syncs the schema for a database and optionally creates a sync history record.
func (s *Syncer) doSyncDatabaseSchema(ctx context.Context, database *store.DatabaseMessage, createSyncHistory bool) (syncHistoryResourceID string, retErr error) {
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})
+ instance, err := s.store.GetInstanceByResourceID(ctx, database.InstanceID)
if err != nil {
return "", errors.Wrapf(err, "failed to get instance %q", database.InstanceID)
}
@@ -393,6 +398,7 @@ func (s *Syncer) doSyncDatabaseSchema(ctx context.Context, database *store.Datab
rawDump := schemaBuf.Bytes()
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
diff --git a/backend/runner/taskrun/data_export_executor.go b/backend/runner/taskrun/data_export_executor.go
index 182ae52103..3e05778c33 100644
--- a/backend/runner/taskrun/data_export_executor.go
+++ b/backend/runner/taskrun/data_export_executor.go
@@ -76,7 +76,7 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,
if database == nil {
return nil, errors.Errorf("database not found")
}
- instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID, ShowDeleted: true})
+ instance, err := exec.store.GetInstanceByResourceID(ctx, database.InstanceID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get instance")
}
@@ -94,16 +94,22 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,
statement := sheet.Statement
dataSource := utils.DataSourceFromInstanceWithType(instance, storepb.DataSourceType_ADMIN)
- creatorUser, err := exec.store.GetPrincipalByEmail(ctx, issue.CreatorEmail)
+ creatorAccount, err := exec.store.GetAccountByEmail(ctx, issue.CreatorEmail)
if err != nil {
return nil, errors.Wrapf(err, "failed to get creator user for issue %d", issue.UID)
}
- if creatorUser == nil {
+ if creatorAccount == nil {
return nil, errors.Errorf("creator user not found for issue %d", issue.UID)
}
// Execute the export without masking.
// For approved DATABASE_EXPORT tasks, the approval itself authorizes access to the data.
+ creatorUser := &store.UserMessage{
+ Email: creatorAccount.Email,
+ Name: creatorAccount.Name,
+ Type: creatorAccount.Type,
+ MemberDeleted: creatorAccount.MemberDeleted,
+ }
bytes, exportErr := exec.executeExport(ctx, instance, database, dataSource, statement, exportConfig.Format, creatorUser)
if exportErr != nil {
slog.Error("failed to export",
@@ -115,12 +121,8 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,
return nil, exportErr
}
- workspace, err := exec.store.GetWorkspace(ctx)
- if err != nil {
- return nil, errors.Wrap(err, "failed to get workspace")
- }
exportArchive, err := exec.store.CreateExportArchive(ctx, &store.ExportArchiveMessage{
- Workspace: workspace.ResourceID,
+ Workspace: instance.Workspace,
Bytes: bytes,
Payload: &storepb.ExportArchivePayload{
FileFormat: exportConfig.Format,
@@ -173,8 +175,8 @@ func (exec *DataExportExecutor) executeExport(
}
// 2. Get query restrictions from workspace policy
- maximumSQLResultSize := exec.getSQLResultSizeLimit(ctx)
- timoutInSeconds := exec.getQueryTimeoutInSeconds(ctx)
+ maximumSQLResultSize := exec.getSQLResultSizeLimit(ctx, instance.Workspace)
+ timoutInSeconds := exec.getQueryTimeoutInSeconds(ctx, instance.Workspace)
// 3. Build query context with limits
queryContext := db.QueryContext{
@@ -214,8 +216,9 @@ func (exec *DataExportExecutor) executeExport(
// getSQLResultSizeLimit gets the sql result size limit.
func (exec *DataExportExecutor) getSQLResultSizeLimit(
ctx context.Context,
+ workspace string,
) int64 {
- maximumResultSize, err := exec.store.GetSQLResultSize(ctx)
+ maximumResultSize, err := exec.store.GetSQLResultSize(ctx, workspace)
if err != nil {
slog.Error("failed to get the sql result size limit", log.BBError(err))
return common.DefaultMaximumSQLResultSize
@@ -226,8 +229,9 @@ func (exec *DataExportExecutor) getSQLResultSizeLimit(
// getQueryTimeoutInSeconds gets the query timeout limit.
func (exec *DataExportExecutor) getQueryTimeoutInSeconds(
ctx context.Context,
+ workspace string,
) int64 {
- timeout, err := exec.store.GetQueryTimeoutInSeconds(ctx)
+ timeout, err := exec.store.GetQueryTimeoutInSeconds(ctx, workspace)
if err != nil {
slog.Error("failed to get the sql timeout limit", log.BBError(err))
return math.MaxInt64
diff --git a/backend/runner/taskrun/database_create_executor.go b/backend/runner/taskrun/database_create_executor.go
index 28119547da..f91675dd4c 100644
--- a/backend/runner/taskrun/database_create_executor.go
+++ b/backend/runner/taskrun/database_create_executor.go
@@ -48,7 +48,7 @@ func (exec *DatabaseCreateExecutor) RunOnce(ctx context.Context, driverCtx conte
return nil, errors.Errorf("empty create database statement")
}
- instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})
+ instance, err := exec.store.GetInstanceByResourceID(ctx, task.InstanceID)
if err != nil {
return nil, err
}
diff --git a/backend/runner/taskrun/database_migrate_executor.go b/backend/runner/taskrun/database_migrate_executor.go
index f8bfde26bc..b3de179157 100644
--- a/backend/runner/taskrun/database_migrate_executor.go
+++ b/backend/runner/taskrun/database_migrate_executor.go
@@ -54,7 +54,7 @@ type DatabaseMigrateExecutor struct {
// RunOnce will run the database migration task executor once.
func (exec *DatabaseMigrateExecutor) RunOnce(ctx context.Context, driverCtx context.Context, task *store.TaskMessage, taskRunUID int64) (*storepb.TaskRunResult, error) {
// Fetch instance, database, and project (common to all migration types)
- instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})
+ instance, err := exec.store.GetInstanceByResourceID(ctx, task.InstanceID)
if err != nil {
return nil, errors.Wrap(err, "failed to get instance")
}
@@ -70,7 +70,7 @@ func (exec *DatabaseMigrateExecutor) RunOnce(ctx context.Context, driverCtx cont
return nil, errors.Errorf("database not found for task %v", task.ID)
}
- project, err := exec.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
+ project, err := exec.store.GetProject(ctx, &store.FindProjectMessage{Workspace: instance.Workspace, ResourceID: &database.ProjectID})
if err != nil {
return nil, errors.Wrapf(err, "failed to get project")
}
@@ -776,7 +776,7 @@ func (exec *DatabaseMigrateExecutor) backupData(
defer backupDriver.Close(driverCtx)
}
- project, err := exec.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})
+ project, err := exec.store.GetProject(ctx, &store.FindProjectMessage{Workspace: instance.Workspace, ResourceID: &database.ProjectID})
if err != nil {
return nil, errors.Wrap(err, "failed to get project")
}
@@ -790,7 +790,7 @@ func (exec *DatabaseMigrateExecutor) backupData(
tc := parserbase.TransformContext{
InstanceID: instance.ResourceID,
- GetDatabaseMetadataFunc: buildGetDatabaseMetadataFunc(exec.store),
+ GetDatabaseMetadataFunc: buildGetDatabaseMetadataFunc(exec.store, instance.Workspace),
ListDatabaseNamesFunc: buildListDatabaseNamesFunc(exec.store),
IsCaseSensitive: store.IsObjectCaseSensitive(instance),
DatabaseName: database.DatabaseName,
@@ -906,7 +906,7 @@ func (exec *DatabaseMigrateExecutor) backupData(
return priorBackupDetail, nil
}
-func buildGetDatabaseMetadataFunc(storeInstance *store.Store) parserbase.GetDatabaseMetadataFunc {
+func buildGetDatabaseMetadataFunc(storeInstance *store.Store, workspace string) parserbase.GetDatabaseMetadataFunc {
return func(ctx context.Context, instanceID, databaseName string) (string, *model.DatabaseMetadata, error) {
database, err := storeInstance.GetDatabase(ctx, &store.FindDatabaseMessage{
InstanceID: &instanceID,
@@ -919,6 +919,7 @@ func buildGetDatabaseMetadataFunc(storeInstance *store.Store) parserbase.GetData
return "", nil, nil
}
databaseMetadata, err := storeInstance.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: workspace,
InstanceID: instanceID,
DatabaseName: databaseName,
})
@@ -1070,6 +1071,7 @@ func diff(ctx context.Context, s *store.Store, instance *store.InstanceMessage,
}
dbMetadata, err := s.GetDBSchema(ctx, &store.FindDBSchemaMessage{
+ Workspace: instance.Workspace,
InstanceID: database.InstanceID,
DatabaseName: database.DatabaseName,
})
diff --git a/backend/runner/taskrun/pending_scheduler.go b/backend/runner/taskrun/pending_scheduler.go
index 826e44689d..64b17dd5db 100644
--- a/backend/runner/taskrun/pending_scheduler.go
+++ b/backend/runner/taskrun/pending_scheduler.go
@@ -158,7 +158,7 @@ func (s *Scheduler) getMaxParallelForTask(ctx context.Context, task *store.TaskM
return 0, errors.Errorf("plan %v not found", task.PlanID)
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &plan.ProjectID})
+ project, err := s.store.GetProjectByResourceID(ctx, plan.ProjectID)
if err != nil {
return 0, errors.Wrapf(err, "failed to get project")
}
diff --git a/backend/runner/taskrun/rollout_creator.go b/backend/runner/taskrun/rollout_creator.go
index d04c8364e0..e4981b6433 100644
--- a/backend/runner/taskrun/rollout_creator.go
+++ b/backend/runner/taskrun/rollout_creator.go
@@ -108,7 +108,7 @@ func (rc *RolloutCreator) tryCreateRollout(ctx context.Context, ref bus.PlanRef)
return
}
- project, err := rc.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &plan.ProjectID})
+ project, err := rc.store.GetProjectByResourceID(ctx, plan.ProjectID)
if err != nil {
slog.Error("failed to get project for rollout creation",
slog.String("project_id", plan.ProjectID),
diff --git a/backend/runner/taskrun/running_scheduler.go b/backend/runner/taskrun/running_scheduler.go
index 605e06253d..c921059382 100644
--- a/backend/runner/taskrun/running_scheduler.go
+++ b/backend/runner/taskrun/running_scheduler.go
@@ -189,8 +189,7 @@ func (s *Scheduler) runTaskRunOnce(ctx context.Context, taskRunUID int64, task *
if err != nil || plan == nil {
slog.Error("failed to get plan for failure webhook", log.BBError(err))
} else {
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &plan.ProjectID})
- if err != nil || project == nil {
+ if project, err := s.store.GetProjectByResourceID(ctx, plan.ProjectID); err != nil || project == nil {
slog.Error("failed to get project for failure webhook", log.BBError(err))
} else {
// Send PIPELINE_FAILED webhook
diff --git a/backend/runner/taskrun/scheduler.go b/backend/runner/taskrun/scheduler.go
index 2f57df434a..fb92ec6d4d 100644
--- a/backend/runner/taskrun/scheduler.go
+++ b/backend/runner/taskrun/scheduler.go
@@ -144,7 +144,7 @@ func (s *Scheduler) checkPlanCompletion(ctx context.Context, ref bus.PlanRef) {
return // Already sent
}
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &plan.ProjectID})
+ project, err := s.store.GetProjectByResourceID(ctx, plan.ProjectID)
if err != nil || project == nil {
slog.Error("failed to get project for completion webhook", log.BBError(err))
return
diff --git a/backend/server/grpc_routes.go b/backend/server/grpc_routes.go
index 5ab114d358..d96984a7d3 100644
--- a/backend/server/grpc_routes.go
+++ b/backend/server/grpc_routes.go
@@ -117,7 +117,7 @@ func configureGrpcRouters(
serviceAccountService := apiv1.NewServiceAccountService(stores, iamManager)
workloadIdentityService := apiv1.NewWorkloadIdentityService(stores, iamManager)
worksheetService := apiv1.NewWorksheetService(stores, iamManager)
- workspaceService := apiv1.NewWorkspaceService(stores, iamManager)
+ workspaceService := apiv1.NewWorkspaceService(stores, iamManager, profile)
onPanic := func(_ context.Context, s connect.Spec, _ http.Header, p any) error {
stack := stacktrace.TakeStacktrace(20 /* n */, 5 /* skip */)
diff --git a/backend/server/server.go b/backend/server/server.go
index 7ae9753f08..dea108d381 100644
--- a/backend/server/server.go
+++ b/backend/server/server.go
@@ -154,10 +154,35 @@ func NewServer(ctx context.Context, profile *config.Profile) (*Server, error) {
s.store = stores
sheetManager := sheet.NewManager()
- // Initialize sample instance manager and start sample instances if they exist
- s.sampleInstanceManager = sampleinstance.NewManager(stores, profile)
- if err := s.sampleInstanceManager.StartIfExist(ctx); err != nil {
- slog.Warn("failed to start sample instances", log.BBError(err))
+ if !s.profile.SaaS {
+ s.sampleInstanceManager = sampleinstance.NewManager(stores, profile)
+
+ // Load workspace-dependent settings if workspace exists.
+ // On first boot (no workspace yet), these remain at defaults and get
+ // initialized when the workspace is created and settings are updated via API.
+ if workspaceID, _ := stores.GetWorkspaceID(ctx); workspaceID != "" {
+ if err := s.sampleInstanceManager.StartIfExist(ctx, workspaceID); err != nil {
+ slog.Warn("failed to start sample instances", log.BBError(err))
+ }
+
+ if workspaceProfile, err := s.store.GetWorkspaceProfileSetting(ctx, workspaceID); err == nil {
+ profile.RuntimeDebug.Store(workspaceProfile.EnableDebug)
+ if workspaceProfile.EnableDebug {
+ log.LogLevel.Set(slog.LevelDebug)
+ }
+ if workspaceProfile.GetEnableAuditLogStdout() {
+ if err := s.licenseService.IsFeatureEnabled(ctx, workspaceID, v1pb.PlanFeature_FEATURE_AUDIT_LOG); err == nil {
+ s.profile.RuntimeEnableAuditLogStdout.Store(true)
+ }
+ }
+ telemetry.InitGlobalReporter(
+ workspaceID,
+ profile.Version,
+ profile.GitCommit,
+ workspaceProfile.GetEnableMetricCollection(),
+ )
+ }
+ }
}
s.bus, err = bus.New()
@@ -165,43 +190,18 @@ func NewServer(ctx context.Context, profile *config.Profile) (*Server, error) {
return nil, errors.Wrapf(err, "failed to create message bus")
}
- s.licenseService, err = enterprise.NewLicenseService(profile.Mode, stores)
+ s.licenseService, err = enterprise.NewLicenseService(profile.Mode, stores, profile.SaaS)
if err != nil {
return nil, errors.Wrap(err, "failed to create license service")
}
- // Cache the license.
- s.licenseService.LoadSubscription(ctx)
-
- workspaceProfile, err := s.store.GetWorkspaceProfileSetting(ctx)
- if err != nil {
- return nil, errors.Wrap(err, "failed to get workspace profile setting")
- }
- profile.RuntimeDebug.Store(workspaceProfile.EnableDebug)
- if workspaceProfile.EnableDebug {
- log.LogLevel.Set(slog.LevelDebug)
- }
- // Settings are now initialized in the database schema (LATEST.sql)
- systemSetting, err := s.store.GetSystemSetting(ctx)
+ // The auth secret is a global infrastructure value stored in server_config.
+ secret, err := s.store.GetAuthSecret(ctx)
if err != nil {
- return nil, errors.Wrap(err, "failed to get system setting")
+ return nil, errors.Wrap(err, "failed to get auth secret")
}
- secret := systemSetting.AuthSecret
- workspace, err := s.store.GetWorkspace(ctx)
- if err != nil {
- return nil, errors.Wrap(err, "failed to get workspace")
- }
-
- // Initialize telemetry reporter for hub.bytebase.com event reporting.
- telemetry.InitGlobalReporter(
- workspace.ResourceID,
- profile.Version,
- profile.GitCommit,
- workspaceProfile.GetEnableMetricCollection(),
- )
-
- s.iamManager, err = iam.NewManager(stores, s.licenseService)
+ s.iamManager, err = iam.NewManager(stores, s.licenseService, profile.SaaS)
if err := s.iamManager.ReloadCache(ctx); err != nil {
return nil, errors.Wrapf(err, "failed to reload iam cache")
}
@@ -279,19 +279,6 @@ func (s *Server) Run(ctx context.Context, port int) error {
mmm := monitor.NewMemoryMonitor(s.profile)
go mmm.Run(ctx, &s.runnerWG)
- // Check workspace setting and set audit logger runtime flag
- workspaceProfile, err := s.store.GetWorkspaceProfileSetting(ctx)
- if err == nil && workspaceProfile.GetEnableAuditLogStdout() {
- // Validate license before enabling (prevents usage after license downgrade/expiry)
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {
- slog.Warn("audit logging enabled in workspace settings but license insufficient, keeping disabled",
- log.BBError(err))
- } else {
- s.profile.RuntimeEnableAuditLogStdout.Store(true)
- slog.Info("audit logging to stdout enabled via workspace setting")
- }
- }
-
address := fmt.Sprintf(":%d", port)
listener, err := net.Listen("tcp", address)
if err != nil {
diff --git a/backend/store/account.go b/backend/store/account.go
index c165d5acee..24dde543fc 100644
--- a/backend/store/account.go
+++ b/backend/store/account.go
@@ -7,16 +7,25 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
)
-// GetPrincipalByEmail gets any principal (user, service account, or workload identity) by email.
-// This is used by the auth layer where the JWT subject can be any principal type.
-// It determines the principal type by the email format and calls the appropriate method.
-func (s *Store) GetPrincipalByEmail(ctx context.Context, email string) (*UserMessage, error) {
- // Use the unified cache first for all types
- if v, ok := s.userEmailCache.Get(email); ok && s.enableCache {
- return v, nil
- }
+// AccountMessage is a unified account representation for the auth layer.
+// It contains only the fields needed for authentication and authorization,
+// regardless of the underlying principal type (END_USER, SERVICE_ACCOUNT, WORKLOAD_IDENTITY).
+type AccountMessage struct {
+ Email string
+ Name string
+ Type storepb.PrincipalType
+ // Workspace is the workspace resource ID.
+ // Empty for END_USER (global identity, workspace resolved via IAM policy).
+ // Populated for SERVICE_ACCOUNT and WORKLOAD_IDENTITY (workspace-scoped).
+ Workspace string
+ PasswordHash string
+ MemberDeleted bool
+}
- // Determine principal type by email format and query accordingly
+// GetAccountByEmail gets any principal (user, service account, or workload identity) by email.
+// Used by the auth layer (login, token validation) and runners.
+// Queries cross-workspace — safe because all PKs (email, id) are globally unique.
+func (s *Store) GetAccountByEmail(ctx context.Context, email string) (*AccountMessage, error) {
if common.IsServiceAccountEmail(email) {
sa, err := s.GetServiceAccountByEmail(ctx, email)
if err != nil {
@@ -25,18 +34,14 @@ func (s *Store) GetPrincipalByEmail(ctx context.Context, email string) (*UserMes
if sa == nil {
return nil, nil
}
- // Convert to UserMessage for compatibility with auth layer
- user := &UserMessage{
+ return &AccountMessage{
Email: sa.Email,
Name: sa.Name,
+ Workspace: sa.Workspace,
PasswordHash: sa.ServiceKeyHash,
Type: storepb.PrincipalType_SERVICE_ACCOUNT,
MemberDeleted: sa.MemberDeleted,
- MFAConfig: &storepb.MFAConfig{},
- Profile: &storepb.UserProfile{},
- }
- s.userEmailCache.Add(user.Email, user)
- return user, nil
+ }, nil
}
if common.IsWorkloadIdentityEmail(email) {
@@ -47,19 +52,28 @@ func (s *Store) GetPrincipalByEmail(ctx context.Context, email string) (*UserMes
if wi == nil {
return nil, nil
}
- // Convert to UserMessage for compatibility with auth layer
- user := &UserMessage{
+ return &AccountMessage{
Email: wi.Email,
Name: wi.Name,
+ Workspace: wi.Workspace,
Type: storepb.PrincipalType_WORKLOAD_IDENTITY,
MemberDeleted: wi.MemberDeleted,
- MFAConfig: &storepb.MFAConfig{},
- Profile: &storepb.UserProfile{},
- }
- s.userEmailCache.Add(user.Email, user)
- return user, nil
+ }, nil
}
// Default to end user lookup.
- return s.GetUserByEmail(ctx, email)
+ user, err := s.GetUserByEmail(ctx, email)
+ if err != nil {
+ return nil, err
+ }
+ if user == nil {
+ return nil, nil
+ }
+ return &AccountMessage{
+ Email: user.Email,
+ Name: user.Name,
+ Type: storepb.PrincipalType_END_USER,
+ PasswordHash: user.PasswordHash,
+ MemberDeleted: user.MemberDeleted,
+ }, nil
}
diff --git a/backend/store/audit_log.go b/backend/store/audit_log.go
index b0d456b585..ef6fed6477 100644
--- a/backend/store/audit_log.go
+++ b/backend/store/audit_log.go
@@ -25,6 +25,7 @@ type AuditLog struct {
}
type AuditLogFind struct {
+ Workspace string
Project *string
FilterQ *qb.Query
Limit *int
@@ -60,6 +61,9 @@ func (s *Store) SearchAuditLogs(ctx context.Context, find *AuditLogFind) ([]*Aud
FROM audit_log
WHERE TRUE
`)
+ if find.Workspace != "" {
+ q.And("workspace = ?", find.Workspace)
+ }
if filterQ := find.FilterQ; filterQ != nil {
q.And("?", filterQ)
diff --git a/backend/store/database.go b/backend/store/database.go
index 3f67f5a468..e38e5428d7 100644
--- a/backend/store/database.go
+++ b/backend/store/database.go
@@ -424,7 +424,7 @@ func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseM
return nil
}
-func GetListDatabaseFilter(filter string) (*qb.Query, error) {
+func GetListDatabaseFilter(workspace, filter string) (*qb.Query, error) {
if filter == "" {
return nil, nil
}
@@ -522,7 +522,7 @@ func GetListDatabaseFilter(filter string) (*qb.Query, error) {
return qb.Q().Space("db.name = ?", value), nil
case "exclude_unassigned":
if excludeUnassigned, ok := value.(bool); excludeUnassigned && ok {
- return qb.Q().Space("db.project != ?", common.DefaultProjectID), nil
+ return qb.Q().Space("db.project != ? AND db.project != 'default'", common.DefaultProjectID(workspace)), nil
}
return qb.Q().Space("TRUE"), nil
case "table":
diff --git a/backend/store/db_schema.go b/backend/store/db_schema.go
index e64b26af17..29fc4fc2b5 100644
--- a/backend/store/db_schema.go
+++ b/backend/store/db_schema.go
@@ -19,6 +19,7 @@ type UpdateDBSchemaMessage struct {
}
type FindDBSchemaMessage struct {
+ Workspace string
InstanceID string
DatabaseName string
}
@@ -50,7 +51,7 @@ func (s *Store) GetDBSchema(ctx context.Context, find *FindDBSchemaMessage) (*mo
return nil, err
}
- dbMetadata, err := s.convertMetadataAndConfig(ctx, metadata, schema, config, find.InstanceID)
+ dbMetadata, err := s.convertMetadataAndConfig(ctx, metadata, schema, config, find.Workspace, find.InstanceID)
if err != nil {
return nil, err
}
@@ -61,12 +62,12 @@ func (s *Store) GetDBSchema(ctx context.Context, find *FindDBSchemaMessage) (*mo
}
// GetDBSchemaSnapshot gets the schema for a database with cache.
-func (s *Store) GetDBSchemaSnapshot(ctx context.Context, instanceID, databaseName string) (*model.DatabaseMetadata, error) {
+func (s *Store) GetDBSchemaSnapshot(ctx context.Context, workspaceID string, instanceID, databaseName string) (*model.DatabaseMetadata, error) {
cacheKey := getDBSchemaCacheKey(instanceID, databaseName)
if v, ok := s.dbSchemaCache.Get(cacheKey); ok {
return v, nil
}
- return s.GetDBSchema(ctx, &FindDBSchemaMessage{InstanceID: instanceID, DatabaseName: databaseName})
+ return s.GetDBSchema(ctx, &FindDBSchemaMessage{Workspace: workspaceID, InstanceID: instanceID, DatabaseName: databaseName})
}
// UpsertDBSchema upserts a database schema.
@@ -157,7 +158,7 @@ func (s *Store) UpdateDBSchema(ctx context.Context, instanceID, databaseName str
return nil
}
-func (s *Store) convertMetadataAndConfig(ctx context.Context, metadata, schema, config []byte, instanceID string) (*model.DatabaseMetadata, error) {
+func (s *Store) convertMetadataAndConfig(ctx context.Context, metadata, schema, config []byte, workspaceID string, instanceID string) (*model.DatabaseMetadata, error) {
var databaseSchema storepb.DatabaseSchemaMetadata
var databaseConfig storepb.DatabaseConfig
if err := common.ProtojsonUnmarshaler.Unmarshal(metadata, &databaseSchema); err != nil {
@@ -166,7 +167,7 @@ func (s *Store) convertMetadataAndConfig(ctx context.Context, metadata, schema,
if err := common.ProtojsonUnmarshaler.Unmarshal(config, &databaseConfig); err != nil {
return nil, err
}
- instance, err := s.GetInstance(ctx, &FindInstanceMessage{ResourceID: &instanceID})
+ instance, err := s.GetInstance(ctx, &FindInstanceMessage{Workspace: workspaceID, ResourceID: &instanceID})
if err != nil {
return nil, err
}
diff --git a/backend/store/environment.go b/backend/store/environment.go
index a11f88c662..892b4b2338 100644
--- a/backend/store/environment.go
+++ b/backend/store/environment.go
@@ -9,8 +9,8 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
)
-func (s *Store) GetEnvironmentByID(ctx context.Context, id string) (*storepb.EnvironmentSetting_Environment, error) {
- environments, err := s.GetEnvironment(ctx)
+func (s *Store) GetEnvironmentByID(ctx context.Context, workspaceID string, id string) (*storepb.EnvironmentSetting_Environment, error) {
+ environments, err := s.GetEnvironment(ctx, workspaceID)
if err != nil {
return nil, err
}
diff --git a/backend/store/export_archive.go b/backend/store/export_archive.go
index 5973602c25..5b568b8f14 100644
--- a/backend/store/export_archive.go
+++ b/backend/store/export_archive.go
@@ -21,7 +21,7 @@ type ExportArchiveMessage struct {
}
// GetExportArchive gets a export archive.
-func (s *Store) GetExportArchive(ctx context.Context, resourceID string) (*ExportArchiveMessage, error) {
+func (s *Store) GetExportArchive(ctx context.Context, workspaceID string, resourceID string) (*ExportArchiveMessage, error) {
q := qb.Q().Space(`
SELECT
resource_id,
@@ -31,7 +31,7 @@ func (s *Store) GetExportArchive(ctx context.Context, resourceID string) (*Expor
payload
FROM export_archive
WHERE resource_id = ?
- `, resourceID)
+ `, resourceID).And("workspace = ?", workspaceID)
query, args, err := q.ToSQL()
if err != nil {
@@ -93,10 +93,10 @@ func (s *Store) CreateExportArchive(ctx context.Context, create *ExportArchiveMe
// DeleteExpiredExportArchives deletes export archives older than the specified retention period.
// Returns the number of archives deleted.
-func (s *Store) DeleteExpiredExportArchives(ctx context.Context, retentionPeriod time.Duration) (int64, error) {
+func (s *Store) DeleteExpiredExportArchives(ctx context.Context, workspaceID string, retentionPeriod time.Duration) (int64, error) {
cutoffTime := time.Now().Add(-retentionPeriod)
- q := qb.Q().Space("DELETE FROM export_archive WHERE created_at < ?", cutoffTime)
+ q := qb.Q().Space("DELETE FROM export_archive WHERE workspace = ?", workspaceID).And("created_at < ?", cutoffTime)
query, args, err := q.ToSQL()
if err != nil {
return 0, errors.Wrapf(err, "failed to build sql")
diff --git a/backend/store/group.go b/backend/store/group.go
index dcde3f9a88..13c21a8cba 100644
--- a/backend/store/group.go
+++ b/backend/store/group.go
@@ -19,6 +19,7 @@ import (
// FindGroupMessage is the message for finding groups.
type FindGroupMessage struct {
+ Workspace string
ID *string
Email *string
ProjectID *string
@@ -31,7 +32,8 @@ type FindGroupMessage struct {
// UpdateGroupMessage is the message to update a group.
type UpdateGroupMessage struct {
// identifier
- ID string
+ ID string
+ Workspace string
// payload
Email *string
@@ -52,8 +54,8 @@ type GroupMessage struct {
// GetGroup gets a group.
func (s *Store) GetGroup(ctx context.Context, find *FindGroupMessage) (*GroupMessage, error) {
- if find.Email != nil {
- if v, ok := s.groupCache.Get(*find.Email); ok && s.enableCache {
+ if find.Email != nil && find.Workspace != "" {
+ if v, ok := s.groupCache.Get(getGroupCacheKey(find.Workspace, *find.Email)); ok && s.enableCache {
return v, nil
}
}
@@ -75,7 +77,7 @@ func (s *Store) GetGroup(ctx context.Context, find *FindGroupMessage) (*GroupMes
func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*GroupMessage, error) {
with := qb.Q()
from := qb.Q().Space("user_group")
- where := qb.Q().Space("TRUE")
+ where := qb.Q().Space("user_group.workspace = ?", find.Workspace)
// Build CTE for project filtering if needed
if v := find.ProjectID; v != nil {
@@ -84,11 +86,11 @@ func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*Grou
jsonb_array_elements_text(jsonb_array_elements(policy.payload->'bindings')->'members') AS member,
jsonb_array_elements(policy.payload->'bindings')->>'role' AS role
FROM policy
- WHERE ((resource_type = ? AND resource = ?) OR resource_type = ?) AND type = ?
+ WHERE ((resource_type = ? AND resource = ?) OR resource_type = ?) AND type = ? AND policy.workspace = ?
),
project_members AS (
SELECT ARRAY_AGG(member) AS members FROM all_members WHERE role NOT LIKE 'roles/workspace%'
- )`, storepb.Policy_PROJECT.String(), "projects/"+*v, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String())
+ )`, storepb.Policy_PROJECT.String(), "projects/"+*v, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String(), find.Workspace)
from.Space(`INNER JOIN project_members ON (CONCAT('groups/', user_group.email) = ANY(project_members.members) OR ? = ANY(project_members.members))`, common.AllUsers)
}
@@ -167,7 +169,7 @@ func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*Grou
}
for _, group := range groups {
- s.groupCache.Add(group.Email, group)
+ s.groupCache.Add(getGroupCacheKey(group.Workspace, group.Email), group)
}
return groups, nil
}
@@ -210,7 +212,7 @@ func (s *Store) CreateGroup(ctx context.Context, create *GroupMessage) (*GroupMe
}
if create.Email != "" {
- s.groupCache.Add(create.Email, create)
+ s.groupCache.Add(getGroupCacheKey(create.Workspace, create.Email), create)
}
return create, nil
}
@@ -238,14 +240,14 @@ func (s *Store) UpdateGroup(ctx context.Context, patch *UpdateGroupMessage) (*Gr
q := qb.Q().Space(`
UPDATE user_group
SET ?
- WHERE id = ?
+ WHERE id = ? AND workspace = ?
RETURNING
id,
email,
name,
description,
payload
- `, set, patch.ID)
+ `, set, patch.ID, patch.Workspace)
query, args, err := q.ToSQL()
if err != nil {
@@ -275,16 +277,17 @@ func (s *Store) UpdateGroup(ctx context.Context, patch *UpdateGroupMessage) (*Gr
group.Email = email.String
}
+ group.Workspace = patch.Workspace
if group.Email != "" {
- s.groupCache.Add(group.Email, &group)
- s.groupMembersCache.Remove("groups/" + group.Email)
+ s.groupCache.Add(getGroupCacheKey(group.Workspace, group.Email), &group)
+ s.groupMembersCache.Remove(getGroupMembersCacheKey(group.Workspace, "groups/"+group.Email))
}
return &group, nil
}
// DeleteGroup deletes a group.
-func (s *Store) DeleteGroup(ctx context.Context, id string) error {
- q := qb.Q().Space("DELETE FROM user_group WHERE id = ? RETURNING email", id)
+func (s *Store) DeleteGroup(ctx context.Context, workspace string, id string) error {
+ q := qb.Q().Space("DELETE FROM user_group WHERE id = ? AND workspace = ? RETURNING email", id, workspace)
query, args, err := q.ToSQL()
if err != nil {
return errors.Wrapf(err, "failed to build sql")
@@ -296,8 +299,8 @@ func (s *Store) DeleteGroup(ctx context.Context, id string) error {
}
if email.Valid && email.String != "" {
- s.groupCache.Remove(email.String)
- s.groupMembersCache.Remove("groups/" + email.String)
+ s.groupCache.Remove(getGroupCacheKey(workspace, email.String))
+ s.groupMembersCache.Remove(getGroupMembersCacheKey(workspace, "groups/"+email.String))
}
return nil
}
@@ -305,12 +308,12 @@ func (s *Store) DeleteGroup(ctx context.Context, id string) error {
// GetUserGroupsSnapshot returns groups for a user with snapshot reads (with cache).
// userName format is "users/{email}".
// Trades consistency for performance.
-func (s *Store) GetUserGroupsSnapshot(ctx context.Context, userName string) ([]string, error) {
- if v, ok := s.memberGroupsCache.Get(userName); ok {
+func (s *Store) GetUserGroupsSnapshot(ctx context.Context, workspaceID string, userName string) ([]string, error) {
+ if v, ok := s.memberGroupsCache.Get(getMemberGroupsCacheKey(workspaceID, userName)); ok {
return v, nil
}
- groups, err := s.ListGroups(ctx, &FindGroupMessage{})
+ groups, err := s.ListGroups(ctx, &FindGroupMessage{Workspace: workspaceID})
if err != nil {
return nil, err
}
@@ -328,21 +331,21 @@ func (s *Store) GetUserGroupsSnapshot(ctx context.Context, userName string) ([]s
}
}
}
- s.memberGroupsCache.Add(userName, userGroups)
+ s.memberGroupsCache.Add(getMemberGroupsCacheKey(workspaceID, userName), userGroups)
return userGroups, nil
}
// GetGroupMembersSnapshot returns group members with snapshot reads (with cache).
// groupName format is "groups/{email}".
// Trades consistency for performance.
-func (s *Store) GetGroupMembersSnapshot(ctx context.Context, groupName string) (map[string]bool, error) {
- if v, ok := s.groupMembersCache.Get(groupName); ok {
+func (s *Store) GetGroupMembersSnapshot(ctx context.Context, workspaceID string, groupName string) (map[string]bool, error) {
+ if v, ok := s.groupMembersCache.Get(getGroupMembersCacheKey(workspaceID, groupName)); ok {
return v, nil
}
// Extract email from group name "groups/{email}"
email := strings.TrimPrefix(groupName, "groups/")
- group, err := s.GetGroup(ctx, &FindGroupMessage{Email: &email})
+ group, err := s.GetGroup(ctx, &FindGroupMessage{Workspace: workspaceID, Email: &email})
if err != nil {
return nil, err
}
@@ -354,7 +357,7 @@ func (s *Store) GetGroupMembersSnapshot(ctx context.Context, groupName string) (
for _, m := range group.Payload.GetMembers() {
members[m.Member] = true
}
- s.groupMembersCache.Add(groupName, members)
+ s.groupMembersCache.Add(getGroupMembersCacheKey(workspaceID, groupName), members)
return members, nil
}
diff --git a/backend/store/idp.go b/backend/store/idp.go
index cd77b96deb..c105df52d2 100644
--- a/backend/store/idp.go
+++ b/backend/store/idp.go
@@ -38,12 +38,14 @@ func getConfigBytes(config *storepb.IdentityProviderConfig) ([]byte, error) {
// FindIdentityProviderMessage is the message for finding identity providers.
type FindIdentityProviderMessage struct {
+ Workspace string
ResourceID *string
}
// UpdateIdentityProviderMessage is the message for updating an identity provider.
type UpdateIdentityProviderMessage struct {
ResourceID string
+ Workspace string
Title *string
Domain *string
@@ -90,6 +92,36 @@ func (s *Store) CreateIdentityProvider(ctx context.Context, create *IdentityProv
}
// GetIdentityProvider gets an identity provider.
+// GetIdentityProviderByID gets an identity provider by its globally unique resource ID without workspace filter.
+// For use by login flow where workspace is not yet known — the workspace is resolved from the IDP entity.
+func (s *Store) GetIdentityProviderByID(ctx context.Context, resourceID string) (*IdentityProviderMessage, error) {
+ q := qb.Q().Space(`
+ SELECT resource_id, workspace, name, domain, type, config
+ FROM idp
+ WHERE resource_id = ?
+ `, resourceID)
+
+ query, args, err := q.ToSQL()
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to build sql")
+ }
+
+ var idp IdentityProviderMessage
+ var idpType string
+ var idpConfig string
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
+ &idp.ResourceID, &idp.Workspace, &idp.Title, &idp.Domain, &idpType, &idpConfig,
+ ); err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil
+ }
+ return nil, errors.Wrap(err, "failed to get identity provider")
+ }
+ idp.Type = convertIdentityProviderType(idpType)
+ idp.Config = convertIdentityProviderConfigString(idp.Type, idpConfig)
+ return &idp, nil
+}
+
func (s *Store) GetIdentityProvider(ctx context.Context, find *FindIdentityProviderMessage) (*IdentityProviderMessage, error) {
identityProviders, err := s.ListIdentityProviders(ctx, find)
if err != nil {
@@ -116,8 +148,8 @@ func (s *Store) ListIdentityProviders(ctx context.Context, find *FindIdentityPro
type,
config
FROM idp
- WHERE TRUE
- `)
+ WHERE workspace = ?
+ `, find.Workspace)
if v := find.ResourceID; v != nil {
q.And("resource_id = ?", *v)
@@ -185,7 +217,7 @@ func (s *Store) UpdateIdentityProvider(ctx context.Context, patch *UpdateIdentit
q := qb.Q().Space(`
UPDATE idp
SET ?
- WHERE resource_id = ?
+ WHERE resource_id = ? AND workspace = ?
RETURNING
resource_id,
workspace,
@@ -193,7 +225,7 @@ func (s *Store) UpdateIdentityProvider(ctx context.Context, patch *UpdateIdentit
domain,
type,
config
- `, set, patch.ResourceID)
+ `, set, patch.ResourceID, patch.Workspace)
query, args, err := q.ToSQL()
if err != nil {
@@ -222,8 +254,8 @@ func (s *Store) UpdateIdentityProvider(ctx context.Context, patch *UpdateIdentit
return identityProvider, nil
}
-func (s *Store) DeleteIdentityProvider(ctx context.Context, resourceID string) error {
- q := qb.Q().Space("DELETE FROM idp WHERE resource_id = ?", resourceID)
+func (s *Store) DeleteIdentityProvider(ctx context.Context, workspace string, resourceID string) error {
+ q := qb.Q().Space("DELETE FROM idp WHERE resource_id = ? AND workspace = ?", resourceID, workspace)
query, args, err := q.ToSQL()
if err != nil {
return errors.Wrapf(err, "failed to build sql")
diff --git a/backend/store/instance.go b/backend/store/instance.go
index a8d6be56e9..54d4dba82f 100644
--- a/backend/store/instance.go
+++ b/backend/store/instance.go
@@ -34,6 +34,7 @@ type UpdateInstanceMessage struct {
// allow batch update
ResourceID *string
FindByEnvironmentID *string
+ Workspace string
Deleted *bool
EnvironmentID *string
@@ -42,7 +43,7 @@ type UpdateInstanceMessage struct {
// FindInstanceMessage is the message for finding instances.
type FindInstanceMessage struct {
- Workspace *string
+ Workspace string
ResourceID *string
ResourceIDs *[]string
ShowDeleted bool
@@ -81,13 +82,11 @@ func (s *Store) GetInstance(ctx context.Context, find *FindInstanceMessage) (*In
// ListInstances lists all instance.
func (s *Store) ListInstances(ctx context.Context, find *FindInstanceMessage) ([]*InstanceMessage, error) {
- where := qb.Q().Space("TRUE")
+ where := qb.Q().Space("instance.workspace = ?", find.Workspace)
if filterQ := find.FilterQ; filterQ != nil {
where.And("?", filterQ)
}
- if v := find.Workspace; v != nil {
- where.And("instance.workspace = ?", *v)
- }
+
if v := find.ResourceID; v != nil {
where.And("instance.resource_id = ?", *v)
}
@@ -257,6 +256,9 @@ func (s *Store) UpdateInstance(ctx context.Context, patch *UpdateInstanceMessage
if v := patch.FindByEnvironmentID; v != nil {
where.And("environment = ?", *v)
}
+ if patch.Workspace != "" {
+ where.And("workspace = ?", patch.Workspace)
+ }
if where.Len() == 0 {
return nil, errors.Errorf("empty where")
@@ -276,15 +278,15 @@ func (s *Store) UpdateInstance(ctx context.Context, patch *UpdateInstanceMessage
if v := patch.ResourceID; v != nil {
s.instanceCache.Remove(getInstanceCacheKey(*v))
- return s.GetInstance(ctx, &FindInstanceMessage{ResourceID: v})
+ return s.GetInstance(ctx, &FindInstanceMessage{Workspace: patch.Workspace, ResourceID: v})
}
return nil, nil
}
// GetActivatedInstanceCount gets the number of activated instances.
-func (s *Store) GetActivatedInstanceCount(ctx context.Context) (int, error) {
- q := qb.Q().Space("SELECT COUNT(1) FROM instance WHERE (metadata ?? 'activation') AND (metadata->>'activation')::boolean = TRUE AND deleted = FALSE")
+func (s *Store) GetActivatedInstanceCount(ctx context.Context, workspaceID string) (int, error) {
+ q := qb.Q().Space("SELECT COUNT(1) FROM instance WHERE workspace = ?", workspaceID).And("(metadata ?? 'activation') AND (metadata->>'activation')::boolean = TRUE AND deleted = FALSE")
query, args, err := q.ToSQL()
if err != nil {
return 0, errors.Wrapf(err, "failed to build sql")
@@ -332,11 +334,10 @@ func IsObjectCaseSensitive(instance *InstanceMessage) bool {
}
func (s *Store) obfuscateInstance(ctx context.Context, instance *storepb.Instance) (*storepb.Instance, error) {
- systemSetting, err := s.GetSystemSetting(ctx)
+ secret, err := s.GetAuthSecret(ctx)
if err != nil {
- return nil, errors.Wrap(err, "failed to get system setting")
+ return nil, errors.Wrap(err, "failed to get auth secret")
}
- secret := systemSetting.AuthSecret
redacted := proto.CloneOf(instance)
for _, ds := range redacted.GetDataSources() {
@@ -391,11 +392,10 @@ func (s *Store) obfuscateInstance(ctx context.Context, instance *storepb.Instanc
// deobfuscateInstances deobfuscate in-place.
func (s *Store) deobfuscateInstances(ctx context.Context, instances []*InstanceMessage) error {
- systemSetting, err := s.GetSystemSetting(ctx)
+ secret, err := s.GetAuthSecret(ctx)
if err != nil {
- return errors.Wrap(err, "failed to get system setting")
+ return errors.Wrap(err, "failed to get auth secret")
}
- secret := systemSetting.AuthSecret
for _, instance := range instances {
for _, ds := range instance.Metadata.GetDataSources() {
@@ -514,8 +514,9 @@ func (s *Store) deobfuscateInstances(ctx context.Context, instances []*InstanceM
}
// HasSampleInstances checks if there are sample instances in the database.
-func (s *Store) HasSampleInstances(ctx context.Context) (bool, error) {
+func (s *Store) HasSampleInstances(ctx context.Context, workspaceID string) (bool, error) {
instances, err := s.ListInstances(ctx, &FindInstanceMessage{
+ Workspace: workspaceID,
ResourceIDs: &[]string{"test-sample-instance", "prod-sample-instance"},
ShowDeleted: false,
})
@@ -530,7 +531,7 @@ func (s *Store) HasSampleInstances(ctx context.Context) (bool, error) {
// - Administrative cleanup of old soft-deleted instances
// - Test cleanup
// Following AIP-164/165, this only works on instances where deleted = TRUE.
-func (s *Store) DeleteInstance(ctx context.Context, resourceID string) error {
+func (s *Store) DeleteInstance(ctx context.Context, workspace string, resourceID string) error {
tx, err := s.GetDB().BeginTx(ctx, nil)
if err != nil {
return errors.Wrap(err, "failed to begin transaction")
@@ -672,8 +673,8 @@ func (s *Store) DeleteInstance(ctx context.Context, resourceID string) error {
// Finally, delete the instance itself (only if it's marked as deleted)
q = qb.Q().Space(`
DELETE FROM instance
- WHERE resource_id = ? AND deleted = TRUE
- `, resourceID)
+ WHERE resource_id = ? AND deleted = TRUE AND workspace = ?
+ `, resourceID, workspace)
query, args, err = q.ToSQL()
if err != nil {
return errors.Wrapf(err, "failed to build sql")
diff --git a/backend/store/oauth2_authorization_code.go b/backend/store/oauth2_authorization_code.go
index fc543bd072..9c6153f31c 100644
--- a/backend/store/oauth2_authorization_code.go
+++ b/backend/store/oauth2_authorization_code.go
@@ -43,12 +43,12 @@ func (s *Store) CreateOAuth2AuthorizationCode(ctx context.Context, create *OAuth
return create, nil
}
-func (s *Store) GetOAuth2AuthorizationCode(ctx context.Context, code string) (*OAuth2AuthorizationCodeMessage, error) {
+func (s *Store) GetOAuth2AuthorizationCode(ctx context.Context, clientID, code string) (*OAuth2AuthorizationCodeMessage, error) {
q := qb.Q().Space(`
SELECT code, client_id, user_email, config, expires_at
FROM oauth2_authorization_code
- WHERE code = ?
- `, code)
+ WHERE code = ? AND client_id = ?
+ `, code, clientID)
query, args, err := q.ToSQL()
if err != nil {
@@ -73,11 +73,11 @@ func (s *Store) GetOAuth2AuthorizationCode(ctx context.Context, code string) (*O
return msg, nil
}
-func (s *Store) DeleteOAuth2AuthorizationCode(ctx context.Context, code string) error {
+func (s *Store) DeleteOAuth2AuthorizationCode(ctx context.Context, clientID, code string) error {
q := qb.Q().Space(`
DELETE FROM oauth2_authorization_code
- WHERE code = ?
- `, code)
+ WHERE code = ? AND client_id = ?
+ `, code, clientID)
query, args, err := q.ToSQL()
if err != nil {
diff --git a/backend/store/oauth2_client.go b/backend/store/oauth2_client.go
index 432f64a106..ce481d237d 100644
--- a/backend/store/oauth2_client.go
+++ b/backend/store/oauth2_client.go
@@ -14,13 +14,15 @@ import (
type OAuth2ClientMessage struct {
ClientID string
+ Workspace string
ClientSecretHash string
Config *storepb.OAuth2ClientConfig
LastActiveAt time.Time
}
type FindOAuth2ClientMessage struct {
- ClientID *string
+ ClientID *string
+ Workspace string
}
func (s *Store) CreateOAuth2Client(ctx context.Context, create *OAuth2ClientMessage) (*OAuth2ClientMessage, error) {
@@ -30,10 +32,10 @@ func (s *Store) CreateOAuth2Client(ctx context.Context, create *OAuth2ClientMess
}
q := qb.Q().Space(`
- INSERT INTO oauth2_client (client_id, client_secret_hash, config, last_active_at)
- VALUES (?, ?, ?, NOW())
+ INSERT INTO oauth2_client (client_id, workspace, client_secret_hash, config, last_active_at)
+ VALUES (?, ?, ?, ?, NOW())
RETURNING last_active_at
- `, create.ClientID, create.ClientSecretHash, configBytes)
+ `, create.ClientID, create.Workspace, create.ClientSecretHash, configBytes)
query, args, err := q.ToSQL()
if err != nil {
@@ -46,8 +48,8 @@ func (s *Store) CreateOAuth2Client(ctx context.Context, create *OAuth2ClientMess
return create, nil
}
-func (s *Store) GetOAuth2Client(ctx context.Context, clientID string) (*OAuth2ClientMessage, error) {
- clients, err := s.ListOAuth2Clients(ctx, &FindOAuth2ClientMessage{ClientID: &clientID})
+func (s *Store) GetOAuth2Client(ctx context.Context, workspace, clientID string) (*OAuth2ClientMessage, error) {
+ clients, err := s.listOAuth2Clients(ctx, &FindOAuth2ClientMessage{ClientID: &clientID, Workspace: workspace})
if err != nil {
return nil, err
}
@@ -57,12 +59,12 @@ func (s *Store) GetOAuth2Client(ctx context.Context, clientID string) (*OAuth2Cl
return clients[0], nil
}
-func (s *Store) ListOAuth2Clients(ctx context.Context, find *FindOAuth2ClientMessage) ([]*OAuth2ClientMessage, error) {
+func (s *Store) listOAuth2Clients(ctx context.Context, find *FindOAuth2ClientMessage) ([]*OAuth2ClientMessage, error) {
q := qb.Q().Space(`
- SELECT client_id, client_secret_hash, config, last_active_at
+ SELECT client_id, workspace, client_secret_hash, config, last_active_at
FROM oauth2_client
- WHERE TRUE
- `)
+ WHERE workspace = ?
+ `, find.Workspace)
if v := find.ClientID; v != nil {
q.And("client_id = ?", *v)
@@ -83,7 +85,7 @@ func (s *Store) ListOAuth2Clients(ctx context.Context, find *FindOAuth2ClientMes
for rows.Next() {
client := &OAuth2ClientMessage{}
var configBytes []byte
- if err := rows.Scan(&client.ClientID, &client.ClientSecretHash, &configBytes, &client.LastActiveAt); err != nil {
+ if err := rows.Scan(&client.ClientID, &client.Workspace, &client.ClientSecretHash, &configBytes, &client.LastActiveAt); err != nil {
return nil, errors.Wrap(err, "failed to scan OAuth2 client")
}
client.Config = &storepb.OAuth2ClientConfig{}
@@ -98,12 +100,12 @@ func (s *Store) ListOAuth2Clients(ctx context.Context, find *FindOAuth2ClientMes
return clients, nil
}
-func (s *Store) UpdateOAuth2ClientLastActiveAt(ctx context.Context, clientID string) error {
+func (s *Store) UpdateOAuth2ClientLastActiveAt(ctx context.Context, workspace, clientID string) error {
q := qb.Q().Space(`
UPDATE oauth2_client
SET last_active_at = NOW()
- WHERE client_id = ?
- `, clientID)
+ WHERE client_id = ? AND workspace = ?
+ `, clientID, workspace)
query, args, err := q.ToSQL()
if err != nil {
@@ -116,11 +118,11 @@ func (s *Store) UpdateOAuth2ClientLastActiveAt(ctx context.Context, clientID str
return nil
}
-func (s *Store) DeleteOAuth2Client(ctx context.Context, clientID string) error {
+func (s *Store) DeleteOAuth2Client(ctx context.Context, workspace, clientID string) error {
q := qb.Q().Space(`
DELETE FROM oauth2_client
- WHERE client_id = ?
- `, clientID)
+ WHERE client_id = ? AND workspace = ?
+ `, clientID, workspace)
query, args, err := q.ToSQL()
if err != nil {
diff --git a/backend/store/oauth2_refresh_token.go b/backend/store/oauth2_refresh_token.go
index 692bc141dc..d93e78397e 100644
--- a/backend/store/oauth2_refresh_token.go
+++ b/backend/store/oauth2_refresh_token.go
@@ -34,12 +34,12 @@ func (s *Store) CreateOAuth2RefreshToken(ctx context.Context, create *OAuth2Refr
return create, nil
}
-func (s *Store) GetOAuth2RefreshToken(ctx context.Context, tokenHash string) (*OAuth2RefreshTokenMessage, error) {
+func (s *Store) GetOAuth2RefreshToken(ctx context.Context, clientID, tokenHash string) (*OAuth2RefreshTokenMessage, error) {
q := qb.Q().Space(`
SELECT token_hash, client_id, user_email, expires_at
FROM oauth2_refresh_token
- WHERE token_hash = ?
- `, tokenHash)
+ WHERE token_hash = ? AND client_id = ?
+ `, tokenHash, clientID)
query, args, err := q.ToSQL()
if err != nil {
@@ -58,11 +58,11 @@ func (s *Store) GetOAuth2RefreshToken(ctx context.Context, tokenHash string) (*O
return msg, nil
}
-func (s *Store) DeleteOAuth2RefreshToken(ctx context.Context, tokenHash string) error {
+func (s *Store) DeleteOAuth2RefreshToken(ctx context.Context, clientID, tokenHash string) error {
q := qb.Q().Space(`
DELETE FROM oauth2_refresh_token
- WHERE token_hash = ?
- `, tokenHash)
+ WHERE token_hash = ? AND client_id = ?
+ `, tokenHash, clientID)
query, args, err := q.ToSQL()
if err != nil {
@@ -75,7 +75,7 @@ func (s *Store) DeleteOAuth2RefreshToken(ctx context.Context, tokenHash string)
return nil
}
-func (s *Store) DeleteOAuth2RefreshTokensByUserAndClient(ctx context.Context, userEmail string, clientID string) error {
+func (s *Store) DeleteOAuth2RefreshTokensByUserAndClient(ctx context.Context, userEmail, clientID string) error {
q := qb.Q().Space(`
DELETE FROM oauth2_refresh_token
WHERE user_email = ? AND client_id = ?
diff --git a/backend/store/policy.go b/backend/store/policy.go
index e4dd03c215..b276024bcd 100644
--- a/backend/store/policy.go
+++ b/backend/store/policy.go
@@ -23,8 +23,8 @@ type IamPolicyMessage struct {
Etag string
}
-func getIamPolicyCacheKey(resourceType storepb.Policy_Resource, resourceID string) string {
- return fmt.Sprintf("iam/%s/%s", resourceType, resourceID)
+func getIamPolicyCacheKey(workspace string, resourceType storepb.Policy_Resource, resourceID string) string {
+ return fmt.Sprintf("iam/%s/%s/%s", workspace, resourceType, resourceID)
}
// generateEtag generates etag for the given body.
@@ -32,45 +32,27 @@ func generateEtag(t time.Time) string {
return fmt.Sprintf("%d", t.UnixMilli())
}
-// GetWorkspaceResourceName returns the workspace resource name "workspaces/{id}".
-func (s *Store) GetWorkspaceResourceName(ctx context.Context) (string, error) {
- workspace, err := s.GetWorkspace(ctx)
- if err != nil {
- return "", err
- }
- return common.FormatWorkspace(workspace.ResourceID), nil
-}
-
-func (s *Store) GetWorkspaceIamPolicy(ctx context.Context) (*IamPolicyMessage, error) {
- workspaceResource, err := s.GetWorkspaceResourceName(ctx)
- if err != nil {
- return nil, err
- }
+func (s *Store) GetWorkspaceIamPolicy(ctx context.Context, workspaceID string) (*IamPolicyMessage, error) {
+ workspaceResource := common.FormatWorkspace(workspaceID)
resourceType := storepb.Policy_WORKSPACE
- policy, err := s.getIamPolicy(ctx, &FindPolicyMessage{
+ return s.getIamPolicy(ctx, &FindPolicyMessage{
+ Workspace: workspaceID,
ResourceType: &resourceType,
Resource: &workspaceResource,
})
- if err != nil {
- return nil, err
- }
- s.iamPolicyCache.Add(getIamPolicyCacheKey(storepb.Policy_WORKSPACE, workspaceResource), policy)
- return policy, nil
}
type PatchIamPolicyMessage struct {
- Member string
- Roles []string
+ Workspace string
+ Member string
+ Roles []string
}
// PatchWorkspaceIamPolicy will set or remove the member for the workspace role.
func (s *Store) PatchWorkspaceIamPolicy(ctx context.Context, patch *PatchIamPolicyMessage) (*IamPolicyMessage, error) {
- workspaceResource, err := s.GetWorkspaceResourceName(ctx)
- if err != nil {
- return nil, err
- }
+ workspaceResource := common.FormatWorkspace(patch.Workspace)
- workspaceIamPolicy, err := s.GetWorkspaceIamPolicy(ctx)
+ workspaceIamPolicy, err := s.GetWorkspaceIamPolicy(ctx, patch.Workspace)
if err != nil {
return nil, err
}
@@ -109,12 +91,8 @@ func (s *Store) PatchWorkspaceIamPolicy(ctx context.Context, patch *PatchIamPoli
return nil, err
}
- workspace, err := s.GetWorkspace(ctx)
- if err != nil {
- return nil, err
- }
if _, err := s.CreatePolicy(ctx, &PolicyMessage{
- Workspace: workspace.ResourceID,
+ Workspace: patch.Workspace,
ResourceType: storepb.Policy_WORKSPACE,
Resource: workspaceResource,
Payload: string(policyPayload),
@@ -127,45 +105,36 @@ func (s *Store) PatchWorkspaceIamPolicy(ctx context.Context, patch *PatchIamPoli
}
// Invalidate IAM policy cache after mutation.
- s.iamPolicyCache.Remove(getIamPolicyCacheKey(storepb.Policy_WORKSPACE, workspaceResource))
+ s.iamPolicyCache.Remove(getIamPolicyCacheKey(patch.Workspace, storepb.Policy_WORKSPACE, workspaceResource))
- return s.GetWorkspaceIamPolicy(ctx)
+ return s.GetWorkspaceIamPolicy(ctx, patch.Workspace)
}
-func (s *Store) GetProjectIamPolicy(ctx context.Context, projectID string) (*IamPolicyMessage, error) {
- resourceType := storepb.Policy_PROJECT
+func (s *Store) GetProjectIamPolicy(ctx context.Context, workspaceID string, projectID string) (*IamPolicyMessage, error) {
resource := common.FormatProject(projectID)
- policy, err := s.getIamPolicy(ctx, &FindPolicyMessage{
+ resourceType := storepb.Policy_PROJECT
+ return s.getIamPolicy(ctx, &FindPolicyMessage{
+ Workspace: workspaceID,
ResourceType: &resourceType,
Resource: &resource,
})
- if err != nil {
- return nil, err
- }
- s.iamPolicyCache.Add(getIamPolicyCacheKey(storepb.Policy_PROJECT, projectID), policy)
- return policy, nil
}
-// GetWorkspaceIamPolicySnapshot returns the workspace IAM policy with snapshot reads (with cache).
-func (s *Store) GetWorkspaceIamPolicySnapshot(ctx context.Context) (*IamPolicyMessage, error) {
- workspaceResource, err := s.GetWorkspaceResourceName(ctx)
- if err != nil {
- return nil, err
- }
- key := getIamPolicyCacheKey(storepb.Policy_WORKSPACE, workspaceResource)
+func (s *Store) GetWorkspaceIamPolicySnapshot(ctx context.Context, workspaceID string) (*IamPolicyMessage, error) {
+ workspaceResource := common.FormatWorkspace(workspaceID)
+ key := getIamPolicyCacheKey(workspaceID, storepb.Policy_WORKSPACE, workspaceResource)
if v, ok := s.iamPolicyCache.Get(key); ok {
return v, nil
}
- return s.GetWorkspaceIamPolicy(ctx)
+ return s.GetWorkspaceIamPolicy(ctx, workspaceID)
}
-// GetProjectIamPolicySnapshot returns the project IAM policy with snapshot reads (with cache).
-func (s *Store) GetProjectIamPolicySnapshot(ctx context.Context, projectID string) (*IamPolicyMessage, error) {
- key := getIamPolicyCacheKey(storepb.Policy_PROJECT, projectID)
+func (s *Store) GetProjectIamPolicySnapshot(ctx context.Context, workspaceID string, projectID string) (*IamPolicyMessage, error) {
+ key := getIamPolicyCacheKey(workspaceID, storepb.Policy_PROJECT, projectID)
if v, ok := s.iamPolicyCache.Get(key); ok {
return v, nil
}
- return s.GetProjectIamPolicy(ctx, projectID)
+ return s.GetProjectIamPolicy(ctx, workspaceID, projectID)
}
func (s *Store) getIamPolicy(ctx context.Context, find *FindPolicyMessage) (*IamPolicyMessage, error) {
@@ -206,11 +175,12 @@ func GetDefaultRolloutPolicy() *storepb.RolloutPolicy {
}
}
-func (s *Store) GetRolloutPolicy(ctx context.Context, environment string) (*storepb.RolloutPolicy, error) {
+func (s *Store) GetRolloutPolicy(ctx context.Context, workspaceID string, environment string) (*storepb.RolloutPolicy, error) {
resource := common.FormatEnvironment(environment)
resourceType := storepb.Policy_ENVIRONMENT
pType := storepb.Policy_ROLLOUT
policy, err := s.GetPolicy(ctx, &FindPolicyMessage{
+ Workspace: workspaceID,
ResourceType: &resourceType,
Resource: &resource,
Type: &pType,
@@ -253,16 +223,13 @@ func formatEffectiveQueryDataPolicy(policy *storepb.QueryDataPolicy) *EffectiveQ
}
}
-func (s *Store) GetEffectiveQueryDataPolicy(ctx context.Context, projectFullName string) (*EffectiveQueryDataPolicy, error) {
- workspaceResource, err := s.GetWorkspaceResourceName(ctx)
- if err != nil {
- return nil, err
- }
- workspacePolicy, err := s.getQueryDataPolicy(ctx, workspaceResource)
+func (s *Store) GetEffectiveQueryDataPolicy(ctx context.Context, workspaceID string, projectFullName string) (*EffectiveQueryDataPolicy, error) {
+ workspaceResource := common.FormatWorkspace(workspaceID)
+ workspacePolicy, err := s.getQueryDataPolicy(ctx, workspaceID, workspaceResource)
if err != nil {
return nil, err
}
- projectPolicy, err := s.getQueryDataPolicy(ctx, projectFullName)
+ projectPolicy, err := s.getQueryDataPolicy(ctx, workspaceID, projectFullName)
if err != nil {
return nil, err
}
@@ -270,12 +237,12 @@ func (s *Store) GetEffectiveQueryDataPolicy(ctx context.Context, projectFullName
formatWorkspacePolicy := formatEffectiveQueryDataPolicy(workspacePolicy)
formatProjectPolicy := formatEffectiveQueryDataPolicy(projectPolicy)
- maximumResultSize, err := s.GetSQLResultSize(ctx)
+ maximumResultSize, err := s.GetSQLResultSize(ctx, workspaceID)
if err != nil {
return nil, err
}
- queryTimeout, err := s.GetQueryTimeoutInSeconds(ctx)
+ queryTimeout, err := s.GetQueryTimeoutInSeconds(ctx, workspaceID)
if err != nil {
return nil, err
}
@@ -290,13 +257,14 @@ func (s *Store) GetEffectiveQueryDataPolicy(ctx context.Context, projectFullName
}, nil
}
-func (s *Store) getQueryDataPolicy(ctx context.Context, resource string) (*storepb.QueryDataPolicy, error) {
+func (s *Store) getQueryDataPolicy(ctx context.Context, workspaceID string, resource string) (*storepb.QueryDataPolicy, error) {
resourceType, _, err := common.GetPolicyResourceTypeAndResource(resource)
if err != nil {
return nil, err
}
pType := storepb.Policy_QUERY_DATA
policy, err := s.GetPolicy(ctx, &FindPolicyMessage{
+ Workspace: workspaceID,
ResourceType: &resourceType,
Resource: &resource,
Type: &pType,
@@ -321,7 +289,7 @@ type reviewConfigResource struct {
}
// GetReviewConfigForDatabase will get the review config for a database.
-func (s *Store) GetReviewConfigForDatabase(ctx context.Context, database *DatabaseMessage) (*storepb.ReviewConfigPayload, error) {
+func (s *Store) GetReviewConfigForDatabase(ctx context.Context, workspaceID string, database *DatabaseMessage) (*storepb.ReviewConfigPayload, error) {
resources := []*reviewConfigResource{}
if database.EffectiveEnvironmentID != nil {
resources = append(resources, &reviewConfigResource{
@@ -334,7 +302,7 @@ func (s *Store) GetReviewConfigForDatabase(ctx context.Context, database *Databa
resource: common.FormatProject(database.ProjectID),
})
for _, v := range resources {
- reviewConfig, err := s.getReviewConfigByResource(ctx, v.resourceType, v.resource)
+ reviewConfig, err := s.getReviewConfigByResource(ctx, workspaceID, v.resourceType, v.resource)
if err != nil {
slog.Debug("failed to get review config", slog.String("resource_type", v.resourceType.String()), slog.String("database", database.DatabaseName), log.BBError(err))
continue
@@ -349,10 +317,11 @@ func (s *Store) GetReviewConfigForDatabase(ctx context.Context, database *Databa
return nil, &common.Error{Code: common.NotFound, Err: errors.Errorf("SQL review policy for database %s not found", database.DatabaseName)}
}
-func (s *Store) getReviewConfigByResource(ctx context.Context, resourceType storepb.Policy_Resource, resource string) (*storepb.ReviewConfigPayload, error) {
+func (s *Store) getReviewConfigByResource(ctx context.Context, workspaceID string, resourceType storepb.Policy_Resource, resource string) (*storepb.ReviewConfigPayload, error) {
pType := storepb.Policy_TAG
policy, err := s.GetPolicy(ctx, &FindPolicyMessage{
+ Workspace: workspaceID,
ResourceType: &resourceType,
Resource: &resource,
Type: &pType,
@@ -381,7 +350,7 @@ func (s *Store) getReviewConfigByResource(ctx context.Context, resourceType stor
return nil, errors.Wrapf(err, "failed to extract review config %s", reviewConfigName)
}
- reviewConfig, err := s.GetReviewConfig(ctx, reviewConfigID)
+ reviewConfig, err := s.GetReviewConfig(ctx, workspaceID, reviewConfigID)
if err != nil {
return nil, err
}
@@ -396,14 +365,12 @@ func (s *Store) getReviewConfigByResource(ctx context.Context, resourceType stor
}
// GetMaskingRulePolicy will get the masking rule policy.
-func (s *Store) GetMaskingRulePolicy(ctx context.Context) (*storepb.MaskingRulePolicy, error) {
- workspaceResource, err := s.GetWorkspaceResourceName(ctx)
- if err != nil {
- return nil, err
- }
+func (s *Store) GetMaskingRulePolicy(ctx context.Context, workspaceID string) (*storepb.MaskingRulePolicy, error) {
+ workspaceResource := common.FormatWorkspace(workspaceID)
resourceType := storepb.Policy_WORKSPACE
pType := storepb.Policy_MASKING_RULE
policy, err := s.GetPolicy(ctx, &FindPolicyMessage{
+ Workspace: workspaceID,
ResourceType: &resourceType,
Resource: &workspaceResource,
Type: &pType,
@@ -425,11 +392,12 @@ func (s *Store) GetMaskingRulePolicy(ctx context.Context) (*storepb.MaskingRuleP
}
// GetMaskingExemptionPolicyByProject gets the masking exemption policy for a project.
-func (s *Store) GetMaskingExemptionPolicyByProject(ctx context.Context, projectID string) (*storepb.MaskingExemptionPolicy, error) {
+func (s *Store) GetMaskingExemptionPolicyByProject(ctx context.Context, workspaceID string, projectID string) (*storepb.MaskingExemptionPolicy, error) {
resourceType := storepb.Policy_PROJECT
resource := common.FormatProject(projectID)
pType := storepb.Policy_MASKING_EXEMPTION
policy, err := s.GetPolicy(ctx, &FindPolicyMessage{
+ Workspace: workspaceID,
ResourceType: &resourceType,
Resource: &resource,
Type: &pType,
@@ -465,6 +433,7 @@ type PolicyMessage struct {
// FindPolicyMessage is the message for finding policies.
type FindPolicyMessage struct {
+ Workspace string
ResourceType *storepb.Policy_Resource
Resource *string
Type *storepb.Policy_Type
@@ -477,6 +446,7 @@ type UpdatePolicyMessage struct {
ResourceType storepb.Policy_Resource
Resource string
Type storepb.Policy_Type
+ Workspace string
InheritFromParent *bool
Payload *string
Enforce *bool
@@ -485,7 +455,7 @@ type UpdatePolicyMessage struct {
// GetPolicy gets a policy.
func (s *Store) GetPolicy(ctx context.Context, find *FindPolicyMessage) (*PolicyMessage, error) {
if find.ResourceType != nil && find.Resource != nil && find.Type != nil {
- if v, ok := s.policyCache.Get(getPolicyCacheKey(*find.ResourceType, *find.Resource, *find.Type)); ok && s.enableCache {
+ if v, ok := s.policyCache.Get(getPolicyCacheKey(find.Workspace, *find.ResourceType, *find.Resource, *find.Type)); ok && s.enableCache {
return v, nil
}
}
@@ -499,7 +469,7 @@ func (s *Store) GetPolicy(ctx context.Context, find *FindPolicyMessage) (*Policy
if len(policies) == 0 {
// Cache the policy for not found as well to reduce the look up latency.
if find.ResourceType != nil && find.Resource != nil && find.Type != nil {
- s.policyCache.Add(getPolicyCacheKey(*find.ResourceType, *find.Resource, *find.Type), nil)
+ s.policyCache.Add(getPolicyCacheKey(find.Workspace, *find.ResourceType, *find.Resource, *find.Type), nil)
}
return nil, nil
}
@@ -508,7 +478,7 @@ func (s *Store) GetPolicy(ctx context.Context, find *FindPolicyMessage) (*Policy
}
policy := policies[0]
- s.policyCache.Add(getPolicyCacheKey(policy.ResourceType, policy.Resource, policy.Type), policy)
+ s.policyCache.Add(getPolicyCacheKey(policy.Workspace, policy.ResourceType, policy.Resource, policy.Type), policy)
return policy, nil
}
@@ -526,8 +496,8 @@ func (s *Store) ListPolicies(ctx context.Context, find *FindPolicyMessage) ([]*P
payload,
enforce
FROM policy
- WHERE TRUE
- `)
+ WHERE workspace = ?
+ `, find.Workspace)
if v := find.ResourceType; v != nil {
q.And("resource_type = ?", v.String())
@@ -586,7 +556,7 @@ func (s *Store) ListPolicies(ctx context.Context, find *FindPolicyMessage) ([]*P
}
for _, policy := range policyList {
- s.policyCache.Add(getPolicyCacheKey(policy.ResourceType, policy.Resource, policy.Type), policy)
+ s.policyCache.Add(getPolicyCacheKey(policy.Workspace, policy.ResourceType, policy.Resource, policy.Type), policy)
}
return policyList, nil
@@ -594,6 +564,9 @@ func (s *Store) ListPolicies(ctx context.Context, find *FindPolicyMessage) ([]*P
// CreatePolicy creates a policy.
func (s *Store) CreatePolicy(ctx context.Context, create *PolicyMessage) (*PolicyMessage, error) {
+ if create.Workspace == "" {
+ return nil, errors.Errorf("workspace is required to create policy (resource_type=%s, resource=%s, type=%s)", create.ResourceType, create.Resource, create.Type)
+ }
tx, err := s.GetDB().BeginTx(ctx, nil)
if err != nil {
return nil, err
@@ -609,7 +582,10 @@ func (s *Store) CreatePolicy(ctx context.Context, create *PolicyMessage) (*Polic
return nil, err
}
- s.policyCache.Add(getPolicyCacheKey(policy.ResourceType, policy.Resource, policy.Type), policy)
+ s.policyCache.Add(getPolicyCacheKey(policy.Workspace, policy.ResourceType, policy.Resource, policy.Type), policy)
+ if policy.Type == storepb.Policy_IAM {
+ s.iamPolicyCache.Remove(getIamPolicyCacheKey(policy.Workspace, policy.ResourceType, policy.Resource))
+ }
return policy, nil
}
@@ -628,12 +604,13 @@ func (s *Store) UpdatePolicy(ctx context.Context, patch *UpdatePolicyMessage) (*
set.Comma("enforce = ?", *v)
}
- query, args, err := qb.Q().Space("UPDATE policy SET ? WHERE resource_type = ? AND resource = ? AND type = ? RETURNING payload, inherit_from_parent, enforce, updated_at", set, patch.ResourceType, patch.Resource, patch.Type.String()).ToSQL()
+ query, args, err := qb.Q().Space("UPDATE policy SET ? WHERE resource_type = ? AND resource = ? AND type = ? AND workspace = ? RETURNING payload, inherit_from_parent, enforce, updated_at", set, patch.ResourceType, patch.Resource, patch.Type.String(), patch.Workspace).ToSQL()
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
}
policy := &PolicyMessage{
+ Workspace: patch.Workspace,
Resource: patch.Resource,
ResourceType: patch.ResourceType,
Type: patch.Type,
@@ -651,17 +628,21 @@ func (s *Store) UpdatePolicy(ctx context.Context, patch *UpdatePolicyMessage) (*
return nil, err
}
- s.policyCache.Add(getPolicyCacheKey(policy.ResourceType, policy.Resource, policy.Type), policy)
+ s.policyCache.Add(getPolicyCacheKey(patch.Workspace, patch.ResourceType, patch.Resource, patch.Type), policy)
+ if patch.Type == storepb.Policy_IAM {
+ s.iamPolicyCache.Remove(getIamPolicyCacheKey(patch.Workspace, patch.ResourceType, patch.Resource))
+ }
return policy, nil
}
// DeletePolicy deletes the policy.
func (s *Store) DeletePolicy(ctx context.Context, policy *PolicyMessage) error {
- q := qb.Q().Space("DELETE FROM policy WHERE resource_type = ? AND resource = ? AND type = ?",
+ q := qb.Q().Space("DELETE FROM policy WHERE resource_type = ? AND resource = ? AND type = ? AND workspace = ?",
policy.ResourceType,
policy.Resource,
policy.Type.String(),
+ policy.Workspace,
)
query, args, err := q.ToSQL()
@@ -673,7 +654,10 @@ func (s *Store) DeletePolicy(ctx context.Context, policy *PolicyMessage) error {
return err
}
- s.policyCache.Remove(getPolicyCacheKey(policy.ResourceType, policy.Resource, policy.Type))
+ s.policyCache.Remove(getPolicyCacheKey(policy.Workspace, policy.ResourceType, policy.Resource, policy.Type))
+ if policy.Type == storepb.Policy_IAM {
+ s.iamPolicyCache.Remove(getIamPolicyCacheKey(policy.Workspace, policy.ResourceType, policy.Resource))
+ }
return nil
}
@@ -692,7 +676,7 @@ func upsertPolicyImpl(ctx context.Context, txn *sql.Tx, create *PolicyMessage) (
updated_at
)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
- ON CONFLICT(resource_type, resource, type) DO UPDATE SET
+ ON CONFLICT(workspace, resource_type, resource, type) DO UPDATE SET
inherit_from_parent = EXCLUDED.inherit_from_parent,
payload = EXCLUDED.payload,
enforce = EXCLUDED.enforce,
diff --git a/backend/store/principal.go b/backend/store/principal.go
index 042ae43b12..9e9c761f5f 100644
--- a/backend/store/principal.go
+++ b/backend/store/principal.go
@@ -24,6 +24,8 @@ type FindUserMessage struct {
Offset *int
FilterQ *qb.Query
ProjectID *string
+ // Workspace is required when ProjectID is set, for the project member CTE query.
+ Workspace string
}
// UpdateUserMessage is the message to update a user.
@@ -37,7 +39,7 @@ type UpdateUserMessage struct {
Phone *string
}
-// UserMessage is the message for an user.
+// UserMessage is the message for an end user (principal table).
type UserMessage struct {
ID int
// Email must be lower case.
@@ -81,7 +83,7 @@ func (s *Store) GetUserByEmail(ctx context.Context, email string) (*UserMessage,
}
// BatchGetUsersByEmails gets users (of any type) by emails in batch.
-func (s *Store) BatchGetUsersByEmails(ctx context.Context, emails []string) ([]*UserMessage, error) {
+func (s *Store) BatchGetUsersByEmails(ctx context.Context, workspace string, emails []string) ([]*UserMessage, error) {
if len(emails) == 0 {
return nil, nil
}
@@ -94,9 +96,18 @@ func (s *Store) BatchGetUsersByEmails(ctx context.Context, emails []string) ([]*
var users []*UserMessage
q := qb.Q().Space(`
- SELECT id, deleted, email, name, password_hash, mfa_config, phone, profile, created_at
- FROM principal WHERE email = ANY(?) ORDER BY created_at ASC
- `, normalizedEmails)
+ SELECT p.id, p.deleted, p.email, p.name, p.password_hash, p.mfa_config, p.phone, p.profile, p.created_at
+ FROM principal p
+ JOIN policy pol ON pol.workspace = ? AND pol.resource_type = 'WORKSPACE' AND pol.type = 'IAM'
+ WHERE p.email = ANY(?)
+ AND EXISTS (
+ SELECT 1
+ FROM jsonb_array_elements(pol.payload->'bindings') AS binding,
+ jsonb_array_elements_text(binding->'members') AS member
+ WHERE member = 'users/' || p.email OR member = ?
+ )
+ ORDER BY p.created_at ASC
+ `, workspace, normalizedEmails, common.AllUsers)
sqlStr, args, err := q.ToSQL()
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
@@ -193,11 +204,11 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*U
jsonb_array_elements_text(jsonb_array_elements(policy.payload->'bindings')->'members') AS member,
jsonb_array_elements(policy.payload->'bindings')->>'role' AS role
FROM policy
- WHERE ((resource_type = ? AND resource = ?) OR resource_type = ?) AND type = ?
+ WHERE ((resource_type = ? AND resource = ?) OR resource_type = ?) AND type = ? AND policy.workspace = ?
),
project_members AS (
SELECT ARRAY_AGG(member) AS members FROM all_members WHERE role NOT LIKE 'roles/workspace%'
- )`, storepb.Policy_PROJECT.String(), "projects/"+*v, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String())
+ )`, storepb.Policy_PROJECT.String(), "projects/"+*v, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String(), find.Workspace)
from.Space(`INNER JOIN project_members ON (CONCAT('users/', principal.email) = ANY(project_members.members) OR ? = ANY(project_members.members))`, common.AllUsers)
}
@@ -546,6 +557,7 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmail
// Update IAM policies: bindings->members array contains user references
// Update MASKING_EXEMPTION policies: exemptions->members field contains user references
var invalidatedPolicies []struct {
+ Workspace string
ResourceType storepb.Policy_Resource
Resource string
Type storepb.Policy_Type
@@ -589,7 +601,7 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmail
jsonb_array_elements_text(binding->'members') AS member
WHERE member = $1
)
- RETURNING resource_type, resource, type`
+ RETURNING workspace, resource_type, resource, type`
rows, err := tx.QueryContext(ctx, iamPolicySQL, oldUserRef, newUserRef, storepb.Policy_IAM.String())
if err != nil {
@@ -598,16 +610,18 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmail
defer rows.Close()
for rows.Next() {
- var resourceTypeStr, resource, typeStr string
- if err := rows.Scan(&resourceTypeStr, &resource, &typeStr); err != nil {
+ var workspace, resourceTypeStr, resource, typeStr string
+ if err := rows.Scan(&workspace, &resourceTypeStr, &resource, &typeStr); err != nil {
return nil, errors.Wrapf(err, "failed to scan updated IAM policy")
}
var invalidation struct {
+ Workspace string
ResourceType storepb.Policy_Resource
Resource string
Type storepb.Policy_Type
}
+ invalidation.Workspace = workspace
invalidation.Resource = resource
if val, ok := storepb.Policy_Resource_value[resourceTypeStr]; ok {
@@ -665,7 +679,7 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmail
jsonb_array_elements_text(exemption->'members') AS member
WHERE member = $1
)
- RETURNING resource_type, resource, type`
+ RETURNING workspace, resource_type, resource, type`
rows, err = tx.QueryContext(ctx, maskingPolicySQL, oldUserRef, newUserRef, storepb.Policy_MASKING_EXEMPTION.String())
if err != nil {
@@ -674,16 +688,18 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmail
defer rows.Close()
for rows.Next() {
- var resourceTypeStr, resource, typeStr string
- if err := rows.Scan(&resourceTypeStr, &resource, &typeStr); err != nil {
+ var workspace, resourceTypeStr, resource, typeStr string
+ if err := rows.Scan(&workspace, &resourceTypeStr, &resource, &typeStr); err != nil {
return nil, errors.Wrapf(err, "failed to scan updated MASKING_EXEMPTION policy")
}
var invalidation struct {
+ Workspace string
ResourceType storepb.Policy_Resource
Resource string
Type storepb.Policy_Type
}
+ invalidation.Workspace = workspace
invalidation.Resource = resource
if val, ok := storepb.Policy_Resource_value[resourceTypeStr]; ok {
@@ -779,12 +795,15 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmail
// Invalidate policy cache for updated policies
for _, p := range invalidatedPolicies {
- s.policyCache.Remove(getPolicyCacheKey(p.ResourceType, p.Resource, p.Type))
+ s.policyCache.Remove(getPolicyCacheKey(p.Workspace, p.ResourceType, p.Resource, p.Type))
+ if p.Type == storepb.Policy_IAM {
+ s.iamPolicyCache.Remove(getIamPolicyCacheKey(p.Workspace, p.ResourceType, p.Resource))
+ }
}
- // Invalidate group cache for updated groups
- for _, email := range invalidatedGroupEmails {
- s.groupCache.Remove(email)
+ // Purge all group caches — email change is rare and affects groups cross-workspace.
+ if len(invalidatedGroupEmails) > 0 {
+ s.PurgeGroupCaches()
}
// Re-populate user cache
diff --git a/backend/store/project.go b/backend/store/project.go
index e98e901c8b..956375b07d 100644
--- a/backend/store/project.go
+++ b/backend/store/project.go
@@ -35,7 +35,7 @@ func (p *ProjectMessage) GetName() string {
// FindProjectMessage is the message for finding projects.
type FindProjectMessage struct {
- Workspace *string
+ Workspace string
ResourceID *string
ResourceIDs []string
ShowDeleted bool
@@ -48,6 +48,7 @@ type FindProjectMessage struct {
// UpdateProjectMessage is the message for updating a project.
type UpdateProjectMessage struct {
ResourceID string
+ Workspace string
Title *string
Setting *storepb.Project
@@ -55,6 +56,30 @@ type UpdateProjectMessage struct {
}
// GetProject gets project by resource ID.
+// GetDefaultProjectID returns the default project resource ID for the given workspace.
+// Checks for new format ("default-{workspaceID}") first, falls back to legacy ("default").
+func (s *Store) GetDefaultProjectID(ctx context.Context, workspace string) (string, error) {
+ newID := common.DefaultProjectID(workspace)
+ resourceID := newID
+ project, err := s.GetProject(ctx, &FindProjectMessage{Workspace: workspace, ResourceID: &resourceID})
+ if err != nil {
+ return "", err
+ }
+ if project != nil {
+ return newID, nil
+ }
+ // Legacy fallback.
+ legacyID := "default"
+ project, err = s.GetProject(ctx, &FindProjectMessage{Workspace: workspace, ResourceID: &legacyID})
+ if err != nil {
+ return "", err
+ }
+ if project != nil {
+ return legacyID, nil
+ }
+ return newID, nil
+}
+
func (s *Store) GetProject(ctx context.Context, find *FindProjectMessage) (*ProjectMessage, error) {
if find.ResourceID != nil {
if v, ok := s.projectCache.Get(*find.ResourceID); ok && s.enableCache {
@@ -83,13 +108,10 @@ func (s *Store) GetProject(ctx context.Context, find *FindProjectMessage) (*Proj
// ListProjects lists all projects.
func (s *Store) ListProjects(ctx context.Context, find *FindProjectMessage) ([]*ProjectMessage, error) {
- q := qb.Q().Space("SELECT resource_id, workspace, name, setting, deleted FROM project WHERE TRUE")
+ q := qb.Q().Space("SELECT resource_id, workspace, name, setting, deleted FROM project WHERE workspace = ?", find.Workspace)
if filterQ := find.FilterQ; filterQ != nil {
q.And("?", filterQ)
}
- if v := find.Workspace; v != nil {
- q.And("workspace = ?", *v)
- }
if v := find.ResourceID; v != nil {
q.And("resource_id = ?", *v)
}
@@ -107,6 +129,7 @@ func (s *Store) ListProjects(ctx context.Context, find *FindProjectMessage) ([]*
}
q.Space(fmt.Sprintf("ORDER BY %s", strings.Join(orderBy, ", ")))
} else {
+ // TODO(ed): order won't work
q.Space("ORDER BY project.resource_id")
}
if v := find.Limit; v != nil {
@@ -245,7 +268,7 @@ func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creat
return nil, err
}
- s.policyCache.Add(getPolicyCacheKey(policyMessage.ResourceType, policyMessage.Resource, policyMessage.Type), policyMessage)
+ s.policyCache.Add(getPolicyCacheKey(policyMessage.Workspace, policyMessage.ResourceType, policyMessage.Resource, policyMessage.Type), policyMessage)
s.storeProjectCache(project)
return project, nil
}
@@ -288,8 +311,8 @@ func (s *Store) UpdateProjects(ctx context.Context, patches ...*UpdateProjectMes
deleted = COALESCE(u.deleted, p.deleted),
setting = COALESCE(u.setting::jsonb, p.setting)
FROM unnest(?::text[], ?::text[], ?::bool[], ?::text[]) AS u(resource_id, name, deleted, setting)
- WHERE p.resource_id = u.resource_id
- `, resourceIDs, titles, deleteds, settings)
+ WHERE p.resource_id = u.resource_id AND p.workspace = ?
+ `, resourceIDs, titles, deleteds, settings, patches[0].Workspace)
query, args, err := q.ToSQL()
if err != nil {
@@ -316,7 +339,12 @@ func (s *Store) removeProjectCache(resourceID string) {
// - Administrative cleanup of old soft-deleted projects
// - Test cleanup
// Following AIP-164/165, this only works on projects where deleted = TRUE.
-func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
+func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceID string) error {
+ defaultProjectID, err := s.GetDefaultProjectID(ctx, workspace)
+ if err != nil {
+ return errors.Wrap(err, "failed to get default project ID")
+ }
+
tx, err := s.GetDB().BeginTx(ctx, nil)
if err != nil {
return errors.Wrap(err, "failed to begin transaction")
@@ -336,6 +364,7 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
// Delete policy entries that reference this project
q = qb.Q().Space("DELETE FROM policy")
q.Space("WHERE (resource_type = ? AND resource = 'projects/' || ?)", storepb.Policy_PROJECT.String(), resourceID)
+ q.And("workspace = ?", workspace)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build policy delete query")
@@ -345,7 +374,7 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
}
// Delete worksheets associated with this project
- q = qb.Q().Space("UPDATE worksheet SET project = ? WHERE project = ?", common.DefaultProjectID, resourceID)
+ q = qb.Q().Space("UPDATE worksheet SET project = ? WHERE project = ?", defaultProjectID, resourceID)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build worksheet update query")
@@ -478,7 +507,7 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
}
// Move databases to the default project instead of deleting them
- q = qb.Q().Space("UPDATE db SET project = ? WHERE project = ?", common.DefaultProjectID, resourceID)
+ q = qb.Q().Space("UPDATE db SET project = ? WHERE project = ?", defaultProjectID, resourceID)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build db update query")
@@ -501,8 +530,8 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
// Delete worksheet_organizer entries
q = qb.Q().Space(`DELETE FROM worksheet_organizer
- WHERE principal IN (SELECT email FROM service_account WHERE project = ?)
- OR principal IN (SELECT email FROM workload_identity WHERE project = ?)`, resourceID, resourceID)
+ WHERE principal IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)
+ OR principal IN (SELECT email FROM workload_identity WHERE project = ? AND workspace = ?)`, resourceID, workspace, resourceID, workspace)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build worksheet_organizer delete query")
@@ -513,8 +542,8 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
// Delete worksheets created by project service accounts or workload identities
q = qb.Q().Space(`DELETE FROM worksheet
- WHERE creator IN (SELECT email FROM service_account WHERE project = ?)
- OR creator IN (SELECT email FROM workload_identity WHERE project = ?)`, resourceID, resourceID)
+ WHERE creator IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)
+ OR creator IN (SELECT email FROM workload_identity WHERE project = ? AND workspace = ?)`, resourceID, workspace, resourceID, workspace)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build worksheet delete query for principals")
@@ -525,8 +554,8 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
// Nullify revision.deleter references
q = qb.Q().Space(`UPDATE revision SET deleter = NULL
- WHERE deleter IN (SELECT email FROM service_account WHERE project = ?)
- OR deleter IN (SELECT email FROM workload_identity WHERE project = ?)`, resourceID, resourceID)
+ WHERE deleter IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)
+ OR deleter IN (SELECT email FROM workload_identity WHERE project = ? AND workspace = ?)`, resourceID, workspace, resourceID, workspace)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build revision update query")
@@ -536,7 +565,7 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
}
// Delete project service accounts
- q = qb.Q().Space("DELETE FROM service_account WHERE project = ?", resourceID)
+ q = qb.Q().Space("DELETE FROM service_account WHERE project = ? AND workspace = ?", resourceID, workspace)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build service_account delete query")
@@ -546,7 +575,7 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
}
// Delete project workload identities
- q = qb.Q().Space("DELETE FROM workload_identity WHERE project = ?", resourceID)
+ q = qb.Q().Space("DELETE FROM workload_identity WHERE project = ? AND workspace = ?", resourceID, workspace)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build workload_identity delete query")
@@ -556,7 +585,7 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
}
// Finally, delete the project itself (only if it's marked as deleted)
- q = qb.Q().Space("DELETE FROM project WHERE resource_id = ? AND deleted = TRUE", resourceID)
+ q = qb.Q().Space("DELETE FROM project WHERE resource_id = ? AND deleted = TRUE AND workspace = ?", resourceID, workspace)
sql, args, err = q.ToSQL()
if err != nil {
return errors.Wrap(err, "failed to build project delete query")
@@ -584,7 +613,7 @@ func (s *Store) DeleteProject(ctx context.Context, resourceID string) error {
return nil
}
-func GetListProjectFilter(filter string) (*qb.Query, error) {
+func GetListProjectFilter(workspace, filter string) (*qb.Query, error) {
if filter == "" {
return nil, nil
}
@@ -631,7 +660,7 @@ func GetListProjectFilter(filter string) (*qb.Query, error) {
return qb.Q().Space("project.resource_id = ?", value.(string)), nil
case "exclude_default":
if excludeDefault, ok := value.(bool); excludeDefault && ok {
- return qb.Q().Space("project.resource_id != ?", common.DefaultProjectID), nil
+ return qb.Q().Space("project.resource_id != ? AND project.resource_id != 'default'", common.DefaultProjectID(workspace)), nil
}
return qb.Q().Space("TRUE"), nil
case "state":
diff --git a/backend/store/project_filter_test.go b/backend/store/project_filter_test.go
index 117d3825b5..7709500c33 100644
--- a/backend/store/project_filter_test.go
+++ b/backend/store/project_filter_test.go
@@ -39,8 +39,8 @@ func TestGetListProjectFilter(t *testing.T) {
{
name: "exclude_default filter - true",
filter: `exclude_default == true`,
- wantSQL: "(project.resource_id != $1)",
- wantArgs: []any{"default"},
+ wantSQL: "(project.resource_id != $1 AND project.resource_id != 'default')",
+ wantArgs: []any{"default-test-workspace"},
wantErr: false,
},
{
@@ -109,8 +109,8 @@ func TestGetListProjectFilter(t *testing.T) {
{
name: "complex nested AND/OR",
filter: `(name == "p1" || name == "p2") && exclude_default == true`,
- wantSQL: "(((project.name = $1 OR project.name = $2) AND project.resource_id != $3))",
- wantArgs: []any{"p1", "p2", "default"},
+ wantSQL: "(((project.name = $1 OR project.name = $2) AND project.resource_id != $3 AND project.resource_id != 'default'))",
+ wantArgs: []any{"p1", "p2", "default-test-workspace"},
wantErr: false,
},
{
@@ -135,7 +135,7 @@ func TestGetListProjectFilter(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- q, err := GetListProjectFilter(tt.filter)
+ q, err := GetListProjectFilter("test-workspace", tt.filter)
if tt.wantErr {
require.Error(t, err)
diff --git a/backend/store/review_config.go b/backend/store/review_config.go
index 4d4b9d51ff..8909e5bef5 100644
--- a/backend/store/review_config.go
+++ b/backend/store/review_config.go
@@ -23,20 +23,23 @@ type ReviewConfigMessage struct {
// FindReviewConfigMessage is the API message for finding sql review.
type FindReviewConfigMessage struct {
- ID *string
+ Workspace string
+ ID *string
}
// PatchReviewConfigMessage is the message to patch a sql review.
type PatchReviewConfigMessage struct {
- ID string
- Name *string
- Enforce *bool
- Payload *storepb.ReviewConfigPayload
+ ID string
+ Workspace string
+ Name *string
+ Enforce *bool
+ Payload *storepb.ReviewConfigPayload
}
// GetReviewConfig gets sql review by id.
-func (s *Store) GetReviewConfig(ctx context.Context, id string) (*ReviewConfigMessage, error) {
- list, err := s.ListReviewConfigs(ctx, &FindReviewConfigMessage{ID: &id})
+// Pass workspace="" for cross-workspace lookup.
+func (s *Store) GetReviewConfig(ctx context.Context, workspace string, id string) (*ReviewConfigMessage, error) {
+ list, err := s.ListReviewConfigs(ctx, &FindReviewConfigMessage{Workspace: workspace, ID: &id})
if err != nil {
return nil, err
}
@@ -60,8 +63,8 @@ func (s *Store) ListReviewConfigs(ctx context.Context, find *FindReviewConfigMes
name,
payload
FROM review_config
- WHERE TRUE
- `)
+ WHERE workspace = ?
+ `, find.Workspace)
if v := find.ID; v != nil {
q.And("id = ?", *v)
@@ -146,8 +149,8 @@ func (s *Store) CreateReviewConfig(ctx context.Context, create *ReviewConfigMess
}
// DeleteReviewConfig deletes sql review by ID.
-func (s *Store) DeleteReviewConfig(ctx context.Context, id string) error {
- q := qb.Q().Space("DELETE FROM review_config WHERE id = ?", id)
+func (s *Store) DeleteReviewConfig(ctx context.Context, workspace string, id string) error {
+ q := qb.Q().Space("DELETE FROM review_config WHERE id = ? AND workspace = ?", id, workspace)
query, args, err := q.ToSQL()
if err != nil {
@@ -184,14 +187,14 @@ func (s *Store) UpdateReviewConfig(ctx context.Context, patch *PatchReviewConfig
q := qb.Q().Space(`
UPDATE review_config
SET ?
- WHERE id = ?
+ WHERE id = ? AND workspace = ?
RETURNING
id,
workspace,
enabled,
name,
payload
- `, set, patch.ID)
+ `, set, patch.ID, patch.Workspace)
query, args, err := q.ToSQL()
if err != nil {
diff --git a/backend/store/role.go b/backend/store/role.go
index faca088413..672f2f3540 100644
--- a/backend/store/role.go
+++ b/backend/store/role.go
@@ -25,6 +25,7 @@ type RoleMessage struct {
// UpdateRoleMessage is the message for updating roles.
type UpdateRoleMessage struct {
ResourceID string
+ Workspace string
Name *string
Description *string
@@ -33,6 +34,7 @@ type UpdateRoleMessage struct {
// FindRoleMessage is the message for finding roles.
type FindRoleMessage struct {
+ Workspace string
ResourceID *string
}
@@ -41,16 +43,17 @@ type RoleUsedByResource struct {
Resource string
}
-func (s *Store) GetResourcesUsedByRole(ctx context.Context, role string) ([]*RoleUsedByResource, error) {
+func (s *Store) GetResourcesUsedByRole(ctx context.Context, workspace string, role string) ([]*RoleUsedByResource, error) {
q := qb.Q().Space(`
SELECT resource, resource_type FROM policy
CROSS JOIN LATERAL jsonb_array_elements(payload->'bindings') AS binding
WHERE
type = ? AND
+ workspace = ? AND
COALESCE(jsonb_array_length(binding->'members'), 0) > 0 AND
binding->>'role' = ?
GROUP BY resource, resource_type
- `, storepb.Policy_IAM.String(), role)
+ `, storepb.Policy_IAM.String(), workspace, role)
query, args, err := q.ToSQL()
if err != nil {
@@ -135,11 +138,11 @@ func (s *Store) GetRole(ctx context.Context, find *FindRoleMessage) (*RoleMessag
// GetRoleSnapshot returns a role by ID with snapshot reads (with cache).
// Trades consistency for performance.
-func (s *Store) GetRoleSnapshot(ctx context.Context, resourceID string) (*RoleMessage, error) {
+func (s *Store) GetRoleSnapshot(ctx context.Context, workspaceID string, resourceID string) (*RoleMessage, error) {
if v, ok := s.rolesCache.Get(resourceID); ok {
return v, nil
}
- return s.GetRole(ctx, &FindRoleMessage{ResourceID: &resourceID})
+ return s.GetRole(ctx, &FindRoleMessage{Workspace: workspaceID, ResourceID: &resourceID})
}
// ListRoles returns a list of roles.
@@ -155,8 +158,8 @@ func (s *Store) ListRoles(ctx context.Context, find *FindRoleMessage) ([]*RoleMe
SELECT
resource_id, workspace, name, description, permissions
FROM role
- WHERE TRUE
- `)
+ WHERE workspace = ?
+ `, find.Workspace)
if v := find.ResourceID; v != nil {
q.And("resource_id = ?", *v)
@@ -232,9 +235,9 @@ func (s *Store) UpdateRole(ctx context.Context, patch *UpdateRoleMessage) (*Role
q := qb.Q().Space(`
UPDATE role
SET ?
- WHERE resource_id = ?
+ WHERE resource_id = ? AND workspace = ?
RETURNING name, description, permissions
- `, set, patch.ResourceID)
+ `, set, patch.ResourceID, patch.Workspace)
query, args, err := q.ToSQL()
if err != nil {
@@ -263,11 +266,11 @@ func (s *Store) UpdateRole(ctx context.Context, patch *UpdateRoleMessage) (*Role
}
// DeleteRole deletes an existing role.
-func (s *Store) DeleteRole(ctx context.Context, resourceID string) error {
+func (s *Store) DeleteRole(ctx context.Context, workspace string, resourceID string) error {
q := qb.Q().Space(`
DELETE FROM role
- WHERE resource_id = ?
- `, resourceID)
+ WHERE resource_id = ? AND workspace = ?
+ `, resourceID, workspace)
query, args, err := q.ToSQL()
if err != nil {
diff --git a/backend/store/runner_queries.go b/backend/store/runner_queries.go
new file mode 100644
index 0000000000..69f3c6074d
--- /dev/null
+++ b/backend/store/runner_queries.go
@@ -0,0 +1,199 @@
+package store
+
+// runner_queries.go provides cross-workspace query methods for background runners.
+// These methods intentionally omit workspace filtering because runners process
+// tasks across all workspaces. They should NOT be used by API handlers.
+//
+// After loading an entity, use its .Workspace field for subsequent workspace-scoped queries.
+
+import (
+ "context"
+ "database/sql"
+ "time"
+
+ "github.com/pkg/errors"
+
+ "github.com/bytebase/bytebase/backend/common"
+ "github.com/bytebase/bytebase/backend/common/qb"
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+)
+
+// GetProjectByResourceID gets a project by its globally unique resource ID without workspace filter.
+// For use by runners that resolve workspace from the loaded entity.
+func (s *Store) GetProjectByResourceID(ctx context.Context, resourceID string) (*ProjectMessage, error) {
+ if v, ok := s.projectCache.Get(resourceID); ok && s.enableCache {
+ return v, nil
+ }
+
+ q := qb.Q().Space("SELECT resource_id, workspace, name, setting, deleted FROM project WHERE resource_id = ?", resourceID)
+ query, args, err := q.ToSQL()
+ if err != nil {
+ return nil, err
+ }
+
+ var project ProjectMessage
+ var payload []byte
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
+ &project.ResourceID,
+ &project.Workspace,
+ &project.Title,
+ &payload,
+ &project.Deleted,
+ ); err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil
+ }
+ return nil, err
+ }
+ setting := &storepb.Project{}
+ if err := common.ProtojsonUnmarshaler.Unmarshal(payload, setting); err != nil {
+ return nil, err
+ }
+ project.Setting = setting
+ s.storeProjectCache(&project)
+ return &project, nil
+}
+
+// GetInstanceByResourceID gets an instance by its globally unique resource ID without workspace filter.
+// For use by runners that resolve workspace from the loaded entity.
+func (s *Store) GetInstanceByResourceID(ctx context.Context, resourceID string) (*InstanceMessage, error) {
+ if v, ok := s.instanceCache.Get(getInstanceCacheKey(resourceID)); ok && s.enableCache {
+ return v, nil
+ }
+
+ q := qb.Q().Space(`
+ SELECT
+ instance.resource_id,
+ instance.workspace,
+ instance.environment,
+ instance.deleted,
+ instance.metadata
+ FROM instance
+ WHERE instance.resource_id = ?
+ `, resourceID)
+ query, args, err := q.ToSQL()
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to build sql")
+ }
+
+ var instance InstanceMessage
+ var environment sql.NullString
+ var metadata []byte
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
+ &instance.ResourceID,
+ &instance.Workspace,
+ &environment,
+ &instance.Deleted,
+ &metadata,
+ ); err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil
+ }
+ return nil, err
+ }
+ if environment.Valid {
+ instance.EnvironmentID = &environment.String
+ }
+ instanceMetadata := &storepb.Instance{}
+ if err := common.ProtojsonUnmarshaler.Unmarshal(metadata, instanceMetadata); err != nil {
+ return nil, err
+ }
+ instance.Metadata = instanceMetadata
+
+ if err := s.deobfuscateInstances(ctx, []*InstanceMessage{&instance}); err != nil {
+ return nil, err
+ }
+ s.instanceCache.Add(getInstanceCacheKey(instance.ResourceID), &instance)
+ return &instance, nil
+}
+
+// ListAllInstances lists instances across all workspaces without workspace filter.
+// For use by runners (e.g., schema sync) that need to process all instances.
+func (s *Store) ListAllInstances(ctx context.Context, showDeleted bool) ([]*InstanceMessage, error) {
+ where := qb.Q().Space("TRUE")
+ if !showDeleted {
+ where.And("instance.deleted = ?", false)
+ }
+
+ q := qb.Q().Space(`
+ SELECT
+ instance.resource_id,
+ instance.workspace,
+ instance.environment,
+ instance.deleted,
+ instance.metadata
+ FROM instance
+ WHERE ?
+ ORDER BY resource_id ASC
+ `, where)
+
+ query, args, err := q.ToSQL()
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to build sql")
+ }
+
+ var instances []*InstanceMessage
+ rows, err := s.GetDB().QueryContext(ctx, query, args...)
+ if err != nil {
+ return nil, err
+ }
+ defer rows.Close()
+ for rows.Next() {
+ var instance InstanceMessage
+ var environment sql.NullString
+ var metadata []byte
+ if err := rows.Scan(
+ &instance.ResourceID,
+ &instance.Workspace,
+ &environment,
+ &instance.Deleted,
+ &metadata,
+ ); err != nil {
+ return nil, err
+ }
+ if environment.Valid {
+ instance.EnvironmentID = &environment.String
+ }
+ instanceMetadata := &storepb.Instance{}
+ if err := common.ProtojsonUnmarshaler.Unmarshal(metadata, instanceMetadata); err != nil {
+ return nil, err
+ }
+ instance.Metadata = instanceMetadata
+ instances = append(instances, &instance)
+ }
+ if err := rows.Err(); err != nil {
+ return nil, err
+ }
+
+ // Deobfuscate per-workspace (group by workspace to avoid redundant secret lookups).
+ byWorkspace := make(map[string][]*InstanceMessage)
+ for _, inst := range instances {
+ byWorkspace[inst.Workspace] = append(byWorkspace[inst.Workspace], inst)
+ }
+ for _, wsInstances := range byWorkspace {
+ if err := s.deobfuscateInstances(ctx, wsInstances); err != nil {
+ return nil, err
+ }
+ }
+
+ for _, instance := range instances {
+ s.instanceCache.Add(getInstanceCacheKey(instance.ResourceID), instance)
+ }
+ return instances, nil
+}
+
+// DeleteExpiredExportArchivesAll deletes expired export archives across all workspaces.
+// For use by the cleaner runner.
+func (s *Store) DeleteExpiredExportArchivesAll(ctx context.Context, retentionPeriod time.Duration) (int64, error) {
+ cutoffTime := time.Now().Add(-retentionPeriod)
+ q := qb.Q().Space("DELETE FROM export_archive WHERE created_at < ?", cutoffTime)
+ query, args, err := q.ToSQL()
+ if err != nil {
+ return 0, errors.Wrapf(err, "failed to build sql")
+ }
+ result, err := s.GetDB().ExecContext(ctx, query, args...)
+ if err != nil {
+ return 0, err
+ }
+ return result.RowsAffected()
+}
diff --git a/backend/store/server_config.go b/backend/store/server_config.go
new file mode 100644
index 0000000000..de09116b52
--- /dev/null
+++ b/backend/store/server_config.go
@@ -0,0 +1,35 @@
+package store
+
+import (
+ "context"
+
+ "github.com/pkg/errors"
+
+ "github.com/bytebase/bytebase/backend/common"
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+)
+
+// GetServerConfig returns the global server configuration.
+// Stored in the server_config table (single row, not workspace-scoped).
+func (s *Store) GetServerConfig(ctx context.Context) (*storepb.ServerConfigPayload, error) {
+ var payloadBytes []byte
+ if err := s.GetDB().QueryRowContext(ctx,
+ `SELECT payload FROM server_config LIMIT 1`,
+ ).Scan(&payloadBytes); err != nil {
+ return nil, errors.Wrap(err, "failed to get server config")
+ }
+ config := &storepb.ServerConfigPayload{}
+ if err := common.ProtojsonUnmarshaler.Unmarshal(payloadBytes, config); err != nil {
+ return nil, errors.Wrap(err, "failed to unmarshal server config")
+ }
+ return config, nil
+}
+
+// GetAuthSecret returns the global auth secret used for JWT signing.
+func (s *Store) GetAuthSecret(ctx context.Context) (string, error) {
+ config, err := s.GetServerConfig(ctx)
+ if err != nil {
+ return "", err
+ }
+ return config.AuthSecret, nil
+}
diff --git a/backend/store/service_account.go b/backend/store/service_account.go
index def8275779..9012bdfb61 100644
--- a/backend/store/service_account.go
+++ b/backend/store/service_account.go
@@ -24,6 +24,7 @@ type ServiceAccountMessage struct {
// FindServiceAccountMessage is the message for finding service accounts.
type FindServiceAccountMessage struct {
+ Workspace string
Email *string
ShowDeleted bool
Limit *int
@@ -52,9 +53,40 @@ type UpdateServiceAccountMessage struct {
Delete *bool
}
-// GetServiceAccountByEmail gets a service account by email.
+// GetServiceAccountByEmail gets a service account by email without workspace filter.
+// For use by login flow, runners, and GetAccountByEmail (cross-workspace).
func (s *Store) GetServiceAccountByEmail(ctx context.Context, email string) (*ServiceAccountMessage, error) {
- sas, err := s.ListServiceAccounts(ctx, &FindServiceAccountMessage{Email: &email, ShowDeleted: true})
+ q := qb.Q().Space(`
+ SELECT deleted, email, name, workspace, service_key_hash, project
+ FROM service_account
+ WHERE email = ?
+ `, strings.ToLower(email))
+
+ query, args, err := q.ToSQL()
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to build sql")
+ }
+
+ var sa ServiceAccountMessage
+ var project sql.NullString
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
+ &sa.MemberDeleted, &sa.Email, &sa.Name, &sa.Workspace, &sa.ServiceKeyHash, &project,
+ ); err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil
+ }
+ return nil, err
+ }
+ if project.Valid {
+ sa.Project = &project.String
+ }
+ return &sa, nil
+}
+
+// GetServiceAccount gets a service account by workspace and email.
+// For use by API layer (workspace-scoped).
+func (s *Store) GetServiceAccount(ctx context.Context, workspace string, email string) (*ServiceAccountMessage, error) {
+ sas, err := s.ListServiceAccounts(ctx, &FindServiceAccountMessage{Workspace: workspace, Email: &email, ShowDeleted: true})
if err != nil {
return nil, err
}
@@ -66,7 +98,7 @@ func (s *Store) GetServiceAccountByEmail(ctx context.Context, email string) (*Se
// ListServiceAccounts lists service accounts.
func (s *Store) ListServiceAccounts(ctx context.Context, find *FindServiceAccountMessage) ([]*ServiceAccountMessage, error) {
- where := qb.Q().Space("TRUE")
+ where := qb.Q().Space("workspace = ?", find.Workspace)
if v := find.Email; v != nil {
where.And("email = ?", strings.ToLower(*v))
@@ -192,9 +224,9 @@ func (s *Store) UpdateServiceAccount(ctx context.Context, sa *ServiceAccountMess
return sa, nil
}
- sqlStr, args, err := qb.Q().Space(`UPDATE service_account SET ? WHERE email = ?
+ sqlStr, args, err := qb.Q().Space(`UPDATE service_account SET ? WHERE email = ? AND workspace = ?
RETURNING deleted, email, name, workspace, service_key_hash, project`,
- set, sa.Email).ToSQL()
+ set, sa.Email, sa.Workspace).ToSQL()
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
}
diff --git a/backend/store/setting.go b/backend/store/setting.go
index 1a7295c0a2..399d407a22 100644
--- a/backend/store/setting.go
+++ b/backend/store/setting.go
@@ -45,8 +45,8 @@ func getSettingMessage(name storepb.SettingName) (proto.Message, error) {
}
// GetSQLResultSize gets the valid data_export_result_size from the workspace profile setting.
-func (s *Store) GetSQLResultSize(ctx context.Context) (int64, error) {
- workspaceProfile, err := s.GetWorkspaceProfileSetting(ctx)
+func (s *Store) GetSQLResultSize(ctx context.Context, workspaceID string) (int64, error) {
+ workspaceProfile, err := s.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return 0, err
}
@@ -58,8 +58,8 @@ func (s *Store) GetSQLResultSize(ctx context.Context) (int64, error) {
}
// GetQueryTimeoutInSeconds gets the valid query_timeout from the workspace profile setting.
-func (s *Store) GetQueryTimeoutInSeconds(ctx context.Context) (int64, error) {
- workspaceProfile, err := s.GetWorkspaceProfileSetting(ctx)
+func (s *Store) GetQueryTimeoutInSeconds(ctx context.Context, workspaceID string) (int64, error) {
+ workspaceProfile, err := s.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return 0, err
}
@@ -71,8 +71,8 @@ func (s *Store) GetQueryTimeoutInSeconds(ctx context.Context) (int64, error) {
}
// GetWorkspaceProfileSetting gets the workspace profile setting payload.
-func (s *Store) GetWorkspaceProfileSetting(ctx context.Context) (*storepb.WorkspaceProfileSetting, error) {
- setting, err := s.GetSetting(ctx, storepb.SettingName_WORKSPACE_PROFILE)
+func (s *Store) GetWorkspaceProfileSetting(ctx context.Context, workspaceID string) (*storepb.WorkspaceProfileSetting, error) {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_WORKSPACE_PROFILE)
if err != nil {
return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_WORKSPACE_PROFILE)
}
@@ -87,8 +87,8 @@ func (s *Store) GetWorkspaceProfileSetting(ctx context.Context) (*storepb.Worksp
return val, nil
}
-func (s *Store) GetAppIMSetting(ctx context.Context) (*storepb.AppIMSetting, error) {
- setting, err := s.GetSetting(ctx, storepb.SettingName_APP_IM)
+func (s *Store) GetAppIMSetting(ctx context.Context, workspaceID string) (*storepb.AppIMSetting, error) {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_APP_IM)
if err != nil {
return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_APP_IM)
}
@@ -103,8 +103,8 @@ func (s *Store) GetAppIMSetting(ctx context.Context) (*storepb.AppIMSetting, err
return val, nil
}
-func (s *Store) GetSystemSetting(ctx context.Context) (*storepb.SystemSetting, error) {
- setting, err := s.GetSetting(ctx, storepb.SettingName_SYSTEM)
+func (s *Store) GetSystemSetting(ctx context.Context, workspaceID string) (*storepb.SystemSetting, error) {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_SYSTEM)
if err != nil {
return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_SYSTEM)
}
@@ -120,8 +120,8 @@ func (s *Store) GetSystemSetting(ctx context.Context) (*storepb.SystemSetting, e
}
// UpdateLicense updates the license in SYSTEM setting.
-func (s *Store) UpdateLicense(ctx context.Context, license string) error {
- setting, err := s.GetSetting(ctx, storepb.SettingName_SYSTEM)
+func (s *Store) UpdateLicense(ctx context.Context, workspaceID string, license string) error {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_SYSTEM)
if err != nil {
return errors.Wrap(err, "failed to get system setting")
}
@@ -145,8 +145,8 @@ func (s *Store) UpdateLicense(ctx context.Context, license string) error {
}
// GetWorkspaceApprovalSetting gets the workspace approval setting.
-func (s *Store) GetWorkspaceApprovalSetting(ctx context.Context) (*storepb.WorkspaceApprovalSetting, error) {
- setting, err := s.GetSetting(ctx, storepb.SettingName_WORKSPACE_APPROVAL)
+func (s *Store) GetWorkspaceApprovalSetting(ctx context.Context, workspaceID string) (*storepb.WorkspaceApprovalSetting, error) {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_WORKSPACE_APPROVAL)
if err != nil {
return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_WORKSPACE_APPROVAL)
}
@@ -162,8 +162,8 @@ func (s *Store) GetWorkspaceApprovalSetting(ctx context.Context) (*storepb.Works
}
// GetSemanticTypesSetting gets the semantic types setting.
-func (s *Store) GetSemanticTypesSetting(ctx context.Context) (*storepb.SemanticTypeSetting, error) {
- setting, err := s.GetSetting(ctx, storepb.SettingName_SEMANTIC_TYPES)
+func (s *Store) GetSemanticTypesSetting(ctx context.Context, workspaceID string) (*storepb.SemanticTypeSetting, error) {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_SEMANTIC_TYPES)
if err != nil {
return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_SEMANTIC_TYPES)
}
@@ -179,8 +179,8 @@ func (s *Store) GetSemanticTypesSetting(ctx context.Context) (*storepb.SemanticT
}
// GetDataClassificationSetting gets the data classification setting.
-func (s *Store) GetDataClassificationSetting(ctx context.Context) (*storepb.DataClassificationSetting, error) {
- setting, err := s.GetSetting(ctx, storepb.SettingName_DATA_CLASSIFICATION)
+func (s *Store) GetDataClassificationSetting(ctx context.Context, workspaceID string) (*storepb.DataClassificationSetting, error) {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_DATA_CLASSIFICATION)
if err != nil {
return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_DATA_CLASSIFICATION)
}
@@ -195,8 +195,8 @@ func (s *Store) GetDataClassificationSetting(ctx context.Context) (*storepb.Data
return val, nil
}
-func (s *Store) GetAISetting(ctx context.Context) (*storepb.AISetting, error) {
- setting, err := s.GetSetting(ctx, storepb.SettingName_AI)
+func (s *Store) GetAISetting(ctx context.Context, workspaceID string) (*storepb.AISetting, error) {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_AI)
if err != nil {
return nil, err
}
@@ -211,8 +211,8 @@ func (s *Store) GetAISetting(ctx context.Context) (*storepb.AISetting, error) {
return val, nil
}
-func (s *Store) GetEnvironment(ctx context.Context) (*storepb.EnvironmentSetting, error) {
- setting, err := s.GetSetting(ctx, storepb.SettingName_ENVIRONMENT)
+func (s *Store) GetEnvironment(ctx context.Context, workspaceID string) (*storepb.EnvironmentSetting, error) {
+ setting, err := s.GetSetting(ctx, workspaceID, storepb.SettingName_ENVIRONMENT)
if err != nil {
return nil, err
}
@@ -229,16 +229,17 @@ func (s *Store) GetEnvironment(ctx context.Context) (*storepb.EnvironmentSetting
// FindSettingMessage is the message for finding settings.
type FindSettingMessage struct {
- Name *storepb.SettingName
+ Workspace string
+ Name *storepb.SettingName
}
// GetSetting returns the setting by name.
-func (s *Store) GetSetting(ctx context.Context, name storepb.SettingName) (*SettingMessage, error) {
- if v, ok := s.settingCache.Get(name); ok && s.enableCache {
+func (s *Store) GetSetting(ctx context.Context, workspace string, name storepb.SettingName) (*SettingMessage, error) {
+ if v, ok := s.settingCache.Get(getSettingCacheKey(workspace, name)); ok && s.enableCache {
return v, nil
}
- settings, err := s.ListSettings(ctx, &FindSettingMessage{Name: &name})
+ settings, err := s.ListSettings(ctx, &FindSettingMessage{Workspace: workspace, Name: &name})
if err != nil {
return nil, err
}
@@ -260,9 +261,10 @@ func (s *Store) ListSettings(ctx context.Context, find *FindSettingMessage) ([]*
workspace,
value
FROM setting
- WHERE TRUE
- `)
- if find != nil && find.Name != nil {
+ WHERE workspace = ?
+ `, find.Workspace)
+
+ if find.Name != nil {
q.And("name = ?", find.Name.String())
}
query, args, err := q.ToSQL()
@@ -309,7 +311,7 @@ func (s *Store) ListSettings(ctx context.Context, find *FindSettingMessage) ([]*
}
for _, setting := range settingMessages {
- s.settingCache.Add(setting.Name, setting)
+ s.settingCache.Add(getSettingCacheKey(setting.Workspace, setting.Name), setting)
}
return settingMessages, nil
}
@@ -324,7 +326,7 @@ func (s *Store) UpsertSetting(ctx context.Context, update *SettingMessage) (*Set
q := qb.Q().Space(`
INSERT INTO setting (name, workspace, value)
VALUES (?, ?, ?)
- ON CONFLICT (name) DO UPDATE SET value = EXCLUDED.value
+ ON CONFLICT (name, workspace) DO UPDATE SET value = EXCLUDED.value
RETURNING name, workspace, value
`, update.Name.String(), update.Workspace, string(valueBytes))
@@ -361,13 +363,13 @@ func (s *Store) UpsertSetting(ctx context.Context, update *SettingMessage) (*Set
}
setting.Value = msg
- s.settingCache.Add(setting.Name, &setting)
+ s.settingCache.Add(getSettingCacheKey(setting.Workspace, setting.Name), &setting)
return &setting, nil
}
// DeleteSetting deletes a setting by the name.
-func (s *Store) DeleteSetting(ctx context.Context, name storepb.SettingName) error {
- q := qb.Q().Space("DELETE FROM setting WHERE name = ?", name.String())
+func (s *Store) DeleteSetting(ctx context.Context, workspace string, name storepb.SettingName) error {
+ q := qb.Q().Space("DELETE FROM setting WHERE name = ? AND workspace = ?", name.String(), workspace)
query, args, err := q.ToSQL()
if err != nil {
return errors.Wrapf(err, "failed to build sql")
@@ -377,6 +379,6 @@ func (s *Store) DeleteSetting(ctx context.Context, name storepb.SettingName) err
return err
}
- s.settingCache.Remove(name)
+ s.settingCache.Remove(getSettingCacheKey(workspace, name))
return nil
}
diff --git a/backend/store/stats.go b/backend/store/stats.go
index 3557bc47c7..9ba66a0410 100644
--- a/backend/store/stats.go
+++ b/backend/store/stats.go
@@ -9,8 +9,8 @@ import (
)
// CountActiveInstances counts the number of instances.
-func (s *Store) CountActiveInstances(ctx context.Context) (int, error) {
- q := qb.Q().Space("SELECT count(1) FROM instance WHERE instance.deleted = ?", false)
+func (s *Store) CountActiveInstances(ctx context.Context, workspaceID string) (int, error) {
+ q := qb.Q().Space("SELECT count(1) FROM instance WHERE instance.workspace = ?", workspaceID).And("instance.deleted = ?", false)
query, args, err := q.ToSQL()
if err != nil {
@@ -24,9 +24,33 @@ func (s *Store) CountActiveInstances(ctx context.Context) (int, error) {
return count, nil
}
-// CountActiveEndUsers counts the number of endusers.
-func (s *Store) CountActiveEndUsers(ctx context.Context) (int, error) {
- q := qb.Q().Space("SELECT count(DISTINCT principal.id) FROM principal WHERE principal.deleted = ?", false)
+// CountAllActivePrincipals counts all active end users globally (cross-workspace).
+func (s *Store) CountAllActivePrincipals(ctx context.Context) (int, error) {
+ var count int
+ if err := s.GetDB().QueryRowContext(ctx,
+ `SELECT count(*) FROM principal WHERE deleted = FALSE`,
+ ).Scan(&count); err != nil {
+ return 0, err
+ }
+ return count, nil
+}
+
+// CountActiveEndUsersPerWorkspace counts active end users who are members of the given workspace
+// by joining principal with workspace IAM policy bindings.
+func (s *Store) CountActiveEndUsersPerWorkspace(ctx context.Context, workspaceID string) (int, error) {
+ q := qb.Q().Space(`
+ SELECT count(DISTINCT principal.id)
+ FROM principal
+ JOIN policy ON policy.workspace = ? AND policy.resource_type = 'WORKSPACE' AND policy.type = 'IAM'
+ WHERE principal.deleted = FALSE
+ AND EXISTS (
+ SELECT 1
+ FROM jsonb_array_elements(policy.payload->'bindings') AS binding,
+ jsonb_array_elements_text(binding->'members') AS member
+ WHERE member = 'users/' || principal.email
+ )
+ `, workspaceID)
+
query, args, err := q.ToSQL()
if err != nil {
return 0, errors.Wrapf(err, "failed to build sql")
diff --git a/backend/store/store.go b/backend/store/store.go
index b35e5723a1..bbe8ca4b2e 100644
--- a/backend/store/store.go
+++ b/backend/store/store.go
@@ -26,7 +26,7 @@ type Store struct {
databaseCache *lru.Cache[string, *DatabaseMessage]
projectCache *lru.Cache[string, *ProjectMessage]
policyCache *lru.Cache[string, *PolicyMessage]
- settingCache *lru.Cache[storepb.SettingName, *SettingMessage]
+ settingCache *lru.Cache[string, *SettingMessage]
rolesCache *expirable.LRU[string, *RoleMessage]
groupCache *expirable.LRU[string, *GroupMessage]
groupMembersCache *expirable.LRU[string, map[string]bool]
@@ -61,7 +61,7 @@ func New(ctx context.Context, pgURL string, enableCache bool) (*Store, error) {
if err != nil {
return nil, err
}
- settingCache, err := lru.New[storepb.SettingName, *SettingMessage](64)
+ settingCache, err := lru.New[string, *SettingMessage](64)
if err != nil {
return nil, err
}
@@ -137,8 +137,24 @@ func getInstanceCacheKey(instanceID string) string {
return instanceID
}
-func getPolicyCacheKey(resourceType storepb.Policy_Resource, resource string, policyType storepb.Policy_Type) string {
- return fmt.Sprintf("policies/%s/%s/%s", resourceType, resource, policyType)
+func getSettingCacheKey(workspace string, name storepb.SettingName) string {
+ return fmt.Sprintf("workspaces/%s/settings/%s", workspace, name)
+}
+
+func getGroupCacheKey(workspace, email string) string {
+ return fmt.Sprintf("workspaces/%s/groups/%s", workspace, email)
+}
+
+func getGroupMembersCacheKey(workspace, groupName string) string {
+ return fmt.Sprintf("workspaces/%s/%s", workspace, groupName)
+}
+
+func getMemberGroupsCacheKey(workspace, userName string) string {
+ return fmt.Sprintf("workspaces/%s/memberGroups/%s", workspace, userName)
+}
+
+func getPolicyCacheKey(workspace string, resourceType storepb.Policy_Resource, resource string, policyType storepb.Policy_Type) string {
+ return fmt.Sprintf("workspaces/%s/policies/%s/%s/%s", workspace, resourceType, resource, policyType)
}
func getDatabaseCacheKey(instanceID, databaseName string) string {
diff --git a/backend/store/workload_identity.go b/backend/store/workload_identity.go
index 409772677a..56caa2ab0b 100644
--- a/backend/store/workload_identity.go
+++ b/backend/store/workload_identity.go
@@ -28,6 +28,7 @@ type WorkloadIdentityMessage struct {
// FindWorkloadIdentityMessage is the message for finding workload identities.
type FindWorkloadIdentityMessage struct {
+ Workspace string
Email *string
ShowDeleted bool
Limit *int
@@ -57,9 +58,46 @@ type UpdateWorkloadIdentityMessage struct {
Config *storepb.WorkloadIdentityConfig
}
-// GetWorkloadIdentityByEmail gets a workload identity by email.
+// GetWorkloadIdentityByEmail gets a workload identity by email without workspace filter.
+// For use by login flow, runners, and GetAccountByEmail (cross-workspace).
func (s *Store) GetWorkloadIdentityByEmail(ctx context.Context, email string) (*WorkloadIdentityMessage, error) {
- wis, err := s.ListWorkloadIdentities(ctx, &FindWorkloadIdentityMessage{Email: &email, ShowDeleted: true})
+ q := qb.Q().Space(`
+ SELECT deleted, email, name, workspace, project, config
+ FROM workload_identity
+ WHERE email = ?
+ `, strings.ToLower(email))
+
+ query, args, err := q.ToSQL()
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to build sql")
+ }
+
+ var wi WorkloadIdentityMessage
+ var project sql.NullString
+ var configBytes []byte
+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
+ &wi.MemberDeleted, &wi.Email, &wi.Name, &wi.Workspace, &project, &configBytes,
+ ); err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil
+ }
+ return nil, err
+ }
+ if project.Valid {
+ wi.Project = &project.String
+ }
+ var config storepb.WorkloadIdentityConfig
+ if err := common.ProtojsonUnmarshaler.Unmarshal(configBytes, &config); err != nil {
+ return nil, err
+ }
+ wi.Config = &config
+ return &wi, nil
+}
+
+// GetWorkloadIdentity gets a workload identity by workspace and email.
+// For use by API layer (workspace-scoped).
+func (s *Store) GetWorkloadIdentity(ctx context.Context, workspace string, email string) (*WorkloadIdentityMessage, error) {
+ wis, err := s.ListWorkloadIdentities(ctx, &FindWorkloadIdentityMessage{Workspace: workspace, Email: &email, ShowDeleted: true})
if err != nil {
return nil, err
}
@@ -71,7 +109,7 @@ func (s *Store) GetWorkloadIdentityByEmail(ctx context.Context, email string) (*
// ListWorkloadIdentities lists workload identities.
func (s *Store) ListWorkloadIdentities(ctx context.Context, find *FindWorkloadIdentityMessage) ([]*WorkloadIdentityMessage, error) {
- where := qb.Q().Space("TRUE")
+ where := qb.Q().Space("workspace = ?", find.Workspace)
if v := find.Email; v != nil {
where.And("email = ?", strings.ToLower(*v))
@@ -212,9 +250,9 @@ func (s *Store) UpdateWorkloadIdentity(ctx context.Context, wi *WorkloadIdentity
return wi, nil
}
- sqlStr, args, err := qb.Q().Space(`UPDATE workload_identity SET ? WHERE email = ?
+ sqlStr, args, err := qb.Q().Space(`UPDATE workload_identity SET ? WHERE email = ? AND workspace = ?
RETURNING deleted, email, name, workspace, project, config`,
- set, wi.Email).ToSQL()
+ set, wi.Email, wi.Workspace).ToSQL()
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
}
diff --git a/backend/store/workspace.go b/backend/store/workspace.go
index 61b3f98f96..308da780f8 100644
--- a/backend/store/workspace.go
+++ b/backend/store/workspace.go
@@ -2,8 +2,18 @@ package store
import (
"context"
+ "database/sql"
+ "fmt"
+ "github.com/google/uuid"
"github.com/pkg/errors"
+ "google.golang.org/genproto/googleapis/type/expr"
+ "google.golang.org/protobuf/encoding/protojson"
+ "google.golang.org/protobuf/proto"
+
+ "github.com/bytebase/bytebase/backend/common"
+ "github.com/bytebase/bytebase/backend/common/qb"
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
)
// WorkspaceMessage is the message for a workspace.
@@ -12,13 +22,192 @@ type WorkspaceMessage struct {
Name string
}
-// GetWorkspace returns the workspace.
-func (s *Store) GetWorkspace(ctx context.Context) (*WorkspaceMessage, error) {
+// getWorkspace returns the workspace. Returns (nil, nil) if no workspace exists.
+func (s *Store) getWorkspace(ctx context.Context) (*WorkspaceMessage, error) {
var workspace WorkspaceMessage
if err := s.GetDB().QueryRowContext(ctx,
`SELECT resource_id, name FROM workspace WHERE deleted = FALSE LIMIT 1`,
).Scan(&workspace.ResourceID, &workspace.Name); err != nil {
+ if err == sql.ErrNoRows {
+ return nil, nil
+ }
return nil, errors.Wrap(err, "failed to get workspace")
}
return &workspace, nil
}
+
+// GetWorkspaceID returns the workspace resource ID.
+// Returns ("", nil) if no workspace exists.
+func (s *Store) GetWorkspaceID(ctx context.Context) (string, error) {
+ ws, err := s.getWorkspace(ctx)
+ if err != nil {
+ return "", err
+ }
+ if ws == nil {
+ return "", nil
+ }
+ return ws.ResourceID, nil
+}
+
+// CreateWorkspace creates a new workspace and initializes its default settings and IAM policy.
+func (s *Store) CreateWorkspace(ctx context.Context, create *WorkspaceMessage, adminEmail string) (*WorkspaceMessage, error) {
+ tx, err := s.GetDB().BeginTx(ctx, nil)
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to begin transaction")
+ }
+ defer tx.Rollback()
+
+ // Create workspace.
+ if _, err := tx.ExecContext(ctx,
+ `INSERT INTO workspace (resource_id, name) VALUES ($1, $2)`,
+ create.ResourceID, create.Name,
+ ); err != nil {
+ return nil, errors.Wrap(err, "failed to create workspace")
+ }
+
+ // Initialize default settings for the workspace.
+ type defaultSetting struct {
+ name storepb.SettingName
+ payload proto.Message
+ }
+ settings := []defaultSetting{
+ {storepb.SettingName_SYSTEM, &storepb.SystemSetting{}},
+ {storepb.SettingName_APP_IM, &storepb.AppIMSetting{}},
+ {storepb.SettingName_DATA_CLASSIFICATION, &storepb.DataClassificationSetting{}},
+ {storepb.SettingName_WORKSPACE_APPROVAL, &storepb.WorkspaceApprovalSetting{
+ Rules: []*storepb.WorkspaceApprovalSetting_Rule{
+ {
+ Template: &storepb.ApprovalTemplate{
+ Flow: &storepb.ApprovalFlow{Roles: []string{"roles/projectOwner"}},
+ Title: "Fallback Rule",
+ Description: "Requires project owner approval when no other rules match.",
+ },
+ Condition: &expr.Expr{Expression: "true"},
+ },
+ },
+ }},
+ {storepb.SettingName_WORKSPACE_PROFILE, &storepb.WorkspaceProfileSetting{
+ EnableMetricCollection: true,
+ DirectorySyncToken: uuid.New().String(),
+ DisallowSignup: true,
+ PasswordRestriction: &storepb.WorkspaceProfileSetting_PasswordRestriction{MinLength: 8},
+ }},
+ {storepb.SettingName_ENVIRONMENT, &storepb.EnvironmentSetting{
+ Environments: []*storepb.EnvironmentSetting_Environment{
+ {Title: "Test", Id: "test"},
+ {Title: "Prod", Id: "prod"},
+ },
+ }},
+ }
+ for _, s := range settings {
+ value, err := protojson.Marshal(s.payload)
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to marshal setting %s", s.name)
+ }
+ if _, err := tx.ExecContext(ctx,
+ `INSERT INTO setting (name, workspace, value) VALUES ($1, $2, $3)`,
+ s.name.String(), create.ResourceID, string(value),
+ ); err != nil {
+ return nil, errors.Wrapf(err, "failed to create setting %s", s.name)
+ }
+ }
+
+ // Initialize workspace IAM policy — add the creator as workspace admin.
+ iamPolicy := &storepb.IamPolicy{
+ Bindings: []*storepb.Binding{
+ {
+ Role: "roles/workspaceAdmin",
+ Members: []string{fmt.Sprintf("users/%s", adminEmail)},
+ },
+ },
+ }
+ iamPayload, err := protojson.Marshal(iamPolicy)
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to marshal IAM policy")
+ }
+ if _, err := tx.ExecContext(ctx,
+ `INSERT INTO policy (workspace, resource_type, resource, type, payload, inherit_from_parent, enforce)
+ VALUES ($1, 'WORKSPACE', 'workspaces/' || $1, 'IAM', $2, FALSE, TRUE)`,
+ create.ResourceID, string(iamPayload),
+ ); err != nil {
+ return nil, errors.Wrap(err, "failed to create workspace IAM policy")
+ }
+
+ // Create default project — used by schema sync to hold unassigned databases.
+ if _, err := tx.ExecContext(ctx,
+ `INSERT INTO project (resource_id, workspace, name, setting) VALUES ($1, $2, 'Default', '{}')`,
+ common.DefaultProjectID(create.ResourceID), create.ResourceID,
+ ); err != nil {
+ return nil, errors.Wrap(err, "failed to create default project")
+ }
+
+ if err := tx.Commit(); err != nil {
+ return nil, errors.Wrap(err, "failed to commit workspace creation")
+ }
+
+ return create, nil
+}
+
+func (s *Store) FindWorkspaceIDByMemberEmail(ctx context.Context, memberName string, includeAllUser bool) (string, error) {
+ workspaces, err := s.FindWorkspacesByMemberEmail(ctx, memberName, includeAllUser)
+ if err != nil {
+ return "", errors.Wrap(err, "failed to find workspaces for user")
+ }
+ if len(workspaces) == 0 {
+ return "", errors.Errorf("%q is not a member of any workspace", memberName)
+ }
+ // TODO(ed): In SaaS mode with multiple workspaces, return a workspace picker
+ // instead of auto-selecting the first one. For now, use the first workspace.
+ return workspaces[0].ResourceID, nil
+}
+
+// FindWorkspacesByMemberEmail finds all workspaces where the given email is a member
+// in the workspace IAM policy bindings. The memberName should be in the format
+// "users/{email}", "serviceAccounts/{email}", etc.
+// Returns workspaces sorted by name.
+func (s *Store) FindWorkspacesByMemberEmail(ctx context.Context, memberName string, includeAllUser bool) ([]*WorkspaceMessage, error) {
+ memberFilter := qb.Q().Space("member = ?", memberName)
+ if includeAllUser {
+ memberFilter.Or("member = ?", common.AllUsers)
+ }
+
+ q := qb.Q().Space(`
+ SELECT DISTINCT w.resource_id, w.name
+ FROM workspace w
+ JOIN policy p ON p.workspace = w.resource_id
+ WHERE p.resource_type = 'WORKSPACE'
+ AND p.type = 'IAM'
+ AND w.deleted = FALSE
+ AND EXISTS (
+ SELECT 1
+ FROM jsonb_array_elements(p.payload->'bindings') AS binding,
+ jsonb_array_elements_text(binding->'members') AS member
+ WHERE ?
+ )
+ ORDER BY w.name
+ `, memberFilter)
+
+ query, args, err := q.ToSQL()
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to build sql")
+ }
+
+ rows, err := s.GetDB().QueryContext(ctx, query, args...)
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to find workspaces by member")
+ }
+ defer rows.Close()
+
+ var workspaces []*WorkspaceMessage
+ for rows.Next() {
+ var ws WorkspaceMessage
+ if err := rows.Scan(&ws.ResourceID, &ws.Name); err != nil {
+ return nil, errors.Wrap(err, "failed to scan workspace")
+ }
+ workspaces = append(workspaces, &ws)
+ }
+ if err := rows.Err(); err != nil {
+ return nil, errors.Wrap(err, "failed to iterate workspaces")
+ }
+ return workspaces, nil
+}
diff --git a/backend/tests/approval_test.go b/backend/tests/approval_test.go
index 6d284128f9..09357700c6 100644
--- a/backend/tests/approval_test.go
+++ b/backend/tests/approval_test.go
@@ -932,7 +932,7 @@ func TestSelfApprovalBlocked(t *testing.T) {
// Create another project owner who can approve
approverEmail := fmt.Sprintf("approver-%[email protected]", projectID)
approverPassword := "1024bytebase"
- _, err = ctl.userServiceClient.CreateUser(ctx, connect.NewRequest(&v1pb.CreateUserRequest{
+ newUser, err := ctl.userServiceClient.CreateUser(ctx, connect.NewRequest(&v1pb.CreateUserRequest{
User: &v1pb.User{
Email: approverEmail,
Password: approverPassword,
@@ -941,6 +941,10 @@ func TestSelfApprovalBlocked(t *testing.T) {
}))
a.NoError(err)
+ // Add to workspace IAM so the user can login.
+ _, err = ctl.addMemberToWorkspaceIAM(ctx, newUser.Msg.Workspace, fmt.Sprintf("user:%s", approverEmail), "roles/workspaceMember")
+ a.NoError(err)
+
// Grant approver projectOwner role via project IAM
approverPolicyResp, err := ctl.projectServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{
Resource: project.Name,
diff --git a/backend/tests/tests.go b/backend/tests/tests.go
index 5f0d59d989..7814570d98 100644
--- a/backend/tests/tests.go
+++ b/backend/tests/tests.go
@@ -363,15 +363,49 @@ func (*controller) provisionSQLiteInstance(rootDir, name string) (string, error)
}
// signupAndLogin will signup and login as user [email protected].
-func (ctl *controller) signupAndLogin(ctx context.Context) (string, error) {
- userResp, err := ctl.userServiceClient.CreateUser(ctx, connect.NewRequest(&v1pb.CreateUserRequest{
- User: &v1pb.User{
- Email: "[email protected]",
- Password: "1024bytebase",
- Title: "demo",
- },
+// addMemberToWorkspaceIAM adds a member as workspace role to the current workspace.
+func (ctl *controller) addMemberToWorkspaceIAM(ctx context.Context, workspace, member, role string) (*v1pb.IamPolicy, error) {
+ policyResp, err := ctl.workspaceServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{
+ Resource: workspace,
}))
- if err != nil && !strings.Contains(err.Error(), "exist") {
+ if err != nil {
+ return nil, err
+ }
+
+ policy := policyResp.Msg
+ found := false
+ for _, binding := range policy.Bindings {
+ if binding.Role == role {
+ binding.Members = append(binding.Members, member)
+ found = true
+ break
+ }
+ }
+ if !found {
+ policy.Bindings = append(policy.Bindings, &v1pb.Binding{
+ Role: role,
+ Members: []string{member},
+ })
+ }
+
+ updated, err := ctl.workspaceServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{
+ Etag: policy.Etag,
+ Policy: policy,
+ Resource: workspace,
+ }))
+ if err != nil {
+ return nil, err
+ }
+ return updated.Msg, nil
+}
+
+func (ctl *controller) signupAndLogin(ctx context.Context) (string, error) {
+ // Use Signup API (creates principal + workspace) then Login to get a token.
+ if _, err := ctl.authServiceClient.Signup(ctx, connect.NewRequest(&v1pb.SignupRequest{
+ Email: "[email protected]",
+ Password: "1024bytebase",
+ Title: "demo",
+ })); err != nil && !strings.Contains(err.Error(), "already registered") {
return "", err
}
loginResp, err := ctl.authServiceClient.Login(ctx, connect.NewRequest(&v1pb.LoginRequest{
@@ -381,6 +415,6 @@ func (ctl *controller) signupAndLogin(ctx context.Context) (string, error) {
if err != nil {
return "", err
}
- ctl.principalName = userResp.Msg.Name
+ ctl.principalName = common.FormatUserEmail("[email protected]")
return loginResp.Msg.Token, nil
}
diff --git a/backend/tests/user_test.go b/backend/tests/user_test.go
index 927f0a886c..797fc33892 100644
--- a/backend/tests/user_test.go
+++ b/backend/tests/user_test.go
@@ -47,11 +47,13 @@ func TestDeleteUser(t *testing.T) {
a.Error(err)
a.ErrorContains(err, expectErrorMsg)
- actuator, err := ctl.actuatorServiceClient.GetActuatorInfo(ctx, &connect.Request[v1pb.GetActuatorInfoRequest]{})
+ actuator, err := ctl.actuatorServiceClient.GetWorkspaceActuatorInfo(ctx, connect.NewRequest(&v1pb.GetWorkspaceActuatorInfoRequest{
+ Name: memberResp.Msg.Workspace,
+ }))
a.NoError(err)
serviceAccountResp, err := ctl.serviceAccountServiceClient.CreateServiceAccount(ctx, connect.NewRequest(&v1pb.CreateServiceAccountRequest{
- Parent: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),
+ Parent: actuator.Msg.Workspace,
ServiceAccountId: "bot",
ServiceAccount: &v1pb.ServiceAccount{
Title: "bot",
@@ -60,26 +62,8 @@ func TestDeleteUser(t *testing.T) {
a.NoError(err)
serviceAccount := serviceAccountResp.Msg
- policyResp, err := ctl.workspaceServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{
- Resource: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),
- }))
- a.NoError(err)
- policy := policyResp.Msg
-
- // Test: only count the end user.
- for _, binding := range policy.Bindings {
- if binding.Role == "roles/workspaceAdmin" {
- binding.Members = append(binding.Members, fmt.Sprintf("serviceAccount:%s", serviceAccount.Email))
- break
- }
- }
- updatedPolicyResp, err := ctl.workspaceServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{
- Etag: policy.Etag,
- Policy: policy,
- Resource: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),
- }))
+ _, err = ctl.addMemberToWorkspaceIAM(ctx, actuator.Msg.Workspace, fmt.Sprintf("serviceAccount:%v", serviceAccount.Email), "roles/workspaceAdmin")
a.NoError(err)
- updatedPolicy := updatedPolicyResp.Msg
_, err = ctl.userServiceClient.DeleteUser(ctx, connect.NewRequest(&v1pb.DeleteUserRequest{
Name: ctl.principalName,
@@ -93,19 +77,8 @@ func TestDeleteUser(t *testing.T) {
a.NoError(err)
// Test: can delete the admin if member count > 1
- for _, binding := range updatedPolicy.Bindings {
- if binding.Role == "roles/workspaceAdmin" {
- binding.Members = append(binding.Members, fmt.Sprintf("user:%s", member.Email))
- break
- }
- }
- newPolicyResp, err := ctl.workspaceServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{
- Etag: updatedPolicy.Etag,
- Policy: updatedPolicy,
- Resource: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),
- }))
+ newPolicy, err := ctl.addMemberToWorkspaceIAM(ctx, actuator.Msg.Workspace, fmt.Sprintf("user:%v", member.Email), "roles/workspaceAdmin")
a.NoError(err)
- newPolicy := newPolicyResp.Msg
_, err = ctl.userServiceClient.DeleteUser(ctx, connect.NewRequest(&v1pb.DeleteUserRequest{
Name: ctl.principalName,
@@ -130,7 +103,7 @@ func TestDeleteUser(t *testing.T) {
_, err = ctl.workspaceServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{
Etag: newPolicy.Etag,
Policy: newPolicy,
- Resource: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),
+ Resource: actuator.Msg.Workspace,
}))
a.NoError(err)
@@ -172,6 +145,10 @@ func TestUpdateUserEmail(t *testing.T) {
a.NoError(err)
user := userResp.Msg
+ // Add the created user to workspace IAM as member so they can login.
+ _, err = ctl.addMemberToWorkspaceIAM(ctx, user.Workspace, fmt.Sprintf("user:%v", user.Email), "roles/workspaceMember")
+ a.NoError(err)
+
// 1.5 Grant user permission to create issues in the project
projectID := "test-project"
// Login as admin (StartServer returns admin token but let's be explicit or reuse ctl state if it hasn't changed)
diff --git a/backend/utils/member.go b/backend/utils/member.go
index b81e7b8a46..97bb30dfff 100644
--- a/backend/utils/member.go
+++ b/backend/utils/member.go
@@ -34,7 +34,7 @@ func FormatGroupName(group *store.GroupMessage) string {
// GetUsersByRoleInIAMPolicy gets users in the iam policy.
// The role can be either with or without the "roles/" prefix.
-func GetUsersByRoleInIAMPolicy(ctx context.Context, stores *store.Store, role string, policies ...*storepb.IamPolicy) []*store.UserMessage {
+func GetUsersByRoleInIAMPolicy(ctx context.Context, stores *store.Store, workspace string, role string, policies ...*storepb.IamPolicy) []*store.UserMessage {
roleFullName := role
if !strings.HasPrefix(role, common.RolePrefix) {
roleFullName = common.FormatRole(role)
@@ -64,7 +64,7 @@ func GetUsersByRoleInIAMPolicy(ctx context.Context, stores *store.Store, role st
}
return allUsers
}
- userMessages := GetUsersByMember(ctx, stores, member)
+ userMessages := GetUsersByMember(ctx, stores, workspace, member)
for _, user := range userMessages {
if seen[user.Email] {
@@ -85,12 +85,12 @@ func GetUsersByRoleInIAMPolicy(ctx context.Context, stores *store.Store, role st
// - Group email (contains @) - used as group ID in legacy deployments
//
// This supports both attribute mapping configurations in Azure Entra ID.
-func GetGroupByName(ctx context.Context, stores *store.Store, name string) (*store.GroupMessage, error) {
+func GetGroupByName(ctx context.Context, stores *store.Store, workspace string, name string) (*store.GroupMessage, error) {
identifier, err := common.GetGroupEmail(name)
if err != nil {
return nil, err
}
- find := &store.FindGroupMessage{}
+ find := &store.FindGroupMessage{Workspace: workspace}
if strings.Contains(identifier, "@") {
find.Email = &identifier
} else {
@@ -106,7 +106,8 @@ func GetGroupByName(ctx context.Context, stores *store.Store, name string) (*sto
// For legacy SCIM sync attribute mapping, the group ExternalID map to Email
// If users keep using this legacy mapping, the new group will have empty email, and the email will set as the ID.
return stores.GetGroup(ctx, &store.FindGroupMessage{
- ID: &identifier,
+ Workspace: workspace,
+ ID: &identifier,
})
}
return group, nil
@@ -114,7 +115,7 @@ func GetGroupByName(ctx context.Context, stores *store.Store, name string) (*sto
// GetUsersByMember gets user messages by member.
// The member should be in users/{email}, serviceAccounts/{email}, workloadIdentities/{email}, or groups/{email} format.
-func GetUsersByMember(ctx context.Context, stores *store.Store, member string) []*store.UserMessage {
+func GetUsersByMember(ctx context.Context, stores *store.Store, workspace string, member string) []*store.UserMessage {
var users []*store.UserMessage
if strings.HasPrefix(member, common.UserNamePrefix) {
user := getUserByIdentifier(ctx, stores, member, common.UserNamePrefix)
@@ -132,7 +133,7 @@ func GetUsersByMember(ctx context.Context, stores *store.Store, member string) [
users = append(users, user)
}
} else if strings.HasPrefix(member, common.GroupPrefix) {
- group, err := GetGroupByName(ctx, stores, member)
+ group, err := GetGroupByName(ctx, stores, workspace, member)
if err != nil {
slog.Error("failed to get group", slog.String("group", member), log.BBError(err))
return users
@@ -172,17 +173,24 @@ func getUserByIdentifier(ctx context.Context, stores *store.Store, identifier, p
slog.Error("failed to parse email from identifier", slog.String("identifier", identifier), log.BBError(err))
return nil
}
- // GetPrincipalByEmail handles all principal types based on email format
- user, err := stores.GetPrincipalByEmail(ctx, email)
+ account, err := stores.GetAccountByEmail(ctx, email)
if err != nil {
slog.Error("failed to get principal by email", slog.String("identifier", identifier), log.BBError(err))
return nil
}
- return user
+ if account == nil {
+ return nil
+ }
+ return &store.UserMessage{
+ Email: account.Email,
+ Name: account.Name,
+ Type: account.Type,
+ MemberDeleted: account.MemberDeleted,
+ }
}
// GetUserIAMPolicyBindings return the valid bindings for the user.
-func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *store.UserMessage, policies ...*storepb.IamPolicy) []*storepb.Binding {
+func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, workspace string, user *store.UserMessage, policies ...*storepb.IamPolicy) []*storepb.Binding {
userMemberName := formatMemberNameByType(user)
var bindings []*storepb.Binding
@@ -204,7 +212,7 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *st
break
}
if strings.HasPrefix(member, common.GroupPrefix) {
- group, err := GetGroupByName(ctx, stores, member)
+ group, err := GetGroupByName(ctx, stores, workspace, member)
if err != nil {
slog.Error("failed to get group", slog.String("group", member), log.BBError(err))
continue
@@ -234,7 +242,7 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *st
// MemberContainsUser checks if a member (user, service account, workload identity, or group) contains the specified user.
// The member should be in users/{email}, serviceAccounts/{email}, workloadIdentities/{email}, or groups/{email} format.
-func MemberContainsUser(ctx context.Context, stores *store.Store, member string, user *store.UserMessage) bool {
+func MemberContainsUser(ctx context.Context, stores *store.Store, workspace string, member string, user *store.UserMessage) bool {
if member == common.AllUsers {
return true
}
@@ -271,7 +279,7 @@ func MemberContainsUser(ctx context.Context, stores *store.Store, member string,
// Check if member is a group
if strings.HasPrefix(member, common.GroupPrefix) {
- group, err := GetGroupByName(ctx, stores, member)
+ group, err := GetGroupByName(ctx, stores, workspace, member)
if err != nil {
slog.Error("failed to get group", slog.String("group", member), log.BBError(err))
return false
@@ -294,11 +302,11 @@ func MemberContainsUser(ctx context.Context, stores *store.Store, member string,
// GetUserRolesInIamPolicy returns the `uniq`ed roles of a user, including workspace roles and the roles in the projects.
// the condition of role binding is respected and evaluated with request.time=time.Now().
// the returned role name should in the roles/{id} format.
-func GetUserRolesInIamPolicy(ctx context.Context, stores *store.Store, user *store.UserMessage, policies ...*storepb.IamPolicy) []string {
+func GetUserRolesInIamPolicy(ctx context.Context, stores *store.Store, workspace string, user *store.UserMessage, policies ...*storepb.IamPolicy) []string {
var roles []string
for _, policy := range policies {
- bindings := GetUserIAMPolicyBindings(ctx, stores, user, policy)
+ bindings := GetUserIAMPolicyBindings(ctx, stores, workspace, user, policy)
for _, binding := range bindings {
roles = append(roles, binding.Role)
}
@@ -309,8 +317,8 @@ func GetUserRolesInIamPolicy(ctx context.Context, stores *store.Store, user *sto
}
// See GetUserRoles. The returned map key format is roles/{role}.
-func GetUserFormattedRolesMap(ctx context.Context, stores *store.Store, user *store.UserMessage, projectPolicies ...*storepb.IamPolicy) map[string]bool {
- roles := GetUserRolesInIamPolicy(ctx, stores, user, projectPolicies...)
+func GetUserFormattedRolesMap(ctx context.Context, stores *store.Store, workspace string, user *store.UserMessage, projectPolicies ...*storepb.IamPolicy) map[string]bool {
+ roles := GetUserRolesInIamPolicy(ctx, stores, workspace, user, projectPolicies...)
rolesMap := make(map[string]bool)
for _, role := range roles {
diff --git a/backend/utils/setting.go b/backend/utils/setting.go
index 1543fe62f1..395002f5b7 100644
--- a/backend/utils/setting.go
+++ b/backend/utils/setting.go
@@ -14,11 +14,11 @@ const setupExternalURLError = "external URL isn't setup yet, see https://docs.by
// GetEffectiveExternalURL returns the external URL to use, preferring the command-line flag over the database setting.
// This ensures that when the --external-url flag is set, it takes precedence over any value stored in the database.
-func GetEffectiveExternalURL(ctx context.Context, stores *store.Store, profile *config.Profile) (string, error) {
+func GetEffectiveExternalURL(ctx context.Context, stores *store.Store, profile *config.Profile, workspaceID string) (string, error) {
// Use command-line flag value if set, otherwise use database value
externalURL := profile.ExternalURL
if externalURL == "" {
- setting, err := stores.GetWorkspaceProfileSetting(ctx)
+ setting, err := stores.GetWorkspaceProfileSetting(ctx, workspaceID)
if err != nil {
return "", connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workspace setting"))
}
diff --git a/backend/utils/utils.go b/backend/utils/utils.go
index 3ae83a47af..d298f269d7 100644
--- a/backend/utils/utils.go
+++ b/backend/utils/utils.go
@@ -78,8 +78,8 @@ func CheckIssueApproved(issue *store.IssueMessage) (bool, error) {
}
// UpdateProjectPolicyFromRoleGrantIssue updates the project policy from a role grant issue.
-func UpdateProjectPolicyFromRoleGrantIssue(ctx context.Context, stores *store.Store, issue *store.IssueMessage, roleGrant *storepb.RoleGrant) error {
- policyMessage, err := stores.GetProjectIamPolicy(ctx, issue.ProjectID)
+func UpdateProjectPolicyFromRoleGrantIssue(ctx context.Context, stores *store.Store, workspaceID string, issue *store.IssueMessage, roleGrant *storepb.RoleGrant) error {
+ policyMessage, err := stores.GetProjectIamPolicy(ctx, workspaceID, issue.ProjectID)
if err != nil {
return errors.Wrapf(err, "failed to get project policy for project %s", issue.ProjectID)
}
@@ -135,12 +135,8 @@ func UpdateProjectPolicyFromRoleGrantIssue(ctx context.Context, stores *store.St
if err != nil {
return err
}
- workspace, err := stores.GetWorkspace(ctx)
- if err != nil {
- return errors.Wrap(err, "failed to get workspace")
- }
if _, err := stores.CreatePolicy(ctx, &store.PolicyMessage{
- Workspace: workspace.ResourceID,
+ Workspace: workspaceID,
Resource: common.FormatProject(issue.ProjectID),
ResourceType: storepb.Policy_PROJECT,
Payload: string(policyPayload),
diff --git a/docs/plans/saas/05.progress.md b/docs/plans/saas/05.progress.md
new file mode 100644
index 0000000000..28f422119f
--- /dev/null
+++ b/docs/plans/saas/05.progress.md
@@ -0,0 +1,140 @@
+# SaaS Migration Progress
+
+Current status of the workspace isolation implementation. **129 files changed, ~4000 lines modified.**
+
+---
+
+## Completed
+
+### Database Migration (Step 02)
+
+- [x] **`server_config` table** — Global config (single row), stores `auth_secret` via `payload` JSONB
+- [x] **`workspace` table** — Workspace identity with `resource_id` PK
+- [x] **`workspace` column** added to 13 root tables + `oauth2_client`
+- [x] **Workspace-scoped unique indexes** for tables with non-globally-unique PKs
+- [x] **`oauth2_authorization_code` / `oauth2_refresh_token`** — No workspace column (scoped through `client_id` FK)
+- [x] **Auth secret migrated** from `SystemSetting` JSON to `server_config.payload`
+- [x] **`SystemSetting` proto** — `auth_secret` and `workspace_id` fields reserved
+
+### Store Layer (Step 03)
+
+- [x] **All root tables enforce workspace on CRUD** (INSERT, SELECT, UPDATE, DELETE)
+- [x] **`workspace.go`**: `GetWorkspaceID()` (startup/OAuth2), `FindWorkspacesByMemberEmail()`, `FindWorkspaceIDByMemberEmail()`
+- [x] **`runner_queries.go`**: Cross-workspace methods (`GetProjectByResourceID`, `GetInstanceByResourceID`, `ListAllInstances`, `DeleteExpiredExportArchivesAll`)
+- [x] **`account.go`**: `AccountMessage` + `GetAccountByEmail()` for auth layer
+- [x] **Separated workspace-scoped vs cross-workspace lookups** for SA/WI
+- [x] **`GetServerConfig()` / `GetAuthSecret()`** — reads from `server_config` table
+- [x] **`CountActiveEndUsersPerWorkspace`** — counts via IAM policy membership
+- [x] **`GetIdentityProviderByID`** — cross-workspace IDP lookup for SSO login
+- [x] **Cache keys include workspace**
+- [x] **OAuth2 auth code/refresh token** queries require `clientID`
+
+### Auth & Token Flow (Steps 03-04)
+
+- [x] **Workspace in JWT claims** (`WorkspaceID` field)
+- [x] **Auth middleware** injects workspace into context, verifies membership
+- [x] **Login workspace resolution** via `FindWorkspacesByMemberEmail` (IAM policy)
+- [x] **`LoginResponse.workspace`** — returns workspace name to frontend after login
+- [x] **`generateLoginToken`** returns both token and workspace ID
+- [x] **IDP (SSO) login** — resolves workspace from `idp.Workspace`, adds new user to workspace IAM
+- [x] **Token refresh** keeps workspace from original token
+
+### API Layer (Step 03)
+
+- [x] **All API v1 handlers pass workspace** to store queries
+- [x] **Only authorized API code** uses `common.GetWorkspaceIDFromContext`
+- [x] **Non-API code** accepts workspace as parameter
+- [x] **LSP handler** stores workspace from token on handler struct
+- [x] **Actuator service**: unauthenticated returns basic info, authenticated returns full workspace-scoped info
+- [x] **Workspace-scoped actuator endpoint**: `GET /v1/{name=workspaces/*}/actuator/info` (requires auth)
+- [x] **Resource package**: `additional_bindings` for `/v1/{name=workspaces/*}/actuator/resources` (no auth)
+
+### Background Runners (Step 04)
+
+- [x] **Runners use cross-workspace store methods**
+- [x] **Workspace resolved from loaded entities**
+- [x] **`CheckReplicaLimit` skips in SaaS mode**
+
+### OAuth2
+
+- [x] **`oauth2_client` workspace-scoped**
+- [x] **Workspace-scoped URLs**: `/api/workspaces/:workspaceID/oauth2/...`
+- [x] **Legacy routes** preserved for self-hosted (`!profile.SaaS`)
+
+### Infrastructure
+
+- [x] **`server_config`** — Only `auth_secret` (JSONB payload). All other settings in per-workspace WORKSPACE_PROFILE
+- [x] **`ServerConfigPayload` proto** — Minimal: `auth_secret` only
+- [x] **Self-hosted features** guarded by `!profile.SaaS` (sample instances, debug, metrics, audit log stdout)
+- [x] **SaaS telemetry** disabled by default (operator manages their own monitoring)
+
+---
+
+## Remaining TODO(ed) Items
+
+| File | Description |
+|------|-------------|
+| `actuator_service.go:145` | Skip sample setup in SaaS mode (currently returns error) |
+| `workspace.go:46` | Multiple workspaces: auto-selects first. SaaS needs workspace picker |
+| `server.go:158,170,180,284` | Self-host-only features guarded by `!profile.SaaS` |
+| `project.go:108` | ORDER BY may not work with workspace filter |
+
+---
+
+## High Priority — Not Yet Implemented
+
+### Workspace-scoped resource listing
+
+All List/Search/Get endpoints for project-child tables must validate the parent project belongs to the user's workspace. Currently, child table queries filter by project FK but don't verify the project's workspace, which could leak data across workspaces.
+
+**Affected endpoints and store queries:**
+
+| Category | Endpoints | Risk |
+|----------|-----------|------|
+| **Databases** | `ListDatabases`, `BatchGetDatabases`, `GetDatabase` | `FindDatabaseMessage` doesn't include workspace. Queries by project/instance which are workspace-scoped in store, but API doesn't validate parent workspace. |
+| **Issues** | `ListIssues`, `SearchIssues`, `GetIssue` | `FindIssueMessage` has `ProjectIDs` but no workspace. Project-level filter is set from request `parent` without workspace validation. |
+| **Plans** | `ListPlans`, `GetPlan` | `FindPlanMessage` queries by `ProjectID` without workspace validation on the project. |
+| **Database Groups** | `ListDatabaseGroups`, `GetDatabaseGroup` | `FindDatabaseGroupMessage` has no workspace. `ListDatabaseGroups` in actuator queries with `{}` (all workspaces). |
+| **Changelogs** | `ListChangelogs` | Queried by database which is instance-scoped, but no workspace validation on instance. |
+| **Releases** | `ListReleases` | Queried by project without workspace validation. |
+| **Worksheets** | `ListWorksheets` | Queried by project/creator without workspace validation. |
+| **Task Runs** | `ListTaskRuns` | Queried by plan/project without workspace validation. |
+| **Access Grants** | `ListAccessGrants` | Queried by project without workspace validation. |
+| **Query History** | `SearchQueryHistories` | Queried by creator without workspace validation on project. |
+
+**Fix pattern:** For each child List/Get endpoint:
+1. Extract `projectID` (or `instanceID`) from request `parent`
+2. Validate the parent belongs to the current workspace: `GetProject(ctx, FindProjectMessage{Workspace: wsID, ResourceID: &projectID})`
+3. Only then query children
+
+**Also need:** Add workspace to `FindDatabaseGroupMessage` (it's a project-child but currently has no workspace-aware parent validation in the store).
+
+---
+
+## Not Yet Started
+
+### Auth Flow
+
+- [ ] **Workspace picker UI** — Show picker if user has multiple workspaces
+- [ ] **Workspace switching endpoint** — Issue new JWT with different `workspace_id`
+
+### Future
+
+- [ ] **Workspace creation API** — Create new workspaces, invite users
+- [ ] **Per-workspace licensing** — Each workspace has its own license
+- [ ] **Cross-workspace user management** — List workspaces for a user
+
+---
+
+## Design Decisions
+
+1. **`server_config` only stores `auth_secret`** — All other settings (password restrictions, signup control, token durations, metrics, debug) live in per-workspace WORKSPACE_PROFILE. Reason: avoid split-brain between two config sources. The login page can get restrictions from the workspace-scoped actuator endpoint.
+
+2. **Root table PKs (`resource_id`) are globally unique** — No composite PK migration needed. Workspace-scoped unique indexes only for tables where PK is not `resource_id` (setting, user_group, service_account, workload_identity, policy).
+
+3. **Three access patterns for store queries**:
+ - **API layer**: `common.GetWorkspaceIDFromContext(ctx)` from JWT
+ - **Runners**: Cross-workspace methods (`GetProjectByResourceID`, `ListAllInstances`)
+ - **Login/startup**: `store.GetWorkspaceID(ctx)` or `FindWorkspacesByMemberEmail`
+
+4. **OAuth2 child tables** (auth code, refresh token) don't need workspace — scoped through `client_id` FK to workspace-scoped `oauth2_client`.
diff --git a/frontend/src/components/Database/context.ts b/frontend/src/components/Database/context.ts
index 0a56e845c3..884b89b482 100644
--- a/frontend/src/components/Database/context.ts
+++ b/frontend/src/components/Database/context.ts
@@ -5,7 +5,7 @@ import {
databaseNamePrefix,
instanceNamePrefix,
} from "@/store/modules/v1/common";
-import { DEFAULT_PROJECT_NAME } from "@/types";
+import { isDefaultProject } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import { getInstanceResource, instanceV1HasAlterSchema } from "@/utils";
@@ -34,8 +34,8 @@ export const provideDatabaseDetailContext = (
)
);
- const isDefaultProject = computed(
- () => database.value.project === DEFAULT_PROJECT_NAME
+ const isDefaultProjectRef = computed(() =>
+ isDefaultProject(database.value.project)
);
const allowAlterSchema = computed(() => {
@@ -45,7 +45,7 @@ export const provideDatabaseDetailContext = (
const context: DatabaseDetailContext = {
database,
allowAlterSchema,
- isDefaultProject,
+ isDefaultProject: isDefaultProjectRef,
};
provide(KEY, context);
diff --git a/frontend/src/components/DatabaseDetail/SQLEditorButtonV1.vue b/frontend/src/components/DatabaseDetail/SQLEditorButtonV1.vue
index 5c0fbd4742..92f3ce4ec0 100644
--- a/frontend/src/components/DatabaseDetail/SQLEditorButtonV1.vue
+++ b/frontend/src/components/DatabaseDetail/SQLEditorButtonV1.vue
@@ -23,7 +23,7 @@ import { NTooltip } from "naive-ui";
import { computed } from "vue";
import { useRouter } from "vue-router";
import { SQL_EDITOR_DATABASE_MODULE } from "@/router/sqlEditor";
-import { DEFAULT_PROJECT_NAME, defaultProject } from "@/types";
+import { defaultProject, isDefaultProject } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import type { VueClass } from "@/utils";
import {
@@ -82,8 +82,10 @@ const gotoSQLEditor = () => {
}
const database = props.database;
- if (database.project === DEFAULT_PROJECT_NAME) {
- if (!hasProjectPermissionV2(defaultProject(), "bb.sql.select")) {
+ if (isDefaultProject(database.project)) {
+ if (
+ !hasProjectPermissionV2(defaultProject(database.project), "bb.sql.select")
+ ) {
// For unassigned databases, only high-privileged users
// are accessible via SQL Editor.
emit("failed", database);
diff --git a/frontend/src/components/ExternalTableDetailDrawer.vue b/frontend/src/components/ExternalTableDetailDrawer.vue
index 6f48654bbd..195f6fad4e 100644
--- a/frontend/src/components/ExternalTableDetailDrawer.vue
+++ b/frontend/src/components/ExternalTableDetailDrawer.vue
@@ -139,7 +139,7 @@ import {
SearchBox,
} from "@/components/v2";
import { useDatabaseV1Store, useDBSchemaV1Store } from "@/store";
-import { DEFAULT_PROJECT_NAME, defaultProject } from "@/types";
+import { defaultProject, isDefaultProject } from "@/types";
import { TableMetadataSchema } from "@/types/proto-es/v1/database_service_pb";
import {
getDatabaseEnvironment,
@@ -214,8 +214,11 @@ const instanceEngine = computed(() => {
});
const allowQuery = computed(() => {
- if (database.value.project === DEFAULT_PROJECT_NAME) {
- return hasProjectPermissionV2(defaultProject(), "bb.sql.select");
+ if (isDefaultProject(database.value.project)) {
+ return hasProjectPermissionV2(
+ defaultProject(database.value.project),
+ "bb.sql.select"
+ );
}
return isDatabaseV1Queryable(database.value);
});
diff --git a/frontend/src/components/InstanceAssignment.vue b/frontend/src/components/InstanceAssignment.vue
index 8ef4cbd9f3..2efe070b9b 100644
--- a/frontend/src/components/InstanceAssignment.vue
+++ b/frontend/src/components/InstanceAssignment.vue
@@ -212,7 +212,7 @@ const updateAssignment = async () => {
}
// refresh activatedInstanceCount
- await actuatorStore.fetchServerInfo();
+ await actuatorStore.fetchServerInfo(actuatorStore.workspaceResourceName);
pushNotification({
module: "bytebase",
diff --git a/frontend/src/components/InstanceForm/Form.vue b/frontend/src/components/InstanceForm/Form.vue
index 6ad911f24c..4157457d53 100644
--- a/frontend/src/components/InstanceForm/Form.vue
+++ b/frontend/src/components/InstanceForm/Form.vue
@@ -1019,7 +1019,7 @@ const changeInstanceActivation = async (on: boolean) => {
]);
useDatabaseV1Store().updateDatabaseInstance(updated);
// refresh activatedInstanceCount
- await actuatorStore.fetchServerInfo();
+ await actuatorStore.fetchServerInfo(actuatorStore.workspaceResourceName);
pushNotification({
module: "bytebase",
diff --git a/frontend/src/components/Member/EditMemberRoleDrawer.vue b/frontend/src/components/Member/EditMemberRoleDrawer.vue
index 20125c06cd..93f8bde12e 100644
--- a/frontend/src/components/Member/EditMemberRoleDrawer.vue
+++ b/frontend/src/components/Member/EditMemberRoleDrawer.vue
@@ -11,7 +11,7 @@
v-if="isCreating"
v-model:value="state.memberList"
:required="true"
- :include-all-users="true"
+ :include-all-users="!isSaaSMode"
:include-service-account="true"
:include-workload-identity="true"
/>
@@ -70,13 +70,18 @@
<script setup lang="ts">
import { isEqual } from "lodash-es";
import { NButton, NInput, useDialog } from "naive-ui";
+import { storeToRefs } from "pinia";
import { computed, reactive, ref } from "vue";
import { useI18n } from "vue-i18n";
import { BBButtonConfirm } from "@/bbkit";
import RequiredStar from "@/components/RequiredStar.vue";
import { Drawer, DrawerContent } from "@/components/v2";
import { RoleSelect } from "@/components/v2/Select";
-import { pushNotification, useWorkspaceV1Store } from "@/store";
+import {
+ pushNotification,
+ useActuatorV1Store,
+ useWorkspaceV1Store,
+} from "@/store";
import { ALL_USERS_USER_EMAIL } from "@/types";
import MembersBindingSelect from "./MembersBindingSelect.vue";
import { type MemberBinding } from "./types";
@@ -95,6 +100,8 @@ const emit = defineEmits<{
(event: "close"): void;
}>();
+const { isSaaSMode } = storeToRefs(useActuatorV1Store());
+
const initMemberList = () => {
if (!props.member) {
return [];
diff --git a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue
index 46018dbef8..f1ace02d0a 100644
--- a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue
+++ b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue
@@ -82,7 +82,7 @@ import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";
import { useRecentVisit } from "@/router/useRecentVisit";
import { useCurrentProjectV1 } from "@/store";
import { getProjectName } from "@/store/modules/v1/common";
-import { DEFAULT_PROJECT_NAME, isValidProjectName } from "@/types";
+import { isDefaultProject, isValidProjectName } from "@/types";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
import {
filterProjectV1ListByKeyword,
@@ -126,9 +126,7 @@ onMounted(() => {
});
const getFilteredProjectList = (projectList: Project[]): Project[] => {
- const list = projectList.filter(
- (project) => project.name !== DEFAULT_PROJECT_NAME
- );
+ const list = projectList.filter((project) => !isDefaultProject(project.name));
return filterProjectV1ListByKeyword(list, state.searchText);
};
diff --git a/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue b/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue
index b3f1c3c3a4..2ea03db35d 100644
--- a/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue
+++ b/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue
@@ -65,7 +65,7 @@ import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapp
import RequiredStar from "@/components/RequiredStar.vue";
import ResourceIdField from "@/components/v2/Form/ResourceIdField.vue";
import { useProjectV1Store } from "@/store";
-import { DEFAULT_PROJECT_NAME } from "@/types";
+import { isDefaultProject } from "@/types";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
import {
convertKVListToLabels,
@@ -103,7 +103,7 @@ watch(
const allowSave = computed((): boolean => {
const titleChanged =
- props.project.name !== DEFAULT_PROJECT_NAME &&
+ !isDefaultProject(props.project.name) &&
!isEmpty(state.title) &&
state.title !== props.project.title;
diff --git a/frontend/src/components/Project/useProjectSidebar.ts b/frontend/src/components/Project/useProjectSidebar.ts
index cf9e9c82f2..49f14adbd1 100644
--- a/frontend/src/components/Project/useProjectSidebar.ts
+++ b/frontend/src/components/Project/useProjectSidebar.ts
@@ -29,7 +29,7 @@ import {
PROJECT_V1_ROUTE_WEBHOOKS,
PROJECT_V1_ROUTE_WORKLOAD_IDENTITIES,
} from "@/router/dashboard/projectV1";
-import { DEFAULT_PROJECT_NAME } from "@/types";
+import { isDefaultProject } from "@/types";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
interface ProjectSidebarItem extends SidebarItem {
@@ -42,8 +42,8 @@ interface ProjectSidebarItem extends SidebarItem {
export const useProjectSidebar = (project: MaybeRef<Project>) => {
const route = useRoute();
- const isDefaultProject = computed((): boolean => {
- return unref(project).name === DEFAULT_PROJECT_NAME;
+ const isDefault = computed((): boolean => {
+ return isDefaultProject(unref(project).name);
});
const projectSidebarItemList = computed((): ProjectSidebarItem[] => {
@@ -53,7 +53,7 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {
icon: () => h(Workflow),
type: "div",
expand: true,
- hide: isDefaultProject.value,
+ hide: isDefault.value,
children: [
{
title: t("plan.plans"),
@@ -111,7 +111,7 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {
path: PROJECT_V1_ROUTE_ISSUES,
icon: () => h(CircleDot),
type: "div",
- hide: isDefaultProject.value,
+ hide: isDefault.value,
},
...cicdRoutes,
...databaseRoutes,
@@ -119,7 +119,7 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {
title: t("settings.sidebar.data-access"),
icon: () => h(ShieldCheck),
type: "div",
- hide: isDefaultProject.value,
+ hide: isDefault.value,
expand: true,
children: [
{
@@ -143,7 +143,7 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {
title: t("common.manage"),
icon: () => h(Users),
type: "div",
- hide: isDefaultProject.value,
+ hide: isDefault.value,
expand: true,
children: [
{
@@ -178,7 +178,7 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {
icon: () => h(Settings),
path: PROJECT_V1_ROUTE_SETTINGS,
type: "div",
- hide: isDefaultProject.value,
+ hide: isDefault.value,
},
];
diff --git a/frontend/src/components/ProvideSQLEditorContext.vue b/frontend/src/components/ProvideSQLEditorContext.vue
index 404d1c58c3..b70a0559c5 100644
--- a/frontend/src/components/ProvideSQLEditorContext.vue
+++ b/frontend/src/components/ProvideSQLEditorContext.vue
@@ -48,6 +48,7 @@ import sqlEditorRoutes, {
} from "@/router/sqlEditor";
import {
pushNotification,
+ useActuatorV1Store,
useDatabaseV1Store,
useProjectV1Store,
useSQLEditorStore,
@@ -56,7 +57,6 @@ import {
} from "@/store";
import { migrateLegacyCache } from "@/store/modules/sqlEditor/legacy/migration";
import {
- DEFAULT_PROJECT_NAME,
DEFAULT_SQL_EDITOR_TAB_MODE,
isValidDatabaseName,
isValidInstanceName,
@@ -84,6 +84,7 @@ import {
const { t } = useI18n();
const route = useRoute();
const router = useRouter();
+const actuatorStore = useActuatorV1Store();
const projectStore = useProjectV1Store();
const databaseStore = useDatabaseV1Store();
const editorStore = useSQLEditorStore();
@@ -111,7 +112,7 @@ const fallbackToFirstProject = async () => {
excludeDefault: true,
},
});
- return head(projects)?.name ?? DEFAULT_PROJECT_NAME;
+ return head(projects)?.name ?? actuatorStore.serverInfo?.defaultProject ?? "";
};
const initializeProject = async () => {
diff --git a/frontend/src/components/TableDetailDrawer.vue b/frontend/src/components/TableDetailDrawer.vue
index 302fe3e6e3..1cce98434a 100644
--- a/frontend/src/components/TableDetailDrawer.vue
+++ b/frontend/src/components/TableDetailDrawer.vue
@@ -329,7 +329,7 @@ import {
useDatabaseV1Store,
useDBSchemaV1Store,
} from "@/store";
-import { DEFAULT_PROJECT_NAME, defaultProject } from "@/types";
+import { defaultProject, isDefaultProject } from "@/types";
import { Engine } from "@/types/proto-es/v1/common_pb";
import {
SchemaCatalogSchema,
@@ -522,8 +522,11 @@ const instanceEngineNew = computed(() => {
});
const allowQuery = computed(() => {
- if (database.value.project === DEFAULT_PROJECT_NAME) {
- return hasProjectPermissionV2(defaultProject(), "bb.sql.select");
+ if (isDefaultProject(database.value.project)) {
+ return hasProjectPermissionV2(
+ defaultProject(database.value.project),
+ "bb.sql.select"
+ );
}
return isDatabaseV1Queryable(database.value);
});
diff --git a/frontend/src/components/TransferDatabaseForm/TransferDatabaseForm.vue b/frontend/src/components/TransferDatabaseForm/TransferDatabaseForm.vue
index 7bd525c455..93ea33bfb3 100644
--- a/frontend/src/components/TransferDatabaseForm/TransferDatabaseForm.vue
+++ b/frontend/src/components/TransferDatabaseForm/TransferDatabaseForm.vue
@@ -81,14 +81,11 @@ import { NButton, NTooltip } from "naive-ui";
import { computed, reactive, toRef, watchEffect } from "vue";
import {
pushNotification,
+ useActuatorV1Store,
useDatabaseV1Store,
useProjectByName,
} from "@/store";
-import {
- DEFAULT_PROJECT_NAME,
- formatEnvironmentName,
- isValidProjectName,
-} from "@/types";
+import { formatEnvironmentName, isValidProjectName } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import {
BatchUpdateDatabasesRequestSchema,
@@ -128,6 +125,7 @@ const emit = defineEmits<{
(e: "dismiss"): void;
}>();
+const actuatorStore = useActuatorV1Store();
const databaseStore = useDatabaseV1Store();
const state = reactive<LocalState>({
@@ -141,14 +139,18 @@ const state = reactive<LocalState>({
});
const { project } = useProjectByName(toRef(props, "projectName"));
+const defaultProjectName = computed(
+ () => actuatorStore.serverInfo?.defaultProject ?? ""
+);
+
const sourceProjectName = computed(() => {
if (state.transferSource === "DEFAULT") {
- return DEFAULT_PROJECT_NAME;
+ return defaultProjectName.value;
}
if (state.fromProjectName) {
return state.fromProjectName;
}
- return DEFAULT_PROJECT_NAME;
+ return defaultProjectName.value;
});
const { project: sourceProject } = useProjectByName(sourceProjectName);
diff --git a/frontend/src/components/TransferOutDatabaseForm/TransferOutDatabaseForm.vue b/frontend/src/components/TransferOutDatabaseForm/TransferOutDatabaseForm.vue
index 00388df79f..1a62ed1122 100644
--- a/frontend/src/components/TransferOutDatabaseForm/TransferOutDatabaseForm.vue
+++ b/frontend/src/components/TransferOutDatabaseForm/TransferOutDatabaseForm.vue
@@ -75,10 +75,11 @@ import { BBSpin } from "@/bbkit";
import { DrawerContent, ProjectSelect } from "@/components/v2";
import {
pushNotification,
+ useActuatorV1Store,
useDatabaseV1Store,
useProjectV1Store,
} from "@/store";
-import { DEFAULT_PROJECT_NAME, isValidProjectName } from "@/types";
+import { isDefaultProject, isValidProjectName } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import {
BatchUpdateDatabasesRequestSchema,
@@ -106,6 +107,7 @@ const emit = defineEmits<{
const { t } = useI18n();
const router = useRouter();
+const actuatorStore = useActuatorV1Store();
const projectStore = useProjectV1Store();
const databaseStore = useDatabaseV1Store();
const loading = ref(false);
@@ -128,9 +130,7 @@ const selectedDatabaseList = computed(() => {
});
const showUnassignOption = computed(() => {
- return selectedDatabaseList.value.some(
- (db) => db.project !== DEFAULT_PROJECT_NAME
- );
+ return selectedDatabaseList.value.some((db) => !isDefaultProject(db.project));
});
const targetProjectName = ref<string>();
@@ -139,7 +139,7 @@ watch(
() => transfer.value,
(transfer) => {
if (transfer === "unassign") {
- targetProjectName.value = DEFAULT_PROJECT_NAME;
+ targetProjectName.value = actuatorStore.serverInfo?.defaultProject ?? "";
} else {
targetProjectName.value = undefined;
}
diff --git a/frontend/src/components/User/Settings/AADSyncDrawer.vue b/frontend/src/components/User/Settings/AADSyncDrawer.vue
index 6cc3a09506..7234ed06cf 100644
--- a/frontend/src/components/User/Settings/AADSyncDrawer.vue
+++ b/frontend/src/components/User/Settings/AADSyncDrawer.vue
@@ -135,19 +135,15 @@ const hasPermission = computed(() =>
hasWorkspacePermissionV2("bb.settings.setWorkspaceProfile")
);
-const workspaceId = computed(() => {
- return actuatorStore.serverInfo?.workspaceId ?? "";
-});
-
const externalUrl = computed(() => {
return actuatorStore.serverInfo?.externalUrl;
});
const scimUrl = computed(() => {
- if (!workspaceId.value || !externalUrl.value) {
+ if (!actuatorStore.workspaceResourceName || !externalUrl.value) {
return "";
}
- return `${externalUrl.value}/hook/scim/workspaces/${workspaceId.value}`;
+ return `${externalUrl.value}/hook/scim/${actuatorStore.workspaceResourceName}`;
});
const scimToken = computed(() => {
diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue
index fbadbe7f0d..ab21ac6458 100644
--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue
+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue
@@ -132,13 +132,14 @@ import {
} from "@/router/dashboard/projectV1";
import {
pushNotification,
+ useActuatorV1Store,
useDatabaseV1Store,
useDBSchemaV1Store,
useGracefulRequest,
useProjectV1Store,
} from "@/store";
import type { Permission } from "@/types";
-import { DEFAULT_PROJECT_NAME, isValidProjectName } from "@/types";
+import { isDefaultProject, isValidProjectName } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import {
BatchUpdateDatabasesRequestSchema,
@@ -195,6 +196,7 @@ const emit = defineEmits<{
const { t } = useI18n();
const router = useRouter();
+const actuatorStore = useActuatorV1Store();
const databaseStore = useDatabaseV1Store();
const projectStore = useProjectV1Store();
const dbSchemaStore = useDBSchemaV1Store();
@@ -203,8 +205,12 @@ const selectedProjectNames = computed(() => {
return new Set(props.databases.map((db) => db.project));
});
+const hasDefaultProjectSelected = computed(() => {
+ return [...selectedProjectNames.value].some((name) => isDefaultProject(name));
+});
+
const assignedDatabases = computed(() => {
- return props.databases.filter((db) => db.project !== DEFAULT_PROJECT_NAME);
+ return props.databases.filter((db) => !isDefaultProject(db.project));
});
const getDisabledTooltip = (action: string) => {
@@ -213,7 +219,7 @@ const getDisabledTooltip = (action: string) => {
action: action.toLowerCase(),
});
}
- if (selectedProjectNames.value.has(DEFAULT_PROJECT_NAME)) {
+ if (hasDefaultProjectSelected.value) {
return t("database.batch-action-disabled-for-unassigned", {
action: action.toLowerCase(),
});
@@ -339,7 +345,7 @@ const unAssignDatabases = async () => {
return create(UpdateDatabaseRequestSchema, {
database: create(DatabaseSchema$, {
name: database.name,
- project: DEFAULT_PROJECT_NAME,
+ project: actuatorStore.serverInfo?.defaultProject ?? "",
}),
updateMask: create(FieldMaskProtoEsSchema, { paths: ["project"] }),
});
@@ -365,9 +371,7 @@ const unAssignDatabases = async () => {
const operationsInProjectDetail = computed(() => !!props.projectName);
-const isInDefaultProject = computed(
- () => props.projectName === DEFAULT_PROJECT_NAME
-);
+const isInDefaultProject = computed(() => isDefaultProject(props.projectName));
const actions = computed((): DatabaseAction[] => {
const resp: DatabaseAction[] = [];
@@ -392,7 +396,7 @@ const actions = computed((): DatabaseAction[] => {
disabled:
!selectedProjectName.value ||
selectedDatabaseNameList.value.length < 1 ||
- selectedProjectNames.value.has(DEFAULT_PROJECT_NAME),
+ hasDefaultProjectSelected.value,
click: () => {
preCreateIssue(
selectedProjectName.value,
@@ -411,7 +415,7 @@ const actions = computed((): DatabaseAction[] => {
disabled:
!selectedProjectName.value ||
props.databases.length < 1 ||
- selectedProjectNames.value.has(DEFAULT_PROJECT_NAME),
+ hasDefaultProjectSelected.value,
click: () => generateMultiDb("bb.plan.export-data"),
requiredPermissions: [...PERMISSIONS_FOR_DATABASE_EXPORT_ISSUE],
});
diff --git a/frontend/src/components/v2/Select/ProjectSelect.vue b/frontend/src/components/v2/Select/ProjectSelect.vue
index 3f3a5b7179..de867bc5f9 100644
--- a/frontend/src/components/v2/Select/ProjectSelect.vue
+++ b/frontend/src/components/v2/Select/ProjectSelect.vue
@@ -26,7 +26,7 @@ import { useI18n } from "vue-i18n";
import { ProjectNameCell } from "@/components/v2/Model/cells";
import { useProjectV1Store } from "@/store";
import {
- DEFAULT_PROJECT_NAME,
+ isDefaultProject,
UNKNOWN_PROJECT_NAME,
unknownProject,
} from "@/types";
@@ -62,10 +62,9 @@ const projectStore = useProjectV1Store();
const getOption = (project: Project): ResourceSelectOption<Project> => ({
resource: project,
value: project.name,
- label:
- project.name === DEFAULT_PROJECT_NAME
- ? t("common.unassigned")
- : project.title,
+ label: isDefaultProject(project.name)
+ ? t("common.unassigned")
+ : project.title,
});
const additionalOptions = computedAsync(async () => {
diff --git a/frontend/src/connect/middlewares/authInterceptorMiddleware.ts b/frontend/src/connect/middlewares/authInterceptorMiddleware.ts
index efe86326c4..b6fa0d824c 100644
--- a/frontend/src/connect/middlewares/authInterceptorMiddleware.ts
+++ b/frontend/src/connect/middlewares/authInterceptorMiddleware.ts
@@ -31,7 +31,11 @@ export const authInterceptor: Interceptor = (next) => async (req) => {
if (ignoredCodes?.includes(code)) {
// omit specified errors
} else {
- if (code === Code.Unauthenticated && req.method.name !== "Login") {
+ if (
+ code === Code.Unauthenticated &&
+ req.method.name !== "Login" &&
+ req.method.name !== "Signup"
+ ) {
// Don't retry refresh endpoint failures - just propagate error
// The caller (refreshTokens catch block) will handle the notification
if (req.method.name === "Refresh") {
diff --git a/frontend/src/layouts/ProjectV1Layout.vue b/frontend/src/layouts/ProjectV1Layout.vue
index a69058561b..5f5ea58b5e 100644
--- a/frontend/src/layouts/ProjectV1Layout.vue
+++ b/frontend/src/layouts/ProjectV1Layout.vue
@@ -54,7 +54,10 @@ import {
useProjectV1Store,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
-import { DEFAULT_PROJECT_NAME, UNKNOWN_PROJECT_NAME } from "@/types";
+import {
+ isDefaultProject as checkIsDefaultProject,
+ UNKNOWN_PROJECT_NAME,
+} from "@/types";
import { State } from "@/types/proto-es/v1/common_pb";
import { hasProjectPermissionV2, setDocumentTitle } from "@/utils";
@@ -107,7 +110,7 @@ const initialized = computed(
);
const isDefaultProject = computed((): boolean => {
- return project.value.name === DEFAULT_PROJECT_NAME;
+ return checkIsDefaultProject(project.value.name);
});
const allowEdit = computed(() => {
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 21405b282e..6a7a2d5866 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -45,11 +45,11 @@ migrateStorageKeys();
app.use(pinia);
+ const currentUser = await useAuthStore().fetchCurrentUser();
// Initialize stores.
await Promise.all([
- useActuatorV1Store().fetchServerInfo(),
+ useActuatorV1Store().fetchServerInfo(currentUser?.workspace),
useSubscriptionV1Store().fetchSubscription(),
- useAuthStore().fetchCurrentUser(),
]);
app.use(router).use(highlight).use(i18n).use(NaiveUI);
diff --git a/frontend/src/store/modules/v1/actuator.ts b/frontend/src/store/modules/v1/actuator.ts
index 13cb8e6605..0df4be83d3 100644
--- a/frontend/src/store/modules/v1/actuator.ts
+++ b/frontend/src/store/modules/v1/actuator.ts
@@ -19,7 +19,6 @@ import {
STORAGE_KEY_RELEASE,
semverCompare,
} from "@/utils";
-import { workspaceNamePrefix } from "./common";
const EXTERNAL_URL_PLACEHOLDER =
"https://docs.bytebase.com/get-started/self-host/external-url";
@@ -82,7 +81,7 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
const isSaaSMode = computed(() => serverInfo.value?.saas || false);
const workspaceResourceName = computed(
- () => `${workspaceNamePrefix}${serverInfo.value?.workspaceId ?? ""}`
+ () => serverInfo.value?.workspace ?? ""
);
const needAdminSetup = computed(
@@ -154,10 +153,21 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
serverInfoTs.value = Date.now();
};
- const fetchServerInfo = async () => {
+ const fetchActuatorInfo = async (workspace?: string) => {
+ if (!workspace) {
+ return actuatorServiceClientConnect.getActuatorInfo({});
+ }
+ return actuatorServiceClientConnect.getWorkspaceActuatorInfo({
+ name: workspace,
+ });
+ };
+
+ const fetchServerInfo = async (workspace?: string) => {
const [info, pkg] = await Promise.all([
- actuatorServiceClientConnect.getActuatorInfo({}),
- actuatorServiceClientConnect.getResourcePackage({}),
+ fetchActuatorInfo(workspace),
+ actuatorServiceClientConnect.getResourcePackage({
+ name: workspace,
+ }),
]);
setServerInfo(info);
resourcePackage.value = pkg;
@@ -215,7 +225,7 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
const tryToRemindRefresh = async (): Promise<boolean> => {
if (Date.now() - serverInfoTs.value >= 1000 * 60 * 30) {
- await fetchServerInfo();
+ await fetchServerInfo(workspaceResourceName.value);
}
if (gitCommitBE.value === "unknown" || gitCommitFE.value === "unknown") {
return false;
diff --git a/frontend/src/store/modules/v1/auth.ts b/frontend/src/store/modules/v1/auth.ts
index cf5687fcf5..e34eb4add6 100644
--- a/frontend/src/store/modules/v1/auth.ts
+++ b/frontend/src/store/modules/v1/auth.ts
@@ -4,7 +4,7 @@ import { useLocalStorage } from "@vueuse/core";
import { uniqueId } from "lodash-es";
import { defineStore } from "pinia";
import { computed, ref } from "vue";
-import { authServiceClientConnect, userServiceClientConnect } from "@/connect";
+import { authServiceClientConnect } from "@/connect";
import { ignoredCodesContextKey } from "@/connect/context-key";
import { router } from "@/router";
import {
@@ -19,13 +19,10 @@ import { UNKNOWN_USER_NAME, unknownUser } from "@/types";
import {
type LoginRequest,
LoginRequestSchema,
+ SignupRequestSchema,
} from "@/types/proto-es/v1/auth_service_pb";
import { DatabaseChangeMode } from "@/types/proto-es/v1/setting_service_pb";
import type { User } from "@/types/proto-es/v1/user_service_pb";
-import {
- CreateUserRequestSchema,
- UserSchema,
-} from "@/types/proto-es/v1/user_service_pb";
import { storageKeyResetPassword } from "@/utils";
import { extractUserEmail } from "./common";
@@ -119,17 +116,11 @@ export const useAuthStore = defineStore("auth_v1", () => {
}
setRequireResetPassword(resp.requireResetPassword);
- const needAdminSetup = actuatorStore.needAdminSetup;
- await actuatorStore.fetchServerInfo();
+ await actuatorStore.fetchServerInfo(user?.workspace);
// After user login, we need to reset the auth session key.
authSessionKey.value = uniqueId();
- if (needAdminSetup) {
- actuatorStore.onboardingState.isOnboarding = true;
- return router.replace({
- name: SETUP_MODULE,
- });
- }
+
const mode = useAppFeature("bb.feature.database-change-mode");
if (mode.value === DatabaseChangeMode.EDITOR) {
const route = router.resolve({
@@ -151,23 +142,36 @@ export const useAuthStore = defineStore("auth_v1", () => {
};
const signup = async (request: Partial<User>) => {
- const user = create(UserSchema, {
- email: request.email,
- title: request.name,
- password: request.password,
- });
- const createRequest = create(CreateUserRequestSchema, {
- user: user,
- });
- await userServiceClientConnect.createUser(createRequest);
- await login({
- request: create(LoginRequestSchema, {
+ await authServiceClientConnect.signup(
+ create(SignupRequestSchema, {
email: request.email,
+ title: request.name,
password: request.password,
- web: true,
- }),
- redirect: true,
- });
+ })
+ );
+
+ // Signup sets HTTP-only cookies automatically.
+ // Fetch the current user and proceed with post-login flow.
+ const user = await fetchCurrentUser();
+ unauthenticatedOccurred.value = !user;
+ if (unauthenticatedOccurred.value) {
+ return;
+ }
+
+ await actuatorStore.fetchServerInfo(user?.workspace);
+ authSessionKey.value = uniqueId();
+
+ if (actuatorStore.needAdminSetup) {
+ actuatorStore.onboardingState.isOnboarding = true;
+ return router.replace({ name: SETUP_MODULE });
+ }
+
+ const mode = useAppFeature("bb.feature.database-change-mode");
+ let nextPage = getRedirectQuery() || "/";
+ if (mode.value === DatabaseChangeMode.EDITOR) {
+ nextPage = router.resolve({ name: SQL_EDITOR_HOME_MODULE }).fullPath;
+ }
+ router.replace(nextPage);
};
const cleanupUserStorage = (email: string) => {
diff --git a/frontend/src/store/modules/v1/common.ts b/frontend/src/store/modules/v1/common.ts
index f0942823ce..fb69371c20 100644
--- a/frontend/src/store/modules/v1/common.ts
+++ b/frontend/src/store/modules/v1/common.ts
@@ -64,6 +64,11 @@ export const getNameParentTokens = (
return tokens;
};
+export const getWorkspaceId = (name: string): string => {
+ const tokens = getNameParentTokens(name, [workspaceNamePrefix]);
+ return tokens[0];
+};
+
export const getEnvironmentId = (name: string): string => {
const tokens = getNameParentTokens(name, [environmentNamePrefix]);
const envId = tokens[0];
diff --git a/frontend/src/store/modules/v1/project.ts b/frontend/src/store/modules/v1/project.ts
index fd839d6557..a3b7827ab4 100644
--- a/frontend/src/store/modules/v1/project.ts
+++ b/frontend/src/store/modules/v1/project.ts
@@ -8,8 +8,8 @@ import { projectServiceClientConnect } from "@/connect";
import { silentContextKey } from "@/connect/context-key";
import type { MaybeRef, ResourceId } from "@/types";
import {
- DEFAULT_PROJECT_NAME,
defaultProject,
+ isDefaultProject,
isValidProjectName,
UNKNOWN_PROJECT_NAME,
unknownProject,
@@ -100,7 +100,7 @@ export const useProjectV1Store = defineStore("project_v1", () => {
};
const getProjectByName = (name: string) => {
if (name === UNKNOWN_PROJECT_NAME) return unknownProject();
- if (name === DEFAULT_PROJECT_NAME) return defaultProject();
+ if (isDefaultProject(name)) return defaultProject(name);
return projectMapByName.get(name) ?? unknownProject();
};
const fetchProjectByName = async (name: string, silent = false) => {
@@ -208,7 +208,7 @@ export const useProjectV1Store = defineStore("project_v1", () => {
if (
!projectName ||
!isValidProjectName(projectName) ||
- projectName === DEFAULT_PROJECT_NAME
+ isDefaultProject(projectName)
) {
return false;
}
diff --git a/frontend/src/store/modules/v1/setting.ts b/frontend/src/store/modules/v1/setting.ts
index 99a9de7fb6..ee7d926e89 100644
--- a/frontend/src/store/modules/v1/setting.ts
+++ b/frontend/src/store/modules/v1/setting.ts
@@ -24,6 +24,7 @@ export const DEFAULT_MAX_RESULT_SIZE_IN_MB = 100;
export const useSettingV1Store = defineStore("setting_v1", () => {
const settingMapByName = reactive(new Map<string, Setting>());
+ const actuatorStore = useActuatorV1Store();
const workspaceProfile = computed((): WorkspaceProfileSetting => {
const setting = settingMapByName.get(
@@ -147,7 +148,7 @@ export const useSettingV1Store = defineStore("setting_v1", () => {
updateMask: updateMask,
});
// Refresh the latest server info.
- await useActuatorV1Store().fetchServerInfo();
+ await actuatorStore.fetchServerInfo(actuatorStore.workspaceResourceName);
};
return {
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.ts
index acc75ef621..4f1bebc674 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
@@ -18,6 +18,13 @@ export declare const file_v1_actuator_service: GenFile;
* @generated from message bytebase.v1.GetResourcePackageRequest
*/
export declare type GetResourcePackageRequest = Message<"bytebase.v1.GetResourcePackageRequest"> & {
+ /**
+ * Optional workspace name, format: workspaces/{workspace}.
+ * Set when using the workspace-scoped URL pattern.
+ *
+ * @generated from field: string name = 1;
+ */
+ name: string;
};
/**
@@ -74,6 +81,26 @@ export declare type GetActuatorInfoRequest = Message<"bytebase.v1.GetActuatorInf
*/
export declare const GetActuatorInfoRequestSchema: GenMessage<GetActuatorInfoRequest>;
+/**
+ * Request message for getting workspace-scoped actuator information.
+ *
+ * @generated from message bytebase.v1.GetWorkspaceActuatorInfoRequest
+ */
+export declare type GetWorkspaceActuatorInfoRequest = Message<"bytebase.v1.GetWorkspaceActuatorInfoRequest"> & {
+ /**
+ * The workspace name, format: workspaces/{workspace}.
+ *
+ * @generated from field: string name = 1;
+ */
+ name: string;
+};
+
+/**
+ * Describes the message bytebase.v1.GetWorkspaceActuatorInfoRequest.
+ * Use `create(GetWorkspaceActuatorInfoRequestSchema)` to create a new message.
+ */
+export declare const GetWorkspaceActuatorInfoRequestSchema: GenMessage<GetWorkspaceActuatorInfoRequest>;
+
/**
* Request message for deleting cache.
*
@@ -199,10 +226,11 @@ export declare type ActuatorInfo = Message<"bytebase.v1.ActuatorInfo"> & {
/**
* The unique identifier for the workspace.
+ * Format: workspaces/{id}
*
- * @generated from field: string workspace_id = 13;
+ * @generated from field: string workspace = 13;
*/
- workspaceId: string;
+ workspace: string;
/**
* List of features that are not licensed.
@@ -264,6 +292,14 @@ export declare type ActuatorInfo = Message<"bytebase.v1.ActuatorInfo"> & {
* @generated from field: bytebase.v1.Restriction restriction = 25;
*/
restriction?: Restriction;
+
+ /**
+ * The default project for unassigned databases.
+ * Format: projects/{id}
+ *
+ * @generated from field: string default_project = 26;
+ */
+ defaultProject: string;
};
/**
@@ -322,5 +358,15 @@ export declare const ActuatorService: GenService<{
input: typeof GetResourcePackageRequestSchema;
output: typeof ResourcePackageSchema;
},
+ /**
+ * Gets workspace-scoped actuator info. Requires authentication.
+ *
+ * @generated from rpc bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo
+ */
+ getWorkspaceActuatorInfo: {
+ methodKind: "unary";
+ input: typeof GetWorkspaceActuatorInfoRequestSchema;
+ output: typeof ActuatorInfoSchema;
+ },
}>;
diff --git a/frontend/src/types/proto-es/v1/actuator_service_pb.js b/frontend/src/types/proto-es/v1/actuator_service_pb.js
index 33f91f2740..99ab91cd5d 100644
--- a/frontend/src/types/proto-es/v1/actuator_service_pb.js
+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.js
@@ -6,6 +6,7 @@ import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2
import { file_google_api_annotations } from "../google/api/annotations_pb";
import { file_google_api_client } from "../google/api/client_pb";
import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";
+import { file_google_api_resource } from "../google/api/resource_pb";
import { file_google_protobuf_empty, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
import { file_v1_annotation } from "./annotation_pb";
import { file_v1_setting_service } from "./setting_service_pb";
@@ -14,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("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIbChlHZXRSZXNvdXJjZVBhY2thZ2VSZXF1ZXN0Ih8KD1Jlc291cmNlUGFja2FnZRIMCgRsb2dvGAEgASgMIhQKElNldHVwU2FtcGxlUmVxdWVzdCIYChZHZXRBY3R1YXRvckluZm9SZXF1ZXN0IhQKEkRlbGV0ZUNhY2hlUmVxdWVzdCKvAQoLUmVzdHJpY3Rpb24SHAoPZGlzYWxsb3dfc2lnbnVwGAEgASgIQgPgQQMSJQoYZGlzYWxsb3dfcGFzc3dvcmRfc2lnbmluGAIgASgIQgPgQQMSWwoUcGFzc3dvcmRfcmVzdHJpY3Rpb24YAyABKAsyOC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZy5QYXNzd29yZFJlc3RyaWN0aW9uQgPgQQMigwUKDEFjdHVhdG9ySW5mbxIUCgd2ZXJzaW9uGAEgASgJQgPgQQMSFwoKZ2l0X2NvbW1pdBgCIAEoCUID4EEDEhUKCHJlYWRvbmx5GAMgASgIQgPgQQMSEQoEc2FhcxgEIAEoCEID4EEDEhEKBGRlbW8YBSABKAhCA+BBAxIRCgRob3N0GAYgASgJQgPgQQMSEQoEcG9ydBgHIAEoCUID4EEDEhkKDGV4dGVybmFsX3VybBgIIAEoCUID4EEDEh0KEG5lZWRfYWRtaW5fc2V0dXAYCSABKAhCA+BBAxI5ChBsYXN0X2FjdGl2ZV90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhkKDHdvcmtzcGFjZV9pZBgNIAEoCUID4EEDEiAKE3VubGljZW5zZWRfZmVhdHVyZXMYDyADKAlCA+BBAxITCgZkb2NrZXIYEiABKAhCA+BBAxIhChRhY3RpdmF0ZWRfdXNlcl9jb3VudBgTIAEoBUID4EEDEiUKGGFjdGl2YXRlZF9pbnN0YW5jZV9jb3VudBgUIAEoBUID4EEDEiEKFHRvdGFsX2luc3RhbmNlX2NvdW50GBUgASgFQgPgQQMSGgoNZW5hYmxlX3NhbXBsZRgWIAEoCEID4EEDEiMKFmV4dGVybmFsX3VybF9mcm9tX2ZsYWcYFyABKAhCA+BBAxIaCg1yZXBsaWNhX2NvdW50GBggASgFQgPgQQMSMgoLcmVzdHJpY3Rpb24YGSABKAsyGC5ieXRlYmFzZS52MS5SZXN0cmljdGlvbkID4EEDSgQIChALSgQIDBANSgQIEBARSgQIERASSgQIDhAPMvcDCg9BY3R1YXRvclNlcnZpY2UScwoPR2V0QWN0dWF0b3JJbmZvEiMuYnl0ZWJhc2UudjEuR2V0QWN0dWF0b3JJbmZvUmVxdWVzdBoZLmJ5dGViYXNlLnYxLkFjdHVhdG9ySW5mbyIg2kEAgOowAYLT5JMCExIRL3YxL2FjdHVhdG9yL2luZm8SggEKC1NldHVwU2FtcGxlEh8uYnl0ZWJhc2UudjEuU2V0dXBTYW1wbGVSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjqK6jASYmIucHJvamVjdHMuY3JlYXRlkOowAYLT5JMCGiIYL3YxL2FjdHVhdG9yOnNldHVwU2FtcGxlEmYKC0RlbGV0ZUNhY2hlEh8uYnl0ZWJhc2UudjEuRGVsZXRlQ2FjaGVSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5Ih6A6jABgtPkkwIUKhIvdjEvYWN0dWF0b3IvY2FjaGUSgQEKEkdldFJlc291cmNlUGFja2FnZRImLmJ5dGViYXNlLnYxLkdldFJlc291cmNlUGFja2FnZVJlcXVlc3QaHC5ieXRlYmFzZS52MS5SZXNvdXJjZVBhY2thZ2UiJdpBAIDqMAGC0+STAhgSFi92MS9hY3R1YXRvci9yZXNvdXJjZXNCqgEKD2NvbS5ieXRlYmFzZS52MUIUQWN0dWF0b3JTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_protobuf_empty, file_google_protobuf_timestamp, file_v1_annotation, file_v1_setting_service]);
+ fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIpChlHZXRSZXNvdXJjZVBhY2thZ2VSZXF1ZXN0EgwKBG5hbWUYASABKAkiHwoPUmVzb3VyY2VQYWNrYWdlEgwKBGxvZ28YASABKAwiFAoSU2V0dXBTYW1wbGVSZXF1ZXN0IhgKFkdldEFjdHVhdG9ySW5mb1JlcXVlc3QiTwofR2V0V29ya3NwYWNlQWN0dWF0b3JJbmZvUmVxdWVzdBIsCgRuYW1lGAEgASgJQh7gQQL6QRgKFmJ5dGViYXNlLmNvbS9Xb3Jrc3BhY2UiFAoSRGVsZXRlQ2FjaGVSZXF1ZXN0Iq8BCgtSZXN0cmljdGlvbhIcCg9kaXNhbGxvd19zaWdudXAYASABKAhCA+BBAxIlChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YAiABKAhCA+BBAxJbChRwYXNzd29yZF9yZXN0cmljdGlvbhgDIAEoCzI4LmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nLlBhc3N3b3JkUmVzdHJpY3Rpb25CA+BBAyKeBQoMQWN0dWF0b3JJbmZvEhQKB3ZlcnNpb24YASABKAlCA+BBAxIXCgpnaXRfY29tbWl0GAIgASgJQgPgQQMSFQoIcmVhZG9ubHkYAyABKAhCA+BBAxIRCgRzYWFzGAQgASgIQgPgQQMSEQoEZGVtbxgFIAEoCEID4EEDEhEKBGhvc3QYBiABKAlCA+BBAxIRCgRwb3J0GAcgASgJQgPgQQMSGQoMZXh0ZXJuYWxfdXJsGAggASgJQgPgQQMSHQoQbmVlZF9hZG1pbl9zZXR1cBgJIAEoCEID4EEDEjkKEGxhc3RfYWN0aXZlX3RpbWUYCyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFgoJd29ya3NwYWNlGA0gASgJQgPgQQMSIAoTdW5saWNlbnNlZF9mZWF0dXJlcxgPIAMoCUID4EEDEhMKBmRvY2tlchgSIAEoCEID4EEDEiEKFGFjdGl2YXRlZF91c2VyX2NvdW50GBMgASgFQgPgQQMSJQoYYWN0aXZhdGVkX2luc3RhbmNlX2NvdW50GBQgASgFQgPgQQMSIQoUdG90YWxfaW5zdGFuY2VfY291bnQYFSABKAVCA+BBAxIaCg1lbmFibGVfc2FtcGxlGBYgASgIQgPgQQMSIwoWZXh0ZXJuYWxfdXJsX2Zyb21fZmxhZxgXIAEoCEID4EEDEhoKDXJlcGxpY2FfY291bnQYGCABKAVCA+BBAxIyCgtyZXN0cmljdGlvbhgZIAEoCzIYLmJ5dGViYXNlLnYxLlJlc3RyaWN0aW9uQgPgQQMSHAoPZGVmYXVsdF9wcm9qZWN0GBogASgJQgPgQQNKBAgKEAtKBAgMEA1KBAgQEBFKBAgREBJKBAgOEA8y6AUKD0FjdHVhdG9yU2VydmljZRJzCg9HZXRBY3R1YXRvckluZm8SIy5ieXRlYmFzZS52MS5HZXRBY3R1YXRvckluZm9SZXF1ZXN0GhkuYnl0ZWJhc2UudjEuQWN0dWF0b3JJbmZvIiDaQQCA6jABgtPkkwITEhEvdjEvYWN0dWF0b3IvaW5mbxKCAQoLU2V0dXBTYW1wbGUSHy5ieXRlYmFzZS52MS5TZXR1cFNhbXBsZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiOorqMBJiYi5wcm9qZWN0cy5jcmVhdGWQ6jABgtPkkwIaIhgvdjEvYWN0dWF0b3I6c2V0dXBTYW1wbGUSZgoLRGVsZXRlQ2FjaGUSHy5ieXRlYmFzZS52MS5EZWxldGVDYWNoZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiHoDqMAGC0+STAhQqEi92MS9hY3R1YXRvci9jYWNoZRKvAQoSR2V0UmVzb3VyY2VQYWNrYWdlEiYuYnl0ZWJhc2UudjEuR2V0UmVzb3VyY2VQYWNrYWdlUmVxdWVzdBocLmJ5dGViYXNlLnYxLlJlc291cmNlUGFja2FnZSJT2kEAgOowAYLT5JMCRlosEiovdjEve25hbWU9d29ya3NwYWNlcy8qfS9hY3R1YXRvci9yZXNvdXJjZXMSFi92MS9hY3R1YXRvci9yZXNvdXJjZXMSwAEKGEdldFdvcmtzcGFjZUFjdHVhdG9ySW5mbxIsLmJ5dGViYXNlLnYxLkdldFdvcmtzcGFjZUFjdHVhdG9ySW5mb1JlcXVlc3QaGS5ieXRlYmFzZS52MS5BY3R1YXRvckluZm8iW9pBBG5hbWWK6jAfYmIuc2V0dGluZ3MuZ2V0V29ya3NwYWNlUHJvZmlsZZDqMAGC0+STAicSJS92MS97bmFtZT13b3Jrc3BhY2VzLyp9L2FjdHVhdG9yL2luZm9CqgEKD2NvbS5ieXRlYmFzZS52MUIUQWN0dWF0b3JTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [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.GetResourcePackageRequest.
@@ -44,26 +45,33 @@ export const SetupSampleRequestSchema = /*@__PURE__*/
export const GetActuatorInfoRequestSchema = /*@__PURE__*/
messageDesc(file_v1_actuator_service, 3);
+/**
+ * Describes the message bytebase.v1.GetWorkspaceActuatorInfoRequest.
+ * Use `create(GetWorkspaceActuatorInfoRequestSchema)` to create a new message.
+ */
+export const GetWorkspaceActuatorInfoRequestSchema = /*@__PURE__*/
+ messageDesc(file_v1_actuator_service, 4);
+
/**
* Describes the message bytebase.v1.DeleteCacheRequest.
* Use `create(DeleteCacheRequestSchema)` to create a new message.
*/
export const DeleteCacheRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 4);
+ messageDesc(file_v1_actuator_service, 5);
/**
* Describes the message bytebase.v1.Restriction.
* Use `create(RestrictionSchema)` to create a new message.
*/
export const RestrictionSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 5);
+ messageDesc(file_v1_actuator_service, 6);
/**
* Describes the message bytebase.v1.ActuatorInfo.
* Use `create(ActuatorInfoSchema)` to create a new message.
*/
export const ActuatorInfoSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 6);
+ messageDesc(file_v1_actuator_service, 7);
/**
* ActuatorService manages system health and operational information.
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.ts
index 4efa130362..34000e7aff 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
@@ -253,6 +253,38 @@ export declare type ExchangeTokenResponse = Message<"bytebase.v1.ExchangeTokenRe
*/
export declare const ExchangeTokenResponseSchema: GenMessage<ExchangeTokenResponse>;
+/**
+ * @generated from message bytebase.v1.SignupRequest
+ */
+export declare type SignupRequest = Message<"bytebase.v1.SignupRequest"> & {
+ /**
+ * The email for the new account.
+ *
+ * @generated from field: string email = 1;
+ */
+ email: string;
+
+ /**
+ * The password for the new account.
+ *
+ * @generated from field: string password = 2;
+ */
+ password: string;
+
+ /**
+ * The display name of the user.
+ *
+ * @generated from field: string title = 3;
+ */
+ title: string;
+};
+
+/**
+ * Describes the message bytebase.v1.SignupRequest.
+ * Use `create(SignupRequestSchema)` to create a new message.
+ */
+export declare const SignupRequestSchema: GenMessage<SignupRequest>;
+
/**
* Request to refresh the access token.
*
@@ -321,6 +353,19 @@ export declare const AuthService: GenService<{
input: typeof ExchangeTokenRequestSchema;
output: typeof ExchangeTokenResponseSchema;
},
+ /**
+ * Registers a new user account. Creates a principal and assigns a workspace:
+ * - If the user's email was pre-invited to a workspace, joins that workspace.
+ * - Otherwise, creates a new workspace with the user as admin.
+ * Returns access tokens so the user is logged in immediately after signup.
+ *
+ * @generated from rpc bytebase.v1.AuthService.Signup
+ */
+ signup: {
+ methodKind: "unary";
+ input: typeof SignupRequestSchema;
+ output: typeof LoginResponseSchema;
+ },
/**
* Refreshes the access token using the refresh token cookie.
* Permissions required: None (validates via refresh token cookie)
diff --git a/frontend/src/types/proto-es/v1/auth_service_pb.js b/frontend/src/types/proto-es/v1/auth_service_pb.js
index 5cc3a79b99..1827b93b77 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("ChV2MS9hdXRoX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIosCCgxMb2dpblJlcXVlc3QSDQoFZW1haWwYASABKAkSEAoIcGFzc3dvcmQYAiABKAkSCwoDd2ViGAMgASgIEhAKCGlkcF9uYW1lGAQgASgJEjkKC2lkcF9jb250ZXh0GAUgASgLMiQuYnl0ZWJhc2UudjEuSWRlbnRpdHlQcm92aWRlckNvbnRleHQSFQoIb3RwX2NvZGUYBiABKAlIAIgBARIaCg1yZWNvdmVyeV9jb2RlGAcgASgJSAGIAQESGwoObWZhX3RlbXBfdG9rZW4YCCABKAlIAogBAUILCglfb3RwX2NvZGVCEAoOX3JlY292ZXJ5X2NvZGVCEQoPX21mYV90ZW1wX3Rva2VuIqwBChdJZGVudGl0eVByb3ZpZGVyQ29udGV4dBJECg5vYXV0aDJfY29udGV4dBgBIAEoCzIqLmJ5dGViYXNlLnYxLk9BdXRoMklkZW50aXR5UHJvdmlkZXJDb250ZXh0SAASQAoMb2lkY19jb250ZXh0GAIgASgLMiguYnl0ZWJhc2UudjEuT0lEQ0lkZW50aXR5UHJvdmlkZXJDb250ZXh0SABCCQoHY29udGV4dCItCh1PQXV0aDJJZGVudGl0eVByb3ZpZGVyQ29udGV4dBIMCgRjb2RlGAEgASgJIisKG09JRENJZGVudGl0eVByb3ZpZGVyQ29udGV4dBIMCgRjb2RlGAEgASgJIo8BCg1Mb2dpblJlc3BvbnNlEg0KBXRva2VuGAEgASgJEhsKDm1mYV90ZW1wX3Rva2VuGAIgASgJSACIAQESHgoWcmVxdWlyZV9yZXNldF9wYXNzd29yZBgDIAEoCBIfCgR1c2VyGAQgASgLMhEuYnl0ZWJhc2UudjEuVXNlckIRCg9fbWZhX3RlbXBfdG9rZW4iDwoNTG9nb3V0UmVxdWVzdCI0ChRFeGNoYW5nZVRva2VuUmVxdWVzdBINCgV0b2tlbhgBIAEoCRINCgVlbWFpbBgCIAEoCSItChVFeGNoYW5nZVRva2VuUmVzcG9uc2USFAoMYWNjZXNzX3Rva2VuGAEgASgJIhAKDlJlZnJlc2hSZXF1ZXN0IhEKD1JlZnJlc2hSZXNwb25zZTK9AwoLQXV0aFNlcnZpY2USYQoFTG9naW4SGS5ieXRlYmFzZS52MS5Mb2dpblJlcXVlc3QaGi5ieXRlYmFzZS52MS5Mb2dpblJlc3BvbnNlIiGA6jABmOowAYLT5JMCEzoBKiIOL3YxL2F1dGgvbG9naW4SYAoGTG9nb3V0EhouYnl0ZWJhc2UudjEuTG9nb3V0UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIigOowAZjqMAGC0+STAhQ6ASoiDy92MS9hdXRoL2xvZ291dBKBAQoNRXhjaGFuZ2VUb2tlbhIhLmJ5dGViYXNlLnYxLkV4Y2hhbmdlVG9rZW5SZXF1ZXN0GiIuYnl0ZWJhc2UudjEuRXhjaGFuZ2VUb2tlblJlc3BvbnNlIimA6jABmOowAYLT5JMCGzoBKiIWL3YxL2F1dGg6ZXhjaGFuZ2VUb2tlbhJlCgdSZWZyZXNoEhsuYnl0ZWJhc2UudjEuUmVmcmVzaFJlcXVlc3QaHC5ieXRlYmFzZS52MS5SZWZyZXNoUmVzcG9uc2UiH4DqMAGC0+STAhU6ASoiEC92MS9hdXRoL3JlZnJlc2hCpgEKD2NvbS5ieXRlYmFzZS52MUIQQXV0aFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_protobuf_empty, file_v1_annotation, file_v1_user_service]);
+ fileDesc("ChV2MS9hdXRoX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIosCCgxMb2dpblJlcXVlc3QSDQoFZW1haWwYASABKAkSEAoIcGFzc3dvcmQYAiABKAkSCwoDd2ViGAMgASgIEhAKCGlkcF9uYW1lGAQgASgJEjkKC2lkcF9jb250ZXh0GAUgASgLMiQuYnl0ZWJhc2UudjEuSWRlbnRpdHlQcm92aWRlckNvbnRleHQSFQoIb3RwX2NvZGUYBiABKAlIAIgBARIaCg1yZWNvdmVyeV9jb2RlGAcgASgJSAGIAQESGwoObWZhX3RlbXBfdG9rZW4YCCABKAlIAogBAUILCglfb3RwX2NvZGVCEAoOX3JlY292ZXJ5X2NvZGVCEQoPX21mYV90ZW1wX3Rva2VuIqwBChdJZGVudGl0eVByb3ZpZGVyQ29udGV4dBJECg5vYXV0aDJfY29udGV4dBgBIAEoCzIqLmJ5dGViYXNlLnYxLk9BdXRoMklkZW50aXR5UHJvdmlkZXJDb250ZXh0SAASQAoMb2lkY19jb250ZXh0GAIgASgLMiguYnl0ZWJhc2UudjEuT0lEQ0lkZW50aXR5UHJvdmlkZXJDb250ZXh0SABCCQoHY29udGV4dCItCh1PQXV0aDJJZGVudGl0eVByb3ZpZGVyQ29udGV4dBIMCgRjb2RlGAEgASgJIisKG09JRENJZGVudGl0eVByb3ZpZGVyQ29udGV4dBIMCgRjb2RlGAEgASgJIo8BCg1Mb2dpblJlc3BvbnNlEg0KBXRva2VuGAEgASgJEhsKDm1mYV90ZW1wX3Rva2VuGAIgASgJSACIAQESHgoWcmVxdWlyZV9yZXNldF9wYXNzd29yZBgDIAEoCBIfCgR1c2VyGAQgASgLMhEuYnl0ZWJhc2UudjEuVXNlckIRCg9fbWZhX3RlbXBfdG9rZW4iDwoNTG9nb3V0UmVxdWVzdCI0ChRFeGNoYW5nZVRva2VuUmVxdWVzdBINCgV0b2tlbhgBIAEoCRINCgVlbWFpbBgCIAEoCSItChVFeGNoYW5nZVRva2VuUmVzcG9uc2USFAoMYWNjZXNzX3Rva2VuGAEgASgJIj8KDVNpZ251cFJlcXVlc3QSDQoFZW1haWwYASABKAkSEAoIcGFzc3dvcmQYAiABKAkSDQoFdGl0bGUYAyABKAkiEAoOUmVmcmVzaFJlcXVlc3QiEQoPUmVmcmVzaFJlc3BvbnNlMqMECgtBdXRoU2VydmljZRJhCgVMb2dpbhIZLmJ5dGViYXNlLnYxLkxvZ2luUmVxdWVzdBoaLmJ5dGViYXNlLnYxLkxvZ2luUmVzcG9uc2UiIYDqMAGY6jABgtPkkwITOgEqIg4vdjEvYXV0aC9sb2dpbhJgCgZMb2dvdXQSGi5ieXRlYmFzZS52MS5Mb2dvdXRSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IiKA6jABmOowAYLT5JMCFDoBKiIPL3YxL2F1dGgvbG9nb3V0EoEBCg1FeGNoYW5nZVRva2VuEiEuYnl0ZWJhc2UudjEuRXhjaGFuZ2VUb2tlblJlcXVlc3QaIi5ieXRlYmFzZS52MS5FeGNoYW5nZVRva2VuUmVzcG9uc2UiKYDqMAGY6jABgtPkkwIbOgEqIhYvdjEvYXV0aDpleGNoYW5nZVRva2VuEmQKBlNpZ251cBIaLmJ5dGViYXNlLnYxLlNpZ251cFJlcXVlc3QaGi5ieXRlYmFzZS52MS5Mb2dpblJlc3BvbnNlIiKA6jABmOowAYLT5JMCFDoBKiIPL3YxL2F1dGgvc2lnbnVwEmUKB1JlZnJlc2gSGy5ieXRlYmFzZS52MS5SZWZyZXNoUmVxdWVzdBocLmJ5dGViYXNlLnYxLlJlZnJlc2hSZXNwb25zZSIfgOowAYLT5JMCFToBKiIQL3YxL2F1dGgvcmVmcmVzaEKmAQoPY29tLmJ5dGViYXNlLnYxQhBBdXRoU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_protobuf_empty, file_v1_annotation, file_v1_user_service]);
/**
* Describes the message bytebase.v1.LoginRequest.
@@ -70,19 +70,26 @@ export const ExchangeTokenRequestSchema = /*@__PURE__*/
export const ExchangeTokenResponseSchema = /*@__PURE__*/
messageDesc(file_v1_auth_service, 7);
+/**
+ * Describes the message bytebase.v1.SignupRequest.
+ * Use `create(SignupRequestSchema)` to create a new message.
+ */
+export const SignupRequestSchema = /*@__PURE__*/
+ messageDesc(file_v1_auth_service, 8);
+
/**
* Describes the message bytebase.v1.RefreshRequest.
* Use `create(RefreshRequestSchema)` to create a new message.
*/
export const RefreshRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_auth_service, 8);
+ messageDesc(file_v1_auth_service, 9);
/**
* Describes the message bytebase.v1.RefreshResponse.
* Use `create(RefreshResponseSchema)` to create a new message.
*/
export const RefreshResponseSchema = /*@__PURE__*/
- messageDesc(file_v1_auth_service, 9);
+ messageDesc(file_v1_auth_service, 10);
/**
* AuthService handles user authentication operations.
diff --git a/frontend/src/types/proto-es/v1/user_service_pb.d.ts b/frontend/src/types/proto-es/v1/user_service_pb.d.ts
index d608e85b5d..98c0c18354 100644
--- a/frontend/src/types/proto-es/v1/user_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/user_service_pb.d.ts
@@ -340,7 +340,7 @@ export declare type User = Message<"bytebase.v1.User"> & {
password: string;
/**
- * The service key for service account authentication. Only used for service accounts.
+ * The service key for service account authentication.
*
* @generated from field: string service_key = 7;
*/
@@ -396,6 +396,14 @@ export declare type User = Message<"bytebase.v1.User"> & {
* @generated from field: repeated string groups = 14;
*/
groups: string[];
+
+ /**
+ * The current workspace.
+ * Format: workspaces/{id}
+ *
+ * @generated from field: string workspace = 16;
+ */
+ workspace: string;
};
/**
@@ -490,8 +498,9 @@ export declare const UserService: GenService<{
output: typeof ListUsersResponseSchema;
},
/**
- * Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
- * Permissions required: bb.users.create (only when Disallow Signup is enabled)
+ * Creates a user in the caller's workspace (admin action, self-hosted only).
+ * In SaaS mode, admins should add users via workspace IAM policy instead.
+ * Permissions required: bb.users.create
*
* @generated from rpc bytebase.v1.UserService.CreateUser
*/
diff --git a/frontend/src/types/proto-es/v1/user_service_pb.js b/frontend/src/types/proto-es/v1/user_service_pb.js
index b94f7d1cf0..b1659de79f 100644
--- a/frontend/src/types/proto-es/v1/user_service_pb.js
+++ b/frontend/src/types/proto-es/v1/user_service_pb.js
@@ -16,7 +16,7 @@ import { file_v1_common } from "./common_pb";
* Describes the file v1/user_service.proto.
*/
export const file_v1_user_service = /*@__PURE__*/
- fileDesc("ChV2MS91c2VyX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIjkKDkdldFVzZXJSZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1VzZXIiQAoUQmF0Y2hHZXRVc2Vyc1JlcXVlc3QSKAoFbmFtZXMYASADKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1VzZXIiOQoVQmF0Y2hHZXRVc2Vyc1Jlc3BvbnNlEiAKBXVzZXJzGAEgAygLMhEuYnl0ZWJhc2UudjEuVXNlciJfChBMaXN0VXNlcnNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEhQKDHNob3dfZGVsZXRlZBgDIAEoCBIOCgZmaWx0ZXIYBCABKAkiTgoRTGlzdFVzZXJzUmVzcG9uc2USIAoFdXNlcnMYASADKAsyES5ieXRlYmFzZS52MS5Vc2VyEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSI5ChFDcmVhdGVVc2VyUmVxdWVzdBIkCgR1c2VyGAEgASgLMhEuYnl0ZWJhc2UudjEuVXNlckID4EECIuwBChFVcGRhdGVVc2VyUmVxdWVzdBIkCgR1c2VyGAEgASgLMhEuYnl0ZWJhc2UudjEuVXNlckID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCghvdHBfY29kZRgDIAEoCUgAiAEBEiIKGnJlZ2VuZXJhdGVfdGVtcF9tZmFfc2VjcmV0GAQgASgIEiEKGXJlZ2VuZXJhdGVfcmVjb3ZlcnlfY29kZXMYBSABKAgSFQoNYWxsb3dfbWlzc2luZxgGIAEoCEILCglfb3RwX2NvZGUiPAoRRGVsZXRlVXNlclJlcXVlc3QSJwoEbmFtZRgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vVXNlciI+ChNVbmRlbGV0ZVVzZXJSZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1VzZXIiUQoSVXBkYXRlRW1haWxSZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1VzZXISEgoFZW1haWwYAiABKAlCA+BBAiK1BAoEVXNlchIRCgRuYW1lGAEgASgJQgPgQQMSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRINCgVlbWFpbBgDIAEoCRIXCgV0aXRsZRgEIAEoCUIIukgFcgMYyAESFQoIcGFzc3dvcmQYBiABKAlCA+BBBBIYCgtzZXJ2aWNlX2tleRgHIAEoCUID4EEEEhMKC21mYV9lbmFibGVkGAggASgIEhcKD3RlbXBfb3RwX3NlY3JldBgJIAEoCRIbChN0ZW1wX3JlY292ZXJ5X2NvZGVzGAogAygJEkAKHHRlbXBfb3RwX3NlY3JldF9jcmVhdGVkX3RpbWUYCyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBXBob25lGAwgASgJEioKB3Byb2ZpbGUYDSABKAsyGS5ieXRlYmFzZS52MS5Vc2VyLlByb2ZpbGUSEwoGZ3JvdXBzGA4gAygJQgPgQQMajQEKB1Byb2ZpbGUSMwoPbGFzdF9sb2dpbl90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBI9ChlsYXN0X2NoYW5nZV9wYXNzd29yZF90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIOCgZzb3VyY2UYAyABKAk6JepBIgoRYnl0ZWJhc2UuY29tL1VzZXISDXVzZXJzL3tlbWFpbH1KBAgFEAZKBAgPEBAy0wgKC1VzZXJTZXJ2aWNlEnAKB0dldFVzZXISGy5ieXRlYmFzZS52MS5HZXRVc2VyUmVxdWVzdBoRLmJ5dGViYXNlLnYxLlVzZXIiNdpBBG5hbWWK6jAMYmIudXNlcnMuZ2V0kOowAYLT5JMCFBISL3YxL3tuYW1lPXVzZXJzLyp9EoYBCg1CYXRjaEdldFVzZXJzEiEuYnl0ZWJhc2UudjEuQmF0Y2hHZXRVc2Vyc1JlcXVlc3QaIi5ieXRlYmFzZS52MS5CYXRjaEdldFVzZXJzUmVzcG9uc2UiLorqMAxiYi51c2Vycy5nZXSQ6jABgtPkkwIUEhIvdjEvdXNlcnM6YmF0Y2hHZXQSWQoOR2V0Q3VycmVudFVzZXISFi5nb29nbGUucHJvdG9idWYuRW1wdHkaES5ieXRlYmFzZS52MS5Vc2VyIhyA6jABkOowAoLT5JMCDhIML3YxL3VzZXJzL21lEnsKCUxpc3RVc2VycxIdLmJ5dGViYXNlLnYxLkxpc3RVc2Vyc1JlcXVlc3QaHi5ieXRlYmFzZS52MS5MaXN0VXNlcnNSZXNwb25zZSIv2kEGcGFyZW50iuowDWJiLnVzZXJzLmxpc3SQ6jABgtPkkwILEgkvdjEvdXNlcnMSawoKQ3JlYXRlVXNlchIeLmJ5dGViYXNlLnYxLkNyZWF0ZVVzZXJSZXF1ZXN0GhEuYnl0ZWJhc2UudjEuVXNlciIq2kEEdXNlcoDqMAGQ6jACmOowAYLT5JMCEToEdXNlciIJL3YxL3VzZXJzEoEBCgpVcGRhdGVVc2VyEh4uYnl0ZWJhc2UudjEuVXBkYXRlVXNlclJlcXVlc3QaES5ieXRlYmFzZS52MS5Vc2VyIkDaQRB1c2VyLHVwZGF0ZV9tYXNrkOowApjqMAGC0+STAh86BHVzZXIyFy92MS97dXNlci5uYW1lPXVzZXJzLyp9Em8KCkRlbGV0ZVVzZXISHi5ieXRlYmFzZS52MS5EZWxldGVVc2VyUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIp2kEEbmFtZZDqMAKY6jABgtPkkwIUKhIvdjEve25hbWU9dXNlcnMvKn0ScwoMVW5kZWxldGVVc2VyEiAuYnl0ZWJhc2UudjEuVW5kZWxldGVVc2VyUmVxdWVzdBoRLmJ5dGViYXNlLnYxLlVzZXIiLpDqMAKY6jABgtPkkwIgOgEqIhsvdjEve25hbWU9dXNlcnMvKn06dW5kZWxldGUSmQEKC1VwZGF0ZUVtYWlsEh8uYnl0ZWJhc2UudjEuVXBkYXRlRW1haWxSZXF1ZXN0GhEuYnl0ZWJhc2UudjEuVXNlciJW2kEKbmFtZSxlbWFpbIrqMBRiYi51c2Vycy51cGRhdGVFbWFpbJDqMAGY6jABgtPkkwIjOgEqIh4vdjEve25hbWU9dXNlcnMvKn06dXBkYXRlRW1haWxCpgEKD2NvbS5ieXRlYmFzZS52MUIQVXNlclNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);
+ fileDesc("ChV2MS91c2VyX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIjkKDkdldFVzZXJSZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1VzZXIiQAoUQmF0Y2hHZXRVc2Vyc1JlcXVlc3QSKAoFbmFtZXMYASADKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1VzZXIiOQoVQmF0Y2hHZXRVc2Vyc1Jlc3BvbnNlEiAKBXVzZXJzGAEgAygLMhEuYnl0ZWJhc2UudjEuVXNlciJfChBMaXN0VXNlcnNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEhQKDHNob3dfZGVsZXRlZBgDIAEoCBIOCgZmaWx0ZXIYBCABKAkiTgoRTGlzdFVzZXJzUmVzcG9uc2USIAoFdXNlcnMYASADKAsyES5ieXRlYmFzZS52MS5Vc2VyEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSI5ChFDcmVhdGVVc2VyUmVxdWVzdBIkCgR1c2VyGAEgASgLMhEuYnl0ZWJhc2UudjEuVXNlckID4EECIuwBChFVcGRhdGVVc2VyUmVxdWVzdBIkCgR1c2VyGAEgASgLMhEuYnl0ZWJhc2UudjEuVXNlckID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCghvdHBfY29kZRgDIAEoCUgAiAEBEiIKGnJlZ2VuZXJhdGVfdGVtcF9tZmFfc2VjcmV0GAQgASgIEiEKGXJlZ2VuZXJhdGVfcmVjb3ZlcnlfY29kZXMYBSABKAgSFQoNYWxsb3dfbWlzc2luZxgGIAEoCEILCglfb3RwX2NvZGUiPAoRRGVsZXRlVXNlclJlcXVlc3QSJwoEbmFtZRgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vVXNlciI+ChNVbmRlbGV0ZVVzZXJSZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1VzZXIiUQoSVXBkYXRlRW1haWxSZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1VzZXISEgoFZW1haWwYAiABKAlCA+BBAiLIBAoEVXNlchIRCgRuYW1lGAEgASgJQgPgQQMSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRINCgVlbWFpbBgDIAEoCRIXCgV0aXRsZRgEIAEoCUIIukgFcgMYyAESFQoIcGFzc3dvcmQYBiABKAlCA+BBBBITCgtzZXJ2aWNlX2tleRgHIAEoCRITCgttZmFfZW5hYmxlZBgIIAEoCBIXCg90ZW1wX290cF9zZWNyZXQYCSABKAkSGwoTdGVtcF9yZWNvdmVyeV9jb2RlcxgKIAMoCRJAChx0ZW1wX290cF9zZWNyZXRfY3JlYXRlZF90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBINCgVwaG9uZRgMIAEoCRIqCgdwcm9maWxlGA0gASgLMhkuYnl0ZWJhc2UudjEuVXNlci5Qcm9maWxlEhMKBmdyb3VwcxgOIAMoCUID4EEDEhYKCXdvcmtzcGFjZRgQIAEoCUID4EEDGo0BCgdQcm9maWxlEjMKD2xhc3RfbG9naW5fdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASPQoZbGFzdF9jaGFuZ2VfcGFzc3dvcmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDgoGc291cmNlGAMgASgJOiXqQSIKEWJ5dGViYXNlLmNvbS9Vc2VyEg11c2Vycy97ZW1haWx9SgQIBRAGSgQIDxAQMuIICgtVc2VyU2VydmljZRJwCgdHZXRVc2VyEhsuYnl0ZWJhc2UudjEuR2V0VXNlclJlcXVlc3QaES5ieXRlYmFzZS52MS5Vc2VyIjXaQQRuYW1liuowDGJiLnVzZXJzLmdldJDqMAGC0+STAhQSEi92MS97bmFtZT11c2Vycy8qfRKGAQoNQmF0Y2hHZXRVc2VycxIhLmJ5dGViYXNlLnYxLkJhdGNoR2V0VXNlcnNSZXF1ZXN0GiIuYnl0ZWJhc2UudjEuQmF0Y2hHZXRVc2Vyc1Jlc3BvbnNlIi6K6jAMYmIudXNlcnMuZ2V0kOowAYLT5JMCFBISL3YxL3VzZXJzOmJhdGNoR2V0ElkKDkdldEN1cnJlbnRVc2VyEhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5GhEuYnl0ZWJhc2UudjEuVXNlciIcgOowAZDqMAKC0+STAg4SDC92MS91c2Vycy9tZRJ7CglMaXN0VXNlcnMSHS5ieXRlYmFzZS52MS5MaXN0VXNlcnNSZXF1ZXN0Gh4uYnl0ZWJhc2UudjEuTGlzdFVzZXJzUmVzcG9uc2UiL9pBBnBhcmVudIrqMA1iYi51c2Vycy5saXN0kOowAYLT5JMCCxIJL3YxL3VzZXJzEnoKCkNyZWF0ZVVzZXISHi5ieXRlYmFzZS52MS5DcmVhdGVVc2VyUmVxdWVzdBoRLmJ5dGViYXNlLnYxLlVzZXIiOdpBBHVzZXKK6jAPYmIudXNlcnMuY3JlYXRlkOowAZjqMAGC0+STAhE6BHVzZXIiCS92MS91c2VycxKBAQoKVXBkYXRlVXNlchIeLmJ5dGViYXNlLnYxLlVwZGF0ZVVzZXJSZXF1ZXN0GhEuYnl0ZWJhc2UudjEuVXNlciJA2kEQdXNlcix1cGRhdGVfbWFza5DqMAKY6jABgtPkkwIfOgR1c2VyMhcvdjEve3VzZXIubmFtZT11c2Vycy8qfRJvCgpEZWxldGVVc2VyEh4uYnl0ZWJhc2UudjEuRGVsZXRlVXNlclJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiKdpBBG5hbWWQ6jACmOowAYLT5JMCFCoSL3YxL3tuYW1lPXVzZXJzLyp9EnMKDFVuZGVsZXRlVXNlchIgLmJ5dGViYXNlLnYxLlVuZGVsZXRlVXNlclJlcXVlc3QaES5ieXRlYmFzZS52MS5Vc2VyIi6Q6jACmOowAYLT5JMCIDoBKiIbL3YxL3tuYW1lPXVzZXJzLyp9OnVuZGVsZXRlEpkBCgtVcGRhdGVFbWFpbBIfLmJ5dGViYXNlLnYxLlVwZGF0ZUVtYWlsUmVxdWVzdBoRLmJ5dGViYXNlLnYxLlVzZXIiVtpBCm5hbWUsZW1haWyK6jAUYmIudXNlcnMudXBkYXRlRW1haWyQ6jABmOowAYLT5JMCIzoBKiIeL3YxL3tuYW1lPXVzZXJzLyp9OnVwZGF0ZUVtYWlsQqYBCg9jb20uYnl0ZWJhc2UudjFCEFVzZXJTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);
/**
* Describes the message bytebase.v1.GetUserRequest.
diff --git a/frontend/src/types/v1/project.ts b/frontend/src/types/v1/project.ts
index 59fc9aba77..ea2ac3b35f 100644
--- a/frontend/src/types/v1/project.ts
+++ b/frontend/src/types/v1/project.ts
@@ -1,12 +1,18 @@
import { create as createProto } from "@bufbuild/protobuf";
+import { useActuatorV1Store } from "@/store/modules/v1/actuator";
import { UNKNOWN_ID } from "../const";
import { State } from "../proto-es/v1/common_pb";
import type { Project } from "../proto-es/v1/project_service_pb";
import { ProjectSchema } from "../proto-es/v1/project_service_pb";
-export const DEFAULT_PROJECT_UID = 1;
export const UNKNOWN_PROJECT_NAME = `projects/${UNKNOWN_ID}`;
-export const DEFAULT_PROJECT_NAME = "projects/default";
+
+// Check if a project name is the default project.
+// Reads the default project name from the actuator store.
+export const isDefaultProject = (name: string): boolean => {
+ const defaultProject = useActuatorV1Store().serverInfo?.defaultProject;
+ return !!defaultProject && name === defaultProject;
+};
export const unknownProject = (): Project => {
return createProto(ProjectSchema, {
@@ -20,10 +26,10 @@ export const unknownProject = (): Project => {
});
};
-export const defaultProject = (): Project => {
+export const defaultProject = (name: string): Project => {
return {
...unknownProject(),
- name: DEFAULT_PROJECT_NAME,
+ name,
title: "Default project",
};
};
diff --git a/frontend/src/utils/v1/project.ts b/frontend/src/utils/v1/project.ts
index 3bd47cfa0f..c7854865bb 100644
--- a/frontend/src/utils/v1/project.ts
+++ b/frontend/src/utils/v1/project.ts
@@ -1,4 +1,4 @@
-import { DEFAULT_PROJECT_NAME } from "@/types";
+import { isDefaultProject } from "@/types";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
export const extractProjectResourceName = (name: string) => {
@@ -8,7 +8,7 @@ export const extractProjectResourceName = (name: string) => {
};
export function projectV1Name(project: Project) {
- if (project.name === DEFAULT_PROJECT_NAME) {
+ if (isDefaultProject(project.name)) {
return "Unassigned";
}
diff --git a/frontend/src/views/DatabaseDashboard.vue b/frontend/src/views/DatabaseDashboard.vue
index b21469ccbb..b0fae2c634 100644
--- a/frontend/src/views/DatabaseDashboard.vue
+++ b/frontend/src/views/DatabaseDashboard.vue
@@ -81,7 +81,7 @@ import {
instanceNamePrefix,
projectNamePrefix,
} from "@/store/modules/v1/common";
-import { DEFAULT_PROJECT_NAME, isValidDatabaseName } from "@/types";
+import { isValidDatabaseName } from "@/types";
import { Engine } from "@/types/proto-es/v1/common_pb";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import type { SearchParams } from "@/utils";
@@ -115,7 +115,9 @@ const defaultSearchParams = () => {
// Default to show unassigned database from default project.
{
id: "project",
- value: extractProjectResourceName(DEFAULT_PROJECT_NAME),
+ value: extractProjectResourceName(
+ actuatorStore.serverInfo?.defaultProject ?? ""
+ ),
},
],
};
diff --git a/frontend/src/views/SettingWorkspaceSubscription.vue b/frontend/src/views/SettingWorkspaceSubscription.vue
index de844f6ee8..1c9019df95 100644
--- a/frontend/src/views/SettingWorkspaceSubscription.vue
+++ b/frontend/src/views/SettingWorkspaceSubscription.vue
@@ -158,6 +158,7 @@ import RequireEnterpriseButton from "@/components/RequireEnterpriseButton.vue";
import { CopyButton } from "@/components/v2";
import WorkspaceInstanceLicenseStats from "@/components/WorkspaceInstanceLicenseStats.vue";
import {
+ getWorkspaceId,
pushNotification,
useActuatorV1Store,
useSubscriptionV1Store,
@@ -199,7 +200,7 @@ const userLimit = computed((): string => {
const workspaceIdField = ref<HTMLInputElement | null>(null);
const workspaceId = computed(() => {
- return actuatorStore.serverInfo?.workspaceId ?? "";
+ return getWorkspaceId(actuatorStore.workspaceResourceName);
});
const selectWorkspaceId = () => {
diff --git a/frontend/src/views/auth/Signin.vue b/frontend/src/views/auth/Signin.vue
index 6b545fb2f8..871cf3eb28 100644
--- a/frontend/src/views/auth/Signin.vue
+++ b/frontend/src/views/auth/Signin.vue
@@ -236,7 +236,7 @@ const state = reactive<LocalState>({
});
const initialized = ref(false);
const { isDemo } = storeToRefs(actuatorStore);
-const { serverInfo } = storeToRefs(actuatorStore);
+const { serverInfo, isSaaSMode } = storeToRefs(actuatorStore);
const disallowSignup = computed(
() => !props.allowSignup || serverInfo.value?.restriction?.disallowSignup
@@ -274,7 +274,11 @@ watchEffect(() => {
// Navigate to signup if needs admin setup.
// Unable to achieve it in router.beforeEach because actuator/info is fetched async and returns
// after router has already made the decision on first page load.
- if (actuatorStore.needAdminSetup && !disallowSignup.value) {
+ if (
+ actuatorStore.needAdminSetup &&
+ !disallowSignup.value &&
+ !isSaaSMode.value
+ ) {
router.push({ name: AUTH_SIGNUP_MODULE, replace: true });
}
});
diff --git a/frontend/src/views/project/ProjectMemberDashboard.vue b/frontend/src/views/project/ProjectMemberDashboard.vue
index acf3bc8249..948d118ca7 100644
--- a/frontend/src/views/project/ProjectMemberDashboard.vue
+++ b/frontend/src/views/project/ProjectMemberDashboard.vue
@@ -7,7 +7,7 @@ import { computed } from "vue";
import ProjectMemberPanel from "@/components/ProjectMember/ProjectMemberPanel.vue";
import { useProjectByName } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
-import { DEFAULT_PROJECT_NAME } from "@/types";
+import { isDefaultProject } from "@/types";
import { State } from "@/types/proto-es/v1/common_pb";
import { hasProjectPermissionV2 } from "@/utils";
@@ -20,7 +20,7 @@ const { project } = useProjectByName(
);
const allowEdit = computed(() => {
- if (project.value.name === DEFAULT_PROJECT_NAME) {
+ if (isDefaultProject(project.value.name)) {
return false;
}
diff --git a/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue b/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue
index f83733320f..ca9d4edc48 100644
--- a/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue
+++ b/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue
@@ -68,7 +68,11 @@ import { storeToRefs } from "pinia";
import { computed, ref } from "vue";
import { ProjectSelect } from "@/components/v2";
import { PROJECT_V1_ROUTE_DASHBOARD } from "@/router/dashboard/workspaceRoutes";
-import { useSQLEditorStore, useSQLEditorTabStore } from "@/store";
+import {
+ useActuatorV1Store,
+ useSQLEditorStore,
+ useSQLEditorTabStore,
+} from "@/store";
import { defaultProject, isValidProjectName } from "@/types";
import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";
import { useSQLEditorContext } from "../context";
@@ -80,6 +84,7 @@ import SchemaPane from "./SchemaPane";
import WorksheetPane from "./WorksheetPane";
const editorStore = useSQLEditorStore();
+const actuatorStore = useActuatorV1Store();
const { asidePanelTab, maybeSwitchProject } = useSQLEditorContext();
const { isDisconnected } = storeToRefs(useSQLEditorTabStore());
@@ -88,7 +93,8 @@ const containerRef = ref<HTMLDivElement>();
const { width: containerWidth } = useElementSize(containerRef);
const allowAccessDefaultProject = computed(() => {
- return hasProjectPermissionV2(defaultProject(), "bb.projects.get");
+ const name = actuatorStore.serverInfo?.defaultProject ?? "";
+ return hasProjectPermissionV2(defaultProject(name), "bb.projects.get");
});
const allowCreateProject = computed(() => {
return hasWorkspacePermissionV2("bb.projects.create");
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index c51e58dab2..e1cf4ea6f3 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -42,6 +42,18 @@ paths:
Gets custom branding resources such as logos.
Permissions required: None
operationId: ActuatorService_GetResourcePackage
+ parameters:
+ - name: name
+ in: query
+ description: |-
+ Optional workspace name, format: workspaces/{workspace}.
+ Set when using the workspace-scoped URL pattern.
+ schema:
+ type: string
+ title: name
+ description: |-
+ Optional workspace name, format: workspaces/{workspace}.
+ Set when using the workspace-scoped URL pattern.
responses:
"200":
description: Success
@@ -197,6 +209,30 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.RefreshResponse'
+ /v1/auth/signup:
+ post:
+ tags:
+ - AuthService
+ summary: Signup
+ description: |-
+ Registers a new user account. Creates a principal and assigns a workspace:
+ - If the user's email was pre-invited to a workspace, joins that workspace.
+ - Otherwise, creates a new workspace with the user as admin.
+ Returns access tokens so the user is logged in immediately after signup.
+ operationId: AuthService_Signup
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.SignupRequest'
+ required: true
+ responses:
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.LoginResponse'
/v1/auth:exchangeToken:
post:
tags:
@@ -14223,8 +14259,9 @@ paths:
- UserService
summary: CreateUser
description: |-
- Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
- Permissions required: bb.users.create (only when Disallow Signup is enabled)
+ Creates a user in the caller's workspace (admin action, self-hosted only).
+ In SaaS mode, admins should add users via workspace IAM policy instead.
+ Permissions required: bb.users.create
operationId: UserService_CreateUser
requestBody:
description: The user to create.
@@ -15012,6 +15049,50 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.BatchUpdateWorksheetOrganizerResponse'
+ /v1/workspaces/{workspace}/actuator/info:
+ get:
+ tags:
+ - ActuatorService
+ summary: GetWorkspaceActuatorInfo
+ description: Gets workspace-scoped actuator info. Requires authentication.
+ operationId: ActuatorService_GetWorkspaceActuatorInfo
+ parameters:
+ - name: workspace
+ in: path
+ description: The workspace id.
+ required: true
+ schema:
+ type: string
+ responses:
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.ActuatorInfo'
+ /v1/workspaces/{workspace}/actuator/resources:
+ get:
+ tags:
+ - ActuatorService
+ summary: GetResourcePackage
+ description: |-
+ Gets custom branding resources such as logos.
+ Permissions required: None
+ operationId: ActuatorService_GetResourcePackage2
+ parameters:
+ - name: workspace
+ in: path
+ description: The workspace id.
+ required: true
+ schema:
+ type: string
+ responses:
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.ResourcePackage'
/v1/workspaces/{workspace}/databases:
get:
tags:
@@ -16375,10 +16456,12 @@ components:
description: The last time any API call was made, refreshed on each request.
readOnly: true
$ref: '#/components/schemas/google.protobuf.Timestamp'
- workspaceId:
+ workspace:
type: string
- title: workspace_id
- description: The unique identifier for the workspace.
+ title: workspace
+ description: |-
+ The unique identifier for the workspace.
+ Format: workspaces/{id}
readOnly: true
unlicensedFeatures:
type: array
@@ -16431,6 +16514,13 @@ components:
title: restriction
readOnly: true
$ref: '#/components/schemas/bytebase.v1.Restriction'
+ defaultProject:
+ type: string
+ title: default_project
+ description: |-
+ The default project for unassigned databases.
+ Format: projects/{id}
+ readOnly: true
title: ActuatorInfo
additionalProperties: false
description: |-
@@ -20289,6 +20379,13 @@ components:
additionalProperties: false
bytebase.v1.GetResourcePackageRequest:
type: object
+ properties:
+ name:
+ type: string
+ title: name
+ description: |-
+ Optional workspace name, format: workspaces/{workspace}.
+ Set when using the workspace-scoped URL pattern.
title: GetResourcePackageRequest
additionalProperties: false
description: Request message for getting branding resources.
@@ -20525,6 +20622,18 @@ components:
required:
- name
additionalProperties: false
+ bytebase.v1.GetWorkspaceActuatorInfoRequest:
+ type: object
+ properties:
+ name:
+ type: string
+ title: name
+ description: 'The workspace name, format: workspaces/{workspace}.'
+ title: GetWorkspaceActuatorInfoRequest
+ required:
+ - name
+ additionalProperties: false
+ description: Request message for getting workspace-scoped actuator information.
bytebase.v1.GridLevel:
type: object
properties:
@@ -26089,6 +26198,23 @@ components:
- name
- content
additionalProperties: false
+ bytebase.v1.SignupRequest:
+ type: object
+ properties:
+ email:
+ type: string
+ title: email
+ description: The email for the new account.
+ password:
+ type: string
+ title: password
+ description: The password for the new account.
+ title:
+ type: string
+ title: title
+ description: The display name of the user.
+ title: SignupRequest
+ additionalProperties: false
bytebase.v1.SpatialIndexConfig:
type: object
properties:
@@ -28298,8 +28424,7 @@ components:
serviceKey:
type: string
title: service_key
- description: The service key for service account authentication. Only used for service accounts.
- writeOnly: true
+ description: The service key for service account authentication.
mfaEnabled:
type: boolean
title: mfa_enabled
@@ -28338,6 +28463,13 @@ components:
The groups for the user.
Format: groups/{email}
readOnly: true
+ workspace:
+ type: string
+ title: workspace
+ description: |-
+ The current workspace.
+ Format: workspaces/{id}
+ readOnly: true
title: User
additionalProperties: false
bytebase.v1.User.Profile:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 209b54d996..43ce37a1c0 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -236,6 +236,9 @@
- [store/role.proto](#store_role-proto)
- [RolePermissions](#bytebase-store-RolePermissions)
+- [store/server_config.proto](#store_server_config-proto)
+ - [ServerConfigPayload](#bytebase-store-ServerConfigPayload)
+
- [store/setting.proto](#store_setting-proto)
- [AISetting](#bytebase-store-AISetting)
- [Algorithm](#bytebase-store-Algorithm)
@@ -3969,6 +3972,40 @@ The severity level for SQL review rules.
+<a name="store_server_config-proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## store/server_config.proto
+
+
+
+<a name="bytebase-store-ServerConfigPayload"></a>
+
+### ServerConfigPayload
+ServerConfigPayload stores global server-level infrastructure configuration.
+Only contains settings that are truly cross-workspace and cannot be derived
+from any workspace context (e.g., JWT signing secret).
+All other settings live in per-workspace WORKSPACE_PROFILE.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| auth_secret | [string](#string) | | Authentication secret for token signing (32-character random string). |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<a name="store_setting-proto"></a>
<p align="right"><a href="#top">Top</a></p>
@@ -4404,7 +4441,6 @@ The severity level for SQL review rules.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| auth_secret | [string](#string) | | Authentication secret for token signing (32-character random string). |
| license | [string](#string) | | Enterprise license JWT token. |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 364823c616..70fdaf1e1c 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -1118,6 +1118,21 @@
+ </ul>
+ </li>
+
+
+ <li>
+ <a href="#store%2fserver_config.proto">store/server_config.proto</a>
+ <ul>
+
+ <li>
+ <a href="#bytebase.store.ServerConfigPayload"><span class="badge">M</span>ServerConfigPayload</a>
+ </li>
+
+
+
+
</ul>
</li>
@@ -11158,6 +11173,44 @@ Format: projects/{project}/plans/{plan}/rollout/stages/{stage}/tasks/{task}/task
+ <div class="file-heading">
+ <h2 id="store/server_config.proto">store/server_config.proto</h2><a href="#title">Top</a>
+ </div>
+ <p></p>
+
+
+ <h3 id="bytebase.store.ServerConfigPayload">ServerConfigPayload</h3>
+ <p>ServerConfigPayload stores global server-level infrastructure configuration.</p><p>Only contains settings that are truly cross-workspace and cannot be derived</p><p>from any workspace context (e.g., JWT signing secret).</p><p>All other settings live in per-workspace WORKSPACE_PROFILE.</p>
+
+
+ <table class="field-table">
+ <thead>
+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>auth_secret</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Authentication secret for token signing (32-character random string). </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
+
+
+
+
+
+
+
+
<div class="file-heading">
<h2 id="store/setting.proto">store/setting.proto</h2><a href="#title">Top</a>
</div>
@@ -12099,13 +12152,6 @@ are /[a-z][0-9]-/. </p></td>
</thead>
<tbody>
- <tr>
- <td>auth_secret</td>
- <td><a href="#string">string</a></td>
- <td></td>
- <td><p>Authentication secret for token signing (32-character random string). </p></td>
- </tr>
-
<tr>
<td>license</td>
<td><a href="#string">string</a></td>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 196b279e27..fd8f1c2f1c 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -127,6 +127,7 @@
- [DeleteCacheRequest](#bytebase-v1-DeleteCacheRequest)
- [GetActuatorInfoRequest](#bytebase-v1-GetActuatorInfoRequest)
- [GetResourcePackageRequest](#bytebase-v1-GetResourcePackageRequest)
+ - [GetWorkspaceActuatorInfoRequest](#bytebase-v1-GetWorkspaceActuatorInfoRequest)
- [ResourcePackage](#bytebase-v1-ResourcePackage)
- [Restriction](#bytebase-v1-Restriction)
- [SetupSampleRequest](#bytebase-v1-SetupSampleRequest)
@@ -194,6 +195,7 @@
- [OIDCIdentityProviderContext](#bytebase-v1-OIDCIdentityProviderContext)
- [RefreshRequest](#bytebase-v1-RefreshRequest)
- [RefreshResponse](#bytebase-v1-RefreshResponse)
+ - [SignupRequest](#bytebase-v1-SignupRequest)
- [AuthService](#bytebase-v1-AuthService)
@@ -2549,7 +2551,7 @@ Actuator concept is similar to the Spring Boot Actuator.
| external_url | [string](#string) | | The external URL where users or webhook callbacks access Bytebase. |
| need_admin_setup | [bool](#bool) | | Whether the Bytebase instance requires initial admin setup. |
| last_active_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | The last time any API call was made, refreshed on each request. |
-| workspace_id | [string](#string) | | The unique identifier for the workspace. |
+| workspace | [string](#string) | | The unique identifier for the workspace. Format: workspaces/{id} |
| unlicensed_features | [string](#string) | repeated | List of features that are not licensed. |
| docker | [bool](#bool) | | Whether the Bytebase instance is running in Docker. |
| activated_user_count | [int32](#int32) | | The number of activated users. |
@@ -2559,6 +2561,7 @@ Actuator concept is similar to the Spring Boot Actuator.
| external_url_from_flag | [bool](#bool) | | Whether the external URL is set via command-line flag (and thus cannot be changed via UI). |
| replica_count | [int32](#int32) | | The number of active replicas (servers sharing the same database). |
| restriction | [Restriction](#bytebase-v1-Restriction) | | |
+| default_project | [string](#string) | | The default project for unassigned databases. Format: projects/{id} |
@@ -2591,6 +2594,26 @@ Request message for getting actuator information.
Request message for getting branding resources.
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| name | [string](#string) | | Optional workspace name, format: workspaces/{workspace}. Set when using the workspace-scoped URL pattern. |
+
+
+
+
+
+
+<a name="bytebase-v1-GetWorkspaceActuatorInfoRequest"></a>
+
+### GetWorkspaceActuatorInfoRequest
+Request message for getting workspace-scoped actuator information.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| name | [string](#string) | | The workspace name, format: workspaces/{workspace}. |
+
+
@@ -2654,6 +2677,7 @@ ActuatorService manages system health and operational information.
| SetupSample | [SetupSampleRequest](#bytebase-v1-SetupSampleRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Sets up sample data for demonstration and testing purposes. Permissions required: bb.projects.create |
| DeleteCache | [DeleteCacheRequest](#bytebase-v1-DeleteCacheRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Clears the system cache to force data refresh. Permissions required: None |
| GetResourcePackage | [GetResourcePackageRequest](#bytebase-v1-GetResourcePackageRequest) | [ResourcePackage](#bytebase-v1-ResourcePackage) | Gets custom branding resources such as logos. Permissions required: None |
+| GetWorkspaceActuatorInfo | [GetWorkspaceActuatorInfoRequest](#bytebase-v1-GetWorkspaceActuatorInfoRequest) | [ActuatorInfo](#bytebase-v1-ActuatorInfo) | Gets workspace-scoped actuator info. Requires authentication. |
@@ -3283,7 +3307,7 @@ The user&#39;s `name` field is used to identify the user to update. Format: user
| email | [string](#string) | | The email address of the user, used for login and notifications. |
| title | [string](#string) | | The display title or full name of the user. |
| password | [string](#string) | | The password for authentication. Only used during user creation or password updates. |
-| service_key | [string](#string) | | The service key for service account authentication. Only used for service accounts. |
+| service_key | [string](#string) | | The service key for service account authentication. |
| mfa_enabled | [bool](#bool) | | The mfa_enabled flag means if the user has enabled MFA. |
| temp_otp_secret | [string](#string) | | Temporary OTP secret used during MFA setup and regeneration. |
| temp_recovery_codes | [string](#string) | repeated | Temporary recovery codes used during MFA setup and regeneration. |
@@ -3291,6 +3315,7 @@ The user&#39;s `name` field is used to identify the user to update. Format: user
| phone | [string](#string) | | Should be a valid E.164 compliant phone number. Could be empty. |
| profile | [User.Profile](#bytebase-v1-User-Profile) | | User profile metadata. |
| groups | [string](#string) | repeated | The groups for the user. Format: groups/{email} |
+| workspace | [string](#string) | | The current workspace. Format: workspaces/{id} |
@@ -3331,7 +3356,7 @@ UserService manages user accounts and authentication.
| BatchGetUsers | [BatchGetUsersRequest](#bytebase-v1-BatchGetUsersRequest) | [BatchGetUsersResponse](#bytebase-v1-BatchGetUsersResponse) | Get the users in batch. Any authenticated user can batch get users. Permissions required: bb.users.get |
| GetCurrentUser | [.google.protobuf.Empty](#google-protobuf-Empty) | [User](#bytebase-v1-User) | Get the current authenticated user. Permissions required: None |
| ListUsers | [ListUsersRequest](#bytebase-v1-ListUsersRequest) | [ListUsersResponse](#bytebase-v1-ListUsersResponse) | List all users. Any authenticated user can list users. Permissions required: bb.users.list |
-| CreateUser | [CreateUserRequest](#bytebase-v1-CreateUserRequest) | [User](#bytebase-v1-User) | Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up. Permissions required: bb.users.create (only when Disallow Signup is enabled) |
+| CreateUser | [CreateUserRequest](#bytebase-v1-CreateUserRequest) | [User](#bytebase-v1-User) | Creates a user in the caller&#39;s workspace (admin action, self-hosted only). In SaaS mode, admins should add users via workspace IAM policy instead. Permissions required: bb.users.create |
| UpdateUser | [UpdateUserRequest](#bytebase-v1-UpdateUserRequest) | [User](#bytebase-v1-User) | Updates a user. Users can update their own profile, or users with bb.users.update permission can update any user. Note: Email updates are not supported through this API. Use UpdateEmail instead. Permissions required: bb.users.update (or self) |
| DeleteUser | [DeleteUserRequest](#bytebase-v1-DeleteUserRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Deletes a user. Requires bb.users.delete permission with additional validation: the last remaining workspace admin cannot be deleted. Permissions required: bb.users.delete |
| UndeleteUser | [UndeleteUserRequest](#bytebase-v1-UndeleteUserRequest) | [User](#bytebase-v1-User) | Restores a deleted user. Permissions required: bb.users.undelete |
@@ -3494,6 +3519,23 @@ Response from refreshing the access token.
+
+<a name="bytebase-v1-SignupRequest"></a>
+
+### SignupRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| email | [string](#string) | | The email for the new account. |
+| password | [string](#string) | | The password for the new account. |
+| title | [string](#string) | | The display name of the user. |
+
+
+
+
+
@@ -3511,6 +3553,7 @@ AuthService handles user authentication operations.
| Login | [LoginRequest](#bytebase-v1-LoginRequest) | [LoginResponse](#bytebase-v1-LoginResponse) | Authenticates a user and returns access tokens. Permissions required: None |
| Logout | [LogoutRequest](#bytebase-v1-LogoutRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Logs out the current user session. Permissions required: None |
| ExchangeToken | [ExchangeTokenRequest](#bytebase-v1-ExchangeTokenRequest) | [ExchangeTokenResponse](#bytebase-v1-ExchangeTokenResponse) | Exchanges an external OIDC token for a Bytebase access token. Used by CI/CD pipelines with Workload Identity Federation. Permissions required: None (validates via OIDC token) |
+| Signup | [SignupRequest](#bytebase-v1-SignupRequest) | [LoginResponse](#bytebase-v1-LoginResponse) | Registers a new user account. Creates a principal and assigns a workspace: - If the user&#39;s email was pre-invited to a workspace, joins that workspace. - Otherwise, creates a new workspace with the user as admin. Returns access tokens so the user is logged in immediately after signup. |
| Refresh | [RefreshRequest](#bytebase-v1-RefreshRequest) | [RefreshResponse](#bytebase-v1-RefreshResponse) | Refreshes the access token using the refresh token cookie. Permissions required: None (validates via refresh token cookie) |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index ea0240ae8b..b3fe635fa6 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -653,6 +653,10 @@
<a href="#bytebase.v1.GetResourcePackageRequest"><span class="badge">M</span>GetResourcePackageRequest</a>
</li>
+ <li>
+ <a href="#bytebase.v1.GetWorkspaceActuatorInfoRequest"><span class="badge">M</span>GetWorkspaceActuatorInfoRequest</a>
+ </li>
+
<li>
<a href="#bytebase.v1.ResourcePackage"><span class="badge">M</span>ResourcePackage</a>
</li>
@@ -908,6 +912,10 @@
<a href="#bytebase.v1.RefreshResponse"><span class="badge">M</span>RefreshResponse</a>
</li>
+ <li>
+ <a href="#bytebase.v1.SignupRequest"><span class="badge">M</span>SignupRequest</a>
+ </li>
+
@@ -7850,10 +7858,11 @@ Permissions required: bb.settings.set</p></td>
</tr>
<tr>
- <td>workspace_id</td>
+ <td>workspace</td>
<td><a href="#string">string</a></td>
<td></td>
- <td><p>The unique identifier for the workspace. </p></td>
+ <td><p>The unique identifier for the workspace.
+Format: workspaces/{id} </p></td>
</tr>
<tr>
@@ -7919,6 +7928,14 @@ Permissions required: bb.settings.set</p></td>
<td><p> </p></td>
</tr>
+ <tr>
+ <td>default_project</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The default project for unassigned databases.
+Format: projects/{id} </p></td>
+ </tr>
+
</tbody>
</table>
@@ -7944,6 +7961,48 @@ Permissions required: bb.settings.set</p></td>
<p>Request message for getting branding resources.</p>
+ <table class="field-table">
+ <thead>
+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>name</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Optional workspace name, format: workspaces/{workspace}.
+Set when using the workspace-scoped URL pattern. </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
+ <h3 id="bytebase.v1.GetWorkspaceActuatorInfoRequest">GetWorkspaceActuatorInfoRequest</h3>
+ <p>Request message for getting workspace-scoped actuator information.</p>
+
+
+ <table class="field-table">
+ <thead>
+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>name</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The workspace name, format: workspaces/{workspace}. </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
@@ -8062,6 +8121,13 @@ Permissions required: None</p></td>
Permissions required: None</p></td>
</tr>
+ <tr>
+ <td>GetWorkspaceActuatorInfo</td>
+ <td><a href="#bytebase.v1.GetWorkspaceActuatorInfoRequest">GetWorkspaceActuatorInfoRequest</a></td>
+ <td><a href="#bytebase.v1.ActuatorInfo">ActuatorInfo</a></td>
+ <td><p>Gets workspace-scoped actuator info. Requires authentication.</p></td>
+ </tr>
+
</tbody>
</table>
@@ -8119,6 +8185,23 @@ Permissions required: None</p></td>
<td></td>
</tr>
+ <tr>
+ <td>GetResourcePackage</td>
+ <td>GET</td>
+ <td>/v1/{name=workspaces/*}/actuator/resources</td>
+ <td></td>
+ </tr>
+
+
+
+
+ <tr>
+ <td>GetWorkspaceActuatorInfo</td>
+ <td>GET</td>
+ <td>/v1/{name=workspaces/*}/actuator/info</td>
+ <td></td>
+ </tr>
+
</tbody>
</table>
@@ -9631,7 +9714,7 @@ Format: users/{email} </p></td>
<td>service_key</td>
<td><a href="#string">string</a></td>
<td></td>
- <td><p>The service key for service account authentication. Only used for service accounts. </p></td>
+ <td><p>The service key for service account authentication. </p></td>
</tr>
<tr>
@@ -9685,6 +9768,14 @@ Could be empty. </p></td>
Format: groups/{email} </p></td>
</tr>
+ <tr>
+ <td>workspace</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The current workspace.
+Format: workspaces/{id} </p></td>
+ </tr>
+
</tbody>
</table>
@@ -9783,8 +9874,9 @@ Permissions required: bb.users.list</p></td>
<td>CreateUser</td>
<td><a href="#bytebase.v1.CreateUserRequest">CreateUserRequest</a></td>
<td><a href="#bytebase.v1.User">User</a></td>
- <td><p>Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
-Permissions required: bb.users.create (only when Disallow Signup is enabled)</p></td>
+ <td><p>Creates a user in the caller&#39;s workspace (admin action, self-hosted only).
+In SaaS mode, admins should add users via workspace IAM policy instead.
+Permissions required: bb.users.create</p></td>
</tr>
<tr>
@@ -10217,6 +10309,44 @@ Only returned when web=false. For web=true, the token is set as an HTTP-only coo
+ <h3 id="bytebase.v1.SignupRequest">SignupRequest</h3>
+ <p></p>
+
+
+ <table class="field-table">
+ <thead>
+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>email</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The email for the new account. </p></td>
+ </tr>
+
+ <tr>
+ <td>password</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The password for the new account. </p></td>
+ </tr>
+
+ <tr>
+ <td>title</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The display name of the user. </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
@@ -10256,6 +10386,16 @@ Used by CI/CD pipelines with Workload Identity Federation.
Permissions required: None (validates via OIDC token)</p></td>
</tr>
+ <tr>
+ <td>Signup</td>
+ <td><a href="#bytebase.v1.SignupRequest">SignupRequest</a></td>
+ <td><a href="#bytebase.v1.LoginResponse">LoginResponse</a></td>
+ <td><p>Registers a new user account. Creates a principal and assigns a workspace:
+- If the user&#39;s email was pre-invited to a workspace, joins that workspace.
+- Otherwise, creates a new workspace with the user as admin.
+Returns access tokens so the user is logged in immediately after signup.</p></td>
+ </tr>
+
<tr>
<td>Refresh</td>
<td><a href="#bytebase.v1.RefreshRequest">RefreshRequest</a></td>
@@ -10314,6 +10454,16 @@ Permissions required: None (validates via refresh token cookie)</p></td>
+ <tr>
+ <td>Signup</td>
+ <td>POST</td>
+ <td>/v1/auth/signup</td>
+ <td>*</td>
+ </tr>
+
+
+
+
<tr>
<td>Refresh</td>
<td>POST</td>
diff --git a/proto/store/store/server_config.proto b/proto/store/store/server_config.proto
new file mode 100644
index 0000000000..4d08d90136
--- /dev/null
+++ b/proto/store/store/server_config.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package bytebase.store;
+
+option go_package = "generated-go/store";
+
+// ServerConfigPayload stores global server-level infrastructure configuration.
+// Only contains settings that are truly cross-workspace and cannot be derived
+// from any workspace context (e.g., JWT signing secret).
+// All other settings live in per-workspace WORKSPACE_PROFILE.
+message ServerConfigPayload {
+ // Authentication secret for token signing (32-character random string).
+ string auth_secret = 1;
+}
diff --git a/proto/store/store/setting.proto b/proto/store/store/setting.proto
index d24bd49a56..6d0e934321 100644
--- a/proto/store/store/setting.proto
+++ b/proto/store/store/setting.proto
@@ -23,10 +23,12 @@ enum SettingName {
}
message SystemSetting {
- // Authentication secret for token signing (32-character random string).
- string auth_secret = 1;
+ // Field 1 was auth_secret, now stored in the server_config table.
+ reserved 1;
+ reserved "auth_secret";
// Field 2 was workspace_id, now stored in the workspace table.
reserved 2;
+ reserved "workspace_id";
// Enterprise license JWT token.
string license = 3;
}
diff --git a/proto/v1/v1/actuator_service.proto b/proto/v1/v1/actuator_service.proto
index b402b14087..0d1e93ed8a 100644
--- a/proto/v1/v1/actuator_service.proto
+++ b/proto/v1/v1/actuator_service.proto
@@ -5,6 +5,7 @@ package bytebase.v1;
import "google/api/annotations.proto";
import "google/api/client.proto";
import "google/api/field_behavior.proto";
+import "google/api/resource.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/timestamp.proto";
import "v1/annotation.proto";
@@ -43,14 +44,29 @@ service ActuatorService {
// Gets custom branding resources such as logos.
// Permissions required: None
rpc GetResourcePackage(GetResourcePackageRequest) returns (ResourcePackage) {
- option (google.api.http) = {get: "/v1/actuator/resources"};
+ option (google.api.http) = {
+ get: "/v1/actuator/resources"
+ additional_bindings: {get: "/v1/{name=workspaces/*}/actuator/resources"}
+ };
option (google.api.method_signature) = "";
option (bytebase.v1.allow_without_credential) = true;
}
+
+ // Gets workspace-scoped actuator info. Requires authentication.
+ rpc GetWorkspaceActuatorInfo(GetWorkspaceActuatorInfoRequest) returns (ActuatorInfo) {
+ option (google.api.http) = {get: "/v1/{name=workspaces/*}/actuator/info"};
+ option (google.api.method_signature) = "name";
+ option (bytebase.v1.permission) = "bb.settings.getWorkspaceProfile";
+ option (bytebase.v1.auth_method) = IAM;
+ }
}
// Request message for getting branding resources.
-message GetResourcePackageRequest {}
+message GetResourcePackageRequest {
+ // Optional workspace name, format: workspaces/{workspace}.
+ // Set when using the workspace-scoped URL pattern.
+ string name = 1;
+}
// Custom branding resources for the Bytebase instance.
message ResourcePackage {
@@ -64,6 +80,15 @@ message SetupSampleRequest {}
// Request message for getting actuator information.
message GetActuatorInfoRequest {}
+// Request message for getting workspace-scoped actuator information.
+message GetWorkspaceActuatorInfoRequest {
+ // The workspace name, format: workspaces/{workspace}.
+ string name = 1 [
+ (google.api.field_behavior) = REQUIRED,
+ (google.api.resource_reference) = {type: "bytebase.com/Workspace"}
+ ];
+}
+
// Request message for deleting cache.
message DeleteCacheRequest {}
@@ -114,7 +139,8 @@ message ActuatorInfo {
google.protobuf.Timestamp last_active_time = 11 [(google.api.field_behavior) = OUTPUT_ONLY];
// The unique identifier for the workspace.
- string workspace_id = 13 [(google.api.field_behavior) = OUTPUT_ONLY];
+ // Format: workspaces/{id}
+ string workspace = 13 [(google.api.field_behavior) = OUTPUT_ONLY];
// List of features that are not licensed.
repeated string unlicensed_features = 15 [(google.api.field_behavior) = OUTPUT_ONLY];
@@ -141,4 +167,8 @@ message ActuatorInfo {
int32 replica_count = 24 [(google.api.field_behavior) = OUTPUT_ONLY];
Restriction restriction = 25 [(google.api.field_behavior) = OUTPUT_ONLY];
+
+ // The default project for unassigned databases.
+ // Format: projects/{id}
+ string default_project = 26 [(google.api.field_behavior) = OUTPUT_ONLY];
}
diff --git a/proto/v1/v1/auth_service.proto b/proto/v1/v1/auth_service.proto
index ec8ca80a4d..8ba9e217a3 100644
--- a/proto/v1/v1/auth_service.proto
+++ b/proto/v1/v1/auth_service.proto
@@ -45,6 +45,19 @@ service AuthService {
option (bytebase.v1.audit) = true;
}
+ // Registers a new user account. Creates a principal and assigns a workspace:
+ // - If the user's email was pre-invited to a workspace, joins that workspace.
+ // - Otherwise, creates a new workspace with the user as admin.
+ // Returns access tokens so the user is logged in immediately after signup.
+ rpc Signup(SignupRequest) returns (LoginResponse) {
+ option (google.api.http) = {
+ post: "/v1/auth/signup"
+ body: "*"
+ };
+ option (bytebase.v1.allow_without_credential) = true;
+ option (bytebase.v1.audit) = true;
+ }
+
// Refreshes the access token using the refresh token cookie.
// Permissions required: None (validates via refresh token cookie)
rpc Refresh(RefreshRequest) returns (RefreshResponse) {
@@ -138,6 +151,17 @@ message ExchangeTokenResponse {
string access_token = 1;
}
+message SignupRequest {
+ // The email for the new account.
+ string email = 1;
+
+ // The password for the new account.
+ string password = 2;
+
+ // The display name of the user.
+ string title = 3;
+}
+
// Request to refresh the access token.
message RefreshRequest {}
diff --git a/proto/v1/v1/user_service.proto b/proto/v1/v1/user_service.proto
index 957be65af3..9895dfb5e1 100644
--- a/proto/v1/v1/user_service.proto
+++ b/proto/v1/v1/user_service.proto
@@ -54,16 +54,17 @@ service UserService {
option (bytebase.v1.auth_method) = IAM;
}
- // Creates a user. When Disallow Signup is enabled, requires bb.users.create permission; otherwise any user can sign up.
- // Permissions required: bb.users.create (only when Disallow Signup is enabled)
+ // Creates a user in the caller's workspace (admin action, self-hosted only).
+ // In SaaS mode, admins should add users via workspace IAM policy instead.
+ // Permissions required: bb.users.create
rpc CreateUser(CreateUserRequest) returns (User) {
option (google.api.http) = {
post: "/v1/users"
body: "user"
};
option (google.api.method_signature) = "user";
- option (bytebase.v1.allow_without_credential) = true;
- option (bytebase.v1.auth_method) = CUSTOM;
+ option (bytebase.v1.auth_method) = IAM;
+ option (bytebase.v1.permission) = "bb.users.create";
option (bytebase.v1.audit) = true;
}
@@ -270,8 +271,8 @@ message User {
// The password for authentication. Only used during user creation or password updates.
string password = 6 [(google.api.field_behavior) = INPUT_ONLY];
- // The service key for service account authentication. Only used for service accounts.
- string service_key = 7 [(google.api.field_behavior) = INPUT_ONLY];
+ // The service key for service account authentication.
+ string service_key = 7;
// The mfa_enabled flag means if the user has enabled MFA.
bool mfa_enabled = 8;
@@ -304,4 +305,8 @@ message User {
// The groups for the user.
// Format: groups/{email}
repeated string groups = 14 [(google.api.field_behavior) = OUTPUT_ONLY];
+
+ // The current workspace.
+ // Format: workspaces/{id}
+ string workspace = 16 [(google.api.field_behavior) = OUTPUT_ONLY];
}