Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: use email consistently in tokens and OAuth2 schema (#18452)
Danny Xu42ac58ceb344
diff --git a/backend/api/auth/auth.go b/backend/api/auth/auth.goindex b1777d2ab0..27f726a30a 100644--- a/backend/api/auth/auth.go+++ b/backend/api/auth/auth.go@@ -45,11 +45,6 @@ const (// AccessTokenCookieName is the cookie name of access token.AccessTokenCookieName = "access-token"-- // GatewayMetadataAccessTokenKey is the gateway metadata key for access token.- GatewayMetadataAccessTokenKey = "bytebase-access-token"- // GatewayMetadataRequestOriginKey is the gateway metadata key for the request origin header.- GatewayMetadataRequestOriginKey = "bytebase-request-origin")// APIAuthInterceptor is the auth interceptor for gRPC server.@@ -170,9 +165,7 @@ func (in *APIAuthInterceptor) authenticate(ctx context.Context, accessTokenStr s// Accept both user access tokens (bb.user.access.{mode}) and OAuth2 access tokens (bb.oauth2.access)validUserAudience := fmt.Sprintf(AccessTokenAudienceFmt, in.profile.Mode)- isOAuth2Token := audienceContains(claims.Audience, OAuth2AccessTokenAudience)- isUserToken := audienceContains(claims.Audience, validUserAudience)- if !isUserToken && !isOAuth2Token {+ if !audienceContains(claims.Audience, validUserAudience) && !audienceContains(claims.Audience, OAuth2AccessTokenAudience) {return nil, nil, errs.Errorf("invalid access token, audience mismatch, got %q, expected %q or %q. you may send request to the wrong environment",claims.Audience,@@ -181,29 +174,26 @@ func (in *APIAuthInterceptor) authenticate(ctx context.Context, accessTokenStr s)}+ // Try to parse subject as integer ID (old tokens), otherwise treat as email (new tokens and OAuth2)var user *store.UserMessagevar err error- if isOAuth2Token {- // OAuth2 tokens use email as subject- user, err = in.store.GetUserByEmail(ctx, claims.Subject)+ if principalID, parseErr := strconv.Atoi(claims.Subject); parseErr == nil {+ // Old token with numeric ID as subject+ user, err = in.store.GetUserByID(ctx, principalID)if err != nil {- return nil, nil, errs.Errorf("failed to find user email %q in the access token", claims.Subject)+ return nil, nil, errs.Errorf("failed to find user ID %q in the access token", principalID)}if user == nil {- return nil, nil, errs.Errorf("user email %q not exists in the access token", claims.Subject)+ return nil, nil, errs.Errorf("user ID %q not exists in the access token", principalID)}} else {- // User tokens use ID as subject- principalID, err := strconv.Atoi(claims.Subject)- if err != nil {- return nil, nil, errs.Errorf("malformed ID %q in the access token", claims.Subject)- }- user, err = in.store.GetUserByID(ctx, principalID)+ // New token with email as subject (includes OAuth2 tokens)+ user, err = in.store.GetUserByEmail(ctx, claims.Subject)if err != nil {- return nil, nil, errs.Errorf("failed to find user ID %q in the access token", principalID)+ return nil, nil, errs.Errorf("failed to find user email %q in the access token", claims.Subject)}if user == nil {- return nil, nil, errs.Errorf("user ID %q not exists in the access token", principalID)+ return nil, nil, errs.Errorf("user email %q not exists in the access token", claims.Subject)}}if user.MemberDeleted {@@ -234,8 +224,8 @@ func (in *APIAuthInterceptor) getUserConnect(ctx context.Context, accessTokenStrreturn user, nil}-// GetUserIDFromMFATempToken returns the user ID from the MFA temp token.-func GetUserIDFromMFATempToken(token string, mode common.ReleaseMode, secret string) (int, error) {+// GetUserEmailFromMFATempToken returns the user email from the MFA temp token.+func GetUserEmailFromMFATempToken(token string, mode common.ReleaseMode, secret string) (string, error) {claims := &claimsMessage{}_, err := jwt.ParseWithClaims(token, claims, func(t *jwt.Token) (any, error) {if t.Method.Alg() != jwt.SigningMethodHS256.Name {@@ -249,16 +239,12 @@ func GetUserIDFromMFATempToken(token string, mode common.ReleaseMode, secret strreturn nil, connect.NewError(connect.CodeUnauthenticated, errs.Errorf("unexpected MFA temp token kid=%v", t.Header["kid"]))})if err != nil {- return 0, connect.NewError(connect.CodeUnauthenticated, errs.New("failed to parse claim"))+ return "", connect.NewError(connect.CodeUnauthenticated, errs.New("failed to parse claim"))}if !audienceContains(claims.Audience, fmt.Sprintf(MFATempTokenAudienceFmt, mode)) {- return 0, connect.NewError(connect.CodeUnauthenticated, errs.New("invalid MFA temp token, audience mismatch"))- }- userID, err := strconv.Atoi(claims.Subject)- if err != nil {- return 0, connect.NewError(connect.CodeUnauthenticated, errs.Errorf("malformed ID %q in the MFA temp token", claims.Subject))+ return "", connect.NewError(connect.CodeUnauthenticated, errs.New("invalid MFA temp token, audience mismatch"))}- return userID, nil+ return claims.Subject, nil}// AuthenticateToken validates a JWT access token and returns the user and token expiry.@@ -313,35 +299,35 @@ type claimsMessage struct {}// GenerateAPIToken generates an API token.-func GenerateAPIToken(userName string, userID int, mode common.ReleaseMode, secret string) (string, error) {+func GenerateAPIToken(userEmail string, mode common.ReleaseMode, secret string) (string, error) {expirationTime := time.Now().Add(apiTokenDuration)- return generateToken(userName, userID, fmt.Sprintf(AccessTokenAudienceFmt, mode), expirationTime, []byte(secret))+ return generateToken(userEmail, fmt.Sprintf(AccessTokenAudienceFmt, mode), expirationTime, []byte(secret))}// GenerateAccessToken generates an access token for web.-func GenerateAccessToken(userName string, userID int, mode common.ReleaseMode, secret string, tokenDuration time.Duration) (string, error) {+func GenerateAccessToken(userEmail string, mode common.ReleaseMode, secret string, tokenDuration time.Duration) (string, error) {expirationTime := time.Now().Add(tokenDuration)- return generateToken(userName, userID, fmt.Sprintf(AccessTokenAudienceFmt, mode), expirationTime, []byte(secret))+ return generateToken(userEmail, fmt.Sprintf(AccessTokenAudienceFmt, mode), expirationTime, []byte(secret))}// GenerateMFATempToken generates a temporary token for MFA.-func GenerateMFATempToken(userName string, userID int, mode common.ReleaseMode, secret string, tokenDuration time.Duration) (string, error) {+func GenerateMFATempToken(userEmail string, mode common.ReleaseMode, secret string, tokenDuration time.Duration) (string, error) {expirationTime := time.Now().Add(tokenDuration)- return generateToken(userName, userID, fmt.Sprintf(MFATempTokenAudienceFmt, mode), expirationTime, []byte(secret))+ return generateToken(userEmail, fmt.Sprintf(MFATempTokenAudienceFmt, mode), expirationTime, []byte(secret))}// Pay attention to this function. It holds the main JWT token generation logic.-func generateToken(userName string, userID int, aud string, expirationTime time.Time, secret []byte) (string, error) {- // Create the JWT claims, which includes the username and expiry time.+func generateToken(userEmail string, aud string, expirationTime time.Time, secret []byte) (string, error) {+ // Create the JWT claims, which includes the user email and expiry time.claims := &claimsMessage{- Name: userName,+ Name: userEmail,RegisteredClaims: jwt.RegisteredClaims{Audience: jwt.ClaimStrings{aud},// In JWT, the expiry time is expressed as unix milliseconds.ExpiresAt: jwt.NewNumericDate(expirationTime),IssuedAt: jwt.NewNumericDate(time.Now()),Issuer: issuer,- Subject: strconv.Itoa(userID),+ Subject: userEmail,},}diff --git a/backend/api/oauth2/authorize.go b/backend/api/oauth2/authorize.goindex bcacda529f..0368f49edd 100644--- a/backend/api/oauth2/authorize.go+++ b/backend/api/oauth2/authorize.go@@ -155,7 +155,7 @@ func (s *Service) handleAuthorizePost(c echo.Context) error {if _, err := s.store.CreateOAuth2AuthorizationCode(ctx, &store.OAuth2AuthorizationCodeMessage{Code: code,ClientID: clientID,- UserID: user.ID,+ UserEmail: user.Email,Config: codeConfig,ExpiresAt: time.Now().Add(authCodeExpiry),}); err != nil {diff --git a/backend/api/oauth2/token.go b/backend/api/oauth2/token.goindex efa3c6798d..4d14a4714d 100644--- a/backend/api/oauth2/token.go+++ b/backend/api/oauth2/token.go@@ -139,13 +139,13 @@ func (s *Service) handleAuthorizationCodeGrant(c echo.Context, client *store.OAu_ = s.store.DeleteOAuth2AuthorizationCode(ctx, req.Code)// Get user- user, err := s.store.GetUserByID(ctx, authCode.UserID)+ user, err := s.store.GetUserByEmail(ctx, authCode.UserEmail)if err != nil || user == nil {return oauth2Error(c, http.StatusBadRequest, "invalid_grant", "user not found")}// Generate tokens- return s.issueTokens(c, client, user.ID, user.Email)+ return s.issueTokens(c, client, user.Email)}func (s *Service) handleRefreshTokenGrant(c echo.Context, client *store.OAuth2ClientMessage, req *tokenRequest) error {@@ -187,16 +187,16 @@ func (s *Service) handleRefreshTokenGrant(c echo.Context, client *store.OAuth2Cl_ = s.store.DeleteOAuth2RefreshToken(ctx, tokenHash)// Get user- user, err := s.store.GetUserByID(ctx, refreshToken.UserID)+ user, err := s.store.GetUserByEmail(ctx, refreshToken.UserEmail)if err != nil || user == nil {return oauth2Error(c, http.StatusBadRequest, "invalid_grant", "user not found")}// Issue new tokens- return s.issueTokens(c, client, user.ID, user.Email)+ return s.issueTokens(c, client, user.Email)}-func (s *Service) issueTokens(c echo.Context, client *store.OAuth2ClientMessage, userID int, userEmail string) error {+func (s *Service) issueTokens(c echo.Context, client *store.OAuth2ClientMessage, userEmail string) error {ctx := c.Request().Context()// Generate access token (JWT)@@ -228,7 +228,7 @@ func (s *Service) issueTokens(c echo.Context, client *store.OAuth2ClientMessage,if _, err := s.store.CreateOAuth2RefreshToken(ctx, &store.OAuth2RefreshTokenMessage{TokenHash: hashToken(refreshTokenStr),ClientID: client.ClientID,- UserID: userID,+ UserEmail: userEmail,ExpiresAt: now.Add(refreshTokenExpiry),}); err != nil {return oauth2Error(c, http.StatusInternalServerError, "server_error", "failed to store refresh token")diff --git a/backend/api/v1/audit.go b/backend/api/v1/audit.goindex 09eb844c28..bc19ce05b3 100644--- a/backend/api/v1/audit.go+++ b/backend/api/v1/audit.go@@ -190,11 +190,9 @@ func createAuditLogConnect(ctx context.Context, request, response any, method stif u, ok := GetUserFromContext(ctx); ok {resource = u.Email} else if loginRequest, ok := request.(*v1pb.LoginRequest); ok && loginRequest.MfaTempToken != nil {- // Extract user from MFA temp token and fetch email from database.- if userID, err := auth.GetUserIDFromMFATempToken(*loginRequest.MfaTempToken, profile.Mode, secret); err == nil {- if u, err := storage.GetUserByID(createAuditLogCtx, userID); err == nil && u != nil {- resource = u.Email- }+ // Extract user email from MFA temp token.+ if userEmail, err := auth.GetUserEmailFromMFATempToken(*loginRequest.MfaTempToken, profile.Mode, secret); err == nil {+ resource = userEmail}}}diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex f73c003636..b299c71a83 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -115,11 +115,11 @@ func (s *AuthService) Login(ctx context.Context, req *connect.Request[v1pb.Loginresponse.RequireResetPassword = s.needResetPassword(ctx, loginUser)}} else {- userID, err := auth.GetUserIDFromMFATempToken(*request.MfaTempToken, s.profile.Mode, s.secret)+ userEmail, err := auth.GetUserEmailFromMFATempToken(*request.MfaTempToken, s.profile.Mode, s.secret)if err != nil {return nil, err}- user, err := s.store.GetUserByID(ctx, userID)+ user, err := s.store.GetUserByEmail(ctx, userEmail)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find user, error"))}@@ -176,7 +176,7 @@ func (s *AuthService) Login(ctx context.Context, req *connect.Request[v1pb.LoginuserMFAEnabled := loginUser.MFAConfig != nil && loginUser.MFAConfig.OtpSecret != ""// We only allow MFA login (2-step) when the feature is enabled and user has enabled MFA.if s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TWO_FA) == nil && !mfaSecondLogin && userMFAEnabled {- mfaTempToken, err := auth.GenerateMFATempToken(loginUser.Name, loginUser.ID, s.profile.Mode, s.secret, mfaTempTokenDuration)+ mfaTempToken, err := auth.GenerateMFATempToken(loginUser.Email, s.profile.Mode, s.secret, mfaTempTokenDuration)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate MFA temp token"))}@@ -187,13 +187,13 @@ func (s *AuthService) Login(ctx context.Context, req *connect.Request[v1pb.Loginswitch loginUser.Type {case storepb.PrincipalType_END_USER:- token, err := auth.GenerateAccessToken(loginUser.Name, loginUser.ID, s.profile.Mode, s.secret, tokenDuration)+ token, err := auth.GenerateAccessToken(loginUser.Email, s.profile.Mode, s.secret, tokenDuration)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate API access token"))}response.Token = tokencase storepb.PrincipalType_SERVICE_ACCOUNT:- token, err := auth.GenerateAPIToken(loginUser.Name, loginUser.ID, s.profile.Mode, s.secret)+ token, err := auth.GenerateAPIToken(loginUser.Email, s.profile.Mode, s.secret)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate API access token"))}@@ -727,7 +727,7 @@ func (s *AuthService) ExchangeToken(ctx context.Context, req *connect.Request[v1}// Generate Bytebase API token (1 hour duration, same as service account)- token, err := auth.GenerateAPIToken(user.Name, user.ID, s.profile.Mode, s.secret)+ token, err := auth.GenerateAPIToken(user.Email, s.profile.Mode, s.secret)if err != nil {return nil, connect.NewError(connect.CodeInternal,errors.Wrap(err, "failed to generate access token"))diff --git a/backend/migrator/migration/3.13/0024##add_oauth2_tables.sql b/backend/migrator/migration/3.13/0024##add_oauth2_tables.sqlindex d519665568..b67fe032a1 100644--- a/backend/migrator/migration/3.13/0024##add_oauth2_tables.sql+++ b/backend/migrator/migration/3.13/0024##add_oauth2_tables.sql@@ -1,23 +1,23 @@CREATE TABLE oauth2_client (- client_id TEXT PRIMARY KEY,- client_secret_hash TEXT NOT NULL,- config JSONB NOT NULL,- last_active_at TIMESTAMPTZ NOT NULL DEFAULT now()+ client_id text PRIMARY KEY,+ client_secret_hash text NOT NULL,+ config jsonb NOT NULL,+ last_active_at timestamptz NOT NULL DEFAULT now());CREATE TABLE oauth2_authorization_code (- code TEXT PRIMARY KEY,- client_id TEXT NOT NULL REFERENCES oauth2_client(client_id) ON DELETE CASCADE,- user_id INTEGER NOT NULL REFERENCES principal(id),- config JSONB NOT NULL,- expires_at TIMESTAMPTZ NOT NULL+ code text PRIMARY KEY,+ client_id text NOT NULL REFERENCES oauth2_client(client_id) ON DELETE CASCADE,+ user_email text NOT NULL REFERENCES principal(email) ON UPDATE CASCADE,+ config jsonb NOT NULL,+ expires_at timestamptz NOT NULL);CREATE TABLE oauth2_refresh_token (- token_hash TEXT PRIMARY KEY,- client_id TEXT NOT NULL REFERENCES oauth2_client(client_id) ON DELETE CASCADE,- user_id INTEGER NOT NULL REFERENCES principal(id),- expires_at TIMESTAMPTZ NOT NULL+ token_hash text PRIMARY KEY,+ client_id text NOT NULL REFERENCES oauth2_client(client_id) ON DELETE CASCADE,+ user_email text NOT NULL REFERENCES principal(email) ON UPDATE CASCADE,+ expires_at timestamptz NOT NULL);CREATE INDEX idx_oauth2_authorization_code_expires_at ON oauth2_authorization_code(expires_at);diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sqlindex f163e0cdf3..26b1ce8e1c 100644--- a/backend/migrator/migration/LATEST.sql+++ b/backend/migrator/migration/LATEST.sql@@ -539,6 +539,32 @@ CREATE INDEX idx_release_project ON release(project);CREATE UNIQUE INDEX idx_release_unique_project_digest ON release(project, digest) WHERE digest != '';+-- OAuth2 tables+CREATE TABLE oauth2_client (+ client_id text PRIMARY KEY,+ client_secret_hash text NOT NULL,+ config jsonb NOT NULL,+ last_active_at timestamptz NOT NULL DEFAULT now()+);++CREATE TABLE oauth2_authorization_code (+ code text PRIMARY KEY,+ client_id text NOT NULL REFERENCES oauth2_client(client_id) ON DELETE CASCADE,+ user_email text NOT NULL REFERENCES principal(email) ON UPDATE CASCADE,+ config jsonb NOT NULL,+ expires_at timestamptz NOT NULL+);++CREATE TABLE oauth2_refresh_token (+ token_hash text PRIMARY KEY,+ client_id text NOT NULL REFERENCES oauth2_client(client_id) ON DELETE CASCADE,+ user_email text NOT NULL REFERENCES principal(email) ON UPDATE CASCADE,+ expires_at timestamptz NOT NULL+);++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);-- Default bytebase system account id is 1.INSERT INTO principal (id, type, name, email, password_hash) VALUES (1, 'SYSTEM_BOT', 'Bytebase', '[email protected]', '');@@ -577,30 +603,3 @@ VALUES (-- Grant workspace member role to allUsersINSERT INTO policy (resource_type, resource, type, payload, inherit_from_parent, enforce)VALUES ('WORKSPACE', '', 'IAM', '{"bindings":[{"role":"roles/workspaceMember","members":["allUsers"]}]}', FALSE, TRUE);---- OAuth2 tables-CREATE TABLE oauth2_client (- client_id TEXT PRIMARY KEY,- client_secret_hash TEXT NOT NULL,- config JSONB NOT NULL,- last_active_at TIMESTAMPTZ NOT NULL DEFAULT now()-);--CREATE TABLE oauth2_authorization_code (- code TEXT PRIMARY KEY,- client_id TEXT NOT NULL REFERENCES oauth2_client(client_id) ON DELETE CASCADE,- user_id INTEGER NOT NULL REFERENCES principal(id),- config JSONB NOT NULL,- expires_at TIMESTAMPTZ NOT NULL-);--CREATE TABLE oauth2_refresh_token (- token_hash TEXT PRIMARY KEY,- client_id TEXT NOT NULL REFERENCES oauth2_client(client_id) ON DELETE CASCADE,- user_id INTEGER NOT NULL REFERENCES principal(id),- expires_at TIMESTAMPTZ NOT NULL-);--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);diff --git a/backend/store/oauth2_authorization_code.go b/backend/store/oauth2_authorization_code.goindex 8ca28befca..03ae6d8948 100644--- a/backend/store/oauth2_authorization_code.go+++ b/backend/store/oauth2_authorization_code.go@@ -16,7 +16,7 @@ import (type OAuth2AuthorizationCodeMessage struct {Code stringClientID string- UserID int+ UserEmail stringConfig *storepb.OAuth2AuthorizationCodeConfigExpiresAt time.Time}@@ -28,9 +28,9 @@ func (s *Store) CreateOAuth2AuthorizationCode(ctx context.Context, create *OAuth}q := qb.Q().Space(`- INSERT INTO oauth2_authorization_code (code, client_id, user_id, config, expires_at)+ INSERT INTO oauth2_authorization_code (code, client_id, user_email, config, expires_at)VALUES (?, ?, ?, ?, ?)- `, create.Code, create.ClientID, create.UserID, configBytes, create.ExpiresAt)+ `, create.Code, create.ClientID, create.UserEmail, configBytes, create.ExpiresAt)query, args, err := q.ToSQL()if err != nil {@@ -45,7 +45,7 @@ func (s *Store) CreateOAuth2AuthorizationCode(ctx context.Context, create *OAuthfunc (s *Store) GetOAuth2AuthorizationCode(ctx context.Context, code string) (*OAuth2AuthorizationCodeMessage, error) {q := qb.Q().Space(`- SELECT code, client_id, user_id, config, expires_at+ SELECT code, client_id, user_email, config, expires_atFROM oauth2_authorization_codeWHERE code = ?`, code)@@ -58,7 +58,7 @@ func (s *Store) GetOAuth2AuthorizationCode(ctx context.Context, code string) (*Omsg := &OAuth2AuthorizationCodeMessage{}var configBytes []byteif err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(- &msg.Code, &msg.ClientID, &msg.UserID, &configBytes, &msg.ExpiresAt,+ &msg.Code, &msg.ClientID, &msg.UserEmail, &configBytes, &msg.ExpiresAt,); err != nil {if errors.Is(err, sql.ErrNoRows) {return nil, nildiff --git a/backend/store/oauth2_refresh_token.go b/backend/store/oauth2_refresh_token.goindex 04eb3a1086..692bc141dc 100644--- a/backend/store/oauth2_refresh_token.go+++ b/backend/store/oauth2_refresh_token.go@@ -13,15 +13,15 @@ import (type OAuth2RefreshTokenMessage struct {TokenHash stringClientID string- UserID int+ UserEmail stringExpiresAt time.Time}func (s *Store) CreateOAuth2RefreshToken(ctx context.Context, create *OAuth2RefreshTokenMessage) (*OAuth2RefreshTokenMessage, error) {q := qb.Q().Space(`- INSERT INTO oauth2_refresh_token (token_hash, client_id, user_id, expires_at)+ INSERT INTO oauth2_refresh_token (token_hash, client_id, user_email, expires_at)VALUES (?, ?, ?, ?)- `, create.TokenHash, create.ClientID, create.UserID, create.ExpiresAt)+ `, create.TokenHash, create.ClientID, create.UserEmail, create.ExpiresAt)query, args, err := q.ToSQL()if err != nil {@@ -36,7 +36,7 @@ func (s *Store) CreateOAuth2RefreshToken(ctx context.Context, create *OAuth2Refrfunc (s *Store) GetOAuth2RefreshToken(ctx context.Context, tokenHash string) (*OAuth2RefreshTokenMessage, error) {q := qb.Q().Space(`- SELECT token_hash, client_id, user_id, expires_at+ SELECT token_hash, client_id, user_email, expires_atFROM oauth2_refresh_tokenWHERE token_hash = ?`, tokenHash)@@ -48,7 +48,7 @@ func (s *Store) GetOAuth2RefreshToken(ctx context.Context, tokenHash string) (*Omsg := &OAuth2RefreshTokenMessage{}if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(- &msg.TokenHash, &msg.ClientID, &msg.UserID, &msg.ExpiresAt,+ &msg.TokenHash, &msg.ClientID, &msg.UserEmail, &msg.ExpiresAt,); err != nil {if errors.Is(err, sql.ErrNoRows) {return nil, nil@@ -75,11 +75,11 @@ func (s *Store) DeleteOAuth2RefreshToken(ctx context.Context, tokenHash string)return nil}-func (s *Store) DeleteOAuth2RefreshTokensByUserAndClient(ctx context.Context, userID int, clientID string) error {+func (s *Store) DeleteOAuth2RefreshTokensByUserAndClient(ctx context.Context, userEmail string, clientID string) error {q := qb.Q().Space(`DELETE FROM oauth2_refresh_token- WHERE user_id = ? AND client_id = ?- `, userID, clientID)+ WHERE user_email = ? AND client_id = ?+ `, userEmail, clientID)query, args, err := q.ToSQL()if err != nil {