From ea66671d4434503469720b466a81c46bbe45b14f Mon Sep 17 00:00:00 2001 From: kyy Date: Thu, 5 Feb 2026 14:45:32 +0900 Subject: [PATCH 1/7] =?UTF-8?q?Kratos=EB=A5=BC=20=ED=86=B5=ED=95=B4=20UUID?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/internal/handler/dev_handler.go | 49 ++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/backend/internal/handler/dev_handler.go b/backend/internal/handler/dev_handler.go index 732e4e2f..33a9b3f5 100644 --- a/backend/internal/handler/dev_handler.go +++ b/backend/internal/handler/dev_handler.go @@ -13,16 +13,18 @@ import ( ) type DevHandler struct { - Hydra *service.HydraAdminService - Redis *service.RedisService - SecretRepo domain.ClientSecretRepository + Hydra *service.HydraAdminService + Redis *service.RedisService + SecretRepo domain.ClientSecretRepository + KratosAdmin *service.KratosAdminService } func NewDevHandler(redis *service.RedisService, secretRepo domain.ClientSecretRepository) *DevHandler { return &DevHandler{ - Hydra: service.NewHydraAdminService(), - Redis: redis, - SecretRepo: secretRepo, + Hydra: service.NewHydraAdminService(), + Redis: redis, + SecretRepo: secretRepo, + KratosAdmin: service.NewKratosAdminService(), } } @@ -59,6 +61,7 @@ type clientEndpoints struct { type consentSummary struct { Subject string `json:"subject"` + UserName string `json:"userName,omitempty"` ClientID string `json:"clientId"` ClientName string `json:"clientName,omitempty"` GrantedScopes []string `json:"grantedScopes"` @@ -395,6 +398,15 @@ func (h *DevHandler) ListConsents(c *fiber.Ctx) error { if subject == "" { return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "subject is required"}) } + + // If subject is not a UUID, try to resolve it as an identifier (email/username) + if _, err := uuid.Parse(subject); err != nil { + resolved, err := h.KratosAdmin.FindIdentityIDByIdentifier(c.Context(), subject) + if err == nil && resolved != "" { + subject = resolved + } + } + clientID := strings.TrimSpace(c.Query("client_id")) sessions, err := h.Hydra.ListConsentSessions(c.Context(), subject, clientID) @@ -412,6 +424,21 @@ func (h *DevHandler) ListConsents(c *fiber.Ctx) error { if subject == "" && session.ConsentRequest != nil { subject = session.ConsentRequest.Subject } + + userName := "" + if subject != "" { + identity, err := h.KratosAdmin.GetIdentity(c.Context(), subject) + if err == nil && identity != nil { + if name, ok := identity.Traits["name"].(string); ok { + userName = name + } else if displayName, ok := identity.Traits["displayname"].(string); ok { + userName = displayName + } else if email, ok := identity.Traits["email"].(string); ok { + userName = email + } + } + } + authAt := "" if session.AuthenticatedAt != nil { authAt = session.AuthenticatedAt.Format(time.RFC3339) @@ -422,6 +449,7 @@ func (h *DevHandler) ListConsents(c *fiber.Ctx) error { } items = append(items, consentSummary{ Subject: subject, + UserName: userName, ClientID: client.ClientID, ClientName: client.ClientName, GrantedScopes: session.GrantedScope, @@ -437,6 +465,15 @@ func (h *DevHandler) RevokeConsents(c *fiber.Ctx) error { if subject == "" { return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "subject is required"}) } + + // If subject is not a UUID, try to resolve it as an identifier (email/username) + if _, err := uuid.Parse(subject); err != nil { + resolved, err := h.KratosAdmin.FindIdentityIDByIdentifier(c.Context(), subject) + if err == nil && resolved != "" { + subject = resolved + } + } + clientID := strings.TrimSpace(c.Query("client_id")) if err := h.Hydra.RevokeConsentSessions(c.Context(), subject, clientID); err != nil { From beebb3f7e6ab5d0e29009b726f3a0bafda5f9d34 Mon Sep 17 00:00:00 2001 From: kyy Date: Thu, 5 Feb 2026 14:46:58 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EC=95=88=EB=82=B4=20=EB=A9=94=EC=84=B8?= =?UTF-8?q?=EC=A7=80=20=EB=B0=8F=20=EC=8B=A4=EC=A0=9C=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/clients/ClientConsentsPage.tsx | 197 ++++++++++-------- devfront/src/lib/devApi.ts | 1 + 2 files changed, 112 insertions(+), 86 deletions(-) diff --git a/devfront/src/features/clients/ClientConsentsPage.tsx b/devfront/src/features/clients/ClientConsentsPage.tsx index d21349db..88bafbf0 100644 --- a/devfront/src/features/clients/ClientConsentsPage.tsx +++ b/devfront/src/features/clients/ClientConsentsPage.tsx @@ -173,90 +173,106 @@ function ClientConsentsPage() { Loading consents... )} - - - - User - Status - Granted Scopes - Last Authenticated - Action - - - - {rows.map((row) => ( - - -
-
- {row.subject.slice(0, 2).toUpperCase()} -
-
- - {row.clientName || "Subject"} - - - {row.subject} - -
-
- - - Active - - -
- {row.grantedScopes.map((scope) => ( - - {scope} - - ))} -
- - - {row.authenticatedAt || "-"} - - - - - - ))} - -
- -

- Showing 1 to{" "} - 4 of{" "} - 1,250 users -

-
- - - - - + + {subject.length === 0 && !isLoading && !error ? ( +
+ +

사용자 검색 필요

+

+ 보안상의 이유로 전체 목록은 제공되지 않습니다.
+ 사용자 ID, 이메일, 또는 이름으로 검색하여 동의 내역을 확인하세요. +

- + ) : ( + <> + + + + User + Status + Granted Scopes + Last Authenticated + Action + + + + {rows.length === 0 && !isLoading ? ( + + + 검색 결과가 없습니다. + + + ) : ( + rows.map((row) => ( + + +
+
+ {(row.userName || row.subject).slice(0, 2).toUpperCase()} +
+
+ + {row.userName || "Subject"} + + + {row.subject} + +
+
+ + + Active + + +
+ {row.grantedScopes.map((scope) => ( + + {scope} + + ))} +
+ + + {row.authenticatedAt || "-"} + + + + + + )) + )} + +
+ +

+ Showing {rows.length > 0 ? 1 : 0} to{" "} + {rows.length} of{" "} + {rows.length} users +

+
+ + + +
+ + + )}
@@ -265,7 +281,7 @@ function ClientConsentsPage() {

Active Grants

- 1,250 + {rows.length} @@ -273,7 +289,9 @@ function ClientConsentsPage() {

Total Scopes Issued

- 4,812 + + {rows.reduce((acc, row) => acc + row.grantedScopes.length, 0)} + @@ -281,7 +299,14 @@ function ClientConsentsPage() {

Avg. Scopes per User

- 3.8 + + {rows.length > 0 + ? ( + rows.reduce((acc, row) => acc + row.grantedScopes.length, 0) / + rows.length + ).toFixed(1) + : "0.0"} +
diff --git a/devfront/src/lib/devApi.ts b/devfront/src/lib/devApi.ts index cbed9191..014c76bd 100644 --- a/devfront/src/lib/devApi.ts +++ b/devfront/src/lib/devApi.ts @@ -49,6 +49,7 @@ export type ClientUpsertRequest = { export type ConsentSummary = { subject: string; + userName?: string; clientId: string; clientName?: string; grantedScopes: string[]; From 5af39085e75be8ce14c964b1e19d356f980cf660 Mon Sep 17 00:00:00 2001 From: kyy Date: Fri, 6 Feb 2026 11:22:49 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EB=8F=99=EC=9D=98=20=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EB=A5=BC=20=EC=9C=84=ED=95=9C=20ClientConsen?= =?UTF-8?q?t=20=EB=AA=A8=EB=8D=B8=20=EB=B0=8F=20Repository=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/go.mod | 1 + backend/go.sum | 2 + backend/internal/bootstrap/bootstrap.go | 2 +- backend/internal/domain/client_consent.go | 33 +++++++ .../repository/client_consent_repository.go | 92 +++++++++++++++++++ 5 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 backend/internal/domain/client_consent.go create mode 100644 backend/internal/repository/client_consent_repository.go diff --git a/backend/go.mod b/backend/go.mod index a7d03551..6e6549a8 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -57,6 +57,7 @@ require ( github.com/lestrrat-go/iter v1.0.2 // indirect github.com/lestrrat-go/jwx/v2 v2.1.6 // indirect github.com/lestrrat-go/option v1.0.1 // indirect + github.com/lib/pq v1.11.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect diff --git a/backend/go.sum b/backend/go.sum index 365e8e00..09f526f5 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -110,6 +110,8 @@ github.com/lestrrat-go/jwx/v2 v2.1.6 h1:hxM1gfDILk/l5ylers6BX/Eq1m/pnxe9NBwW6lVf github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= +github.com/lib/pq v1.11.1 h1:wuChtj2hfsGmmx3nf1m7xC2XpK6OtelS2shMY+bGMtI= +github.com/lib/pq v1.11.1/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.go index ff8bef3a..fcd15586 100644 --- a/backend/internal/bootstrap/bootstrap.go +++ b/backend/internal/bootstrap/bootstrap.go @@ -37,7 +37,7 @@ func migrateSchemas(db *gorm.DB) error { &domain.ApiKey{}, &domain.IdentityProviderConfig{}, &domain.ClientSecret{}, + &domain.ClientConsent{}, // &domain.RelyingParty{}, // Removed: SSOT is Hydra + Keto - // &domain.UserConsent{}, // TODO: Uncomment when model is ready ) } diff --git a/backend/internal/domain/client_consent.go b/backend/internal/domain/client_consent.go new file mode 100644 index 00000000..edda1e6a --- /dev/null +++ b/backend/internal/domain/client_consent.go @@ -0,0 +1,33 @@ +package domain + +import ( + "time" + + "github.com/google/uuid" + "github.com/lib/pq" + "gorm.io/gorm" +) + +type ClientConsent struct { + ID string `gorm:"primaryKey;type:uuid;default:gen_random_uuid()" json:"id"` + ClientID string `gorm:"index;uniqueIndex:idx_client_subject;not null" json:"clientId"` + Subject string `gorm:"index;uniqueIndex:idx_client_subject;not null" json:"subject"` // User UUID + GrantedScopes pq.StringArray `gorm:"type:text[];not null" json:"grantedScopes"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` + DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` +} + +// ClientConsentWithTenantInfo is a struct to hold joined data for API responses +type ClientConsentWithTenantInfo struct { + ClientConsent + TenantID string `gorm:"column:tenant_id" json:"tenantId"` + TenantName string `gorm:"column:tenant_name" json:"tenantName"` +} + +func (c *ClientConsent) BeforeCreate(tx *gorm.DB) (err error) { + if c.ID == "" { + c.ID = uuid.New().String() + } + return +} diff --git a/backend/internal/repository/client_consent_repository.go b/backend/internal/repository/client_consent_repository.go new file mode 100644 index 00000000..64a85e2a --- /dev/null +++ b/backend/internal/repository/client_consent_repository.go @@ -0,0 +1,92 @@ +package repository + +import ( + "baron-sso-backend/internal/domain" + "context" + + "gorm.io/gorm" +) + +type ClientConsentRepository interface { + Upsert(ctx context.Context, consent *domain.ClientConsent) error + Delete(ctx context.Context, subject, clientID string) error + List(ctx context.Context, clientID string, limit, offset int) ([]domain.ClientConsentWithTenantInfo, int64, error) + ListByTenant(ctx context.Context, clientID, tenantID string, limit, offset int) ([]domain.ClientConsentWithTenantInfo, int64, error) +} + +type clientConsentRepo struct { + db *gorm.DB +} + +func NewClientConsentRepository(db *gorm.DB) ClientConsentRepository { + return &clientConsentRepo{db: db} +} + +func (r *clientConsentRepo) Upsert(ctx context.Context, consent *domain.ClientConsent) error { + return r.db.WithContext(ctx). + Where("client_id = ? AND subject = ?", consent.ClientID, consent.Subject). + Assign(map[string]interface{}{ + "granted_scopes": consent.GrantedScopes, + "updated_at": gorm.Expr("NOW()"), + }). + FirstOrCreate(consent).Error +} + +func (r *clientConsentRepo) Delete(ctx context.Context, subject, clientID string) error { + return r.db.WithContext(ctx). + Where("subject = ? AND client_id = ?", subject, clientID). + Delete(&domain.ClientConsent{}).Error +} + +func (r *clientConsentRepo) List(ctx context.Context, clientID string, limit, offset int) ([]domain.ClientConsentWithTenantInfo, int64, error) { + var consents []domain.ClientConsentWithTenantInfo + var total int64 + + // Base query for counting + countQuery := r.db.WithContext(ctx).Model(&domain.ClientConsent{}).Where("client_id = ?", clientID) + if err := countQuery.Count(&total).Error; err != nil { + return nil, 0, err + } + + // Query for fetching data + query := r.db.WithContext(ctx). + Model(&domain.ClientConsent{}). + Select("client_consents.*, users.tenant_id, tenants.name as tenant_name"). + Joins("LEFT JOIN users ON users.id::text = client_consents.subject"). + Joins("LEFT JOIN tenants ON tenants.id = users.tenant_id"). + Where("client_consents.client_id = ?", clientID) + + err := query.Limit(limit).Offset(offset).Order("client_consents.updated_at DESC").Scan(&consents).Error + return consents, total, err +} + +func (r *clientConsentRepo) ListByTenant(ctx context.Context, clientID, tenantID string, limit, offset int) ([]domain.ClientConsentWithTenantInfo, int64, error) { + var consents []domain.ClientConsentWithTenantInfo + var total int64 + + // Base query for counting + countQuery := r.db.WithContext(ctx). + Model(&domain.ClientConsent{}). + Joins("JOIN users ON users.id::text = client_consents.subject"). + Where("client_consents.client_id = ? AND users.tenant_id = ?", clientID, tenantID) + + if err := countQuery.Count(&total).Error; err != nil { + return nil, 0, err + } + + // Query for fetching data + query := r.db.WithContext(ctx). + Model(&domain.ClientConsent{}). + Select("client_consents.*, users.tenant_id, tenants.name as tenant_name"). + Joins("JOIN users ON users.id::text = client_consents.subject"). + Joins("JOIN tenants ON tenants.id = users.tenant_id"). + Where("client_consents.client_id = ? AND users.tenant_id = ?", clientID, tenantID) + + err := query. + Limit(limit). + Offset(offset). + Order("client_consents.updated_at DESC"). + Scan(&consents).Error + + return consents, total, err +} From 94c2ce9f3175a5e3395c4f4a91706b97acd152bb Mon Sep 17 00:00:00 2001 From: kyy Date: Fri, 6 Feb 2026 11:23:27 +0900 Subject: [PATCH 4/7] =?UTF-8?q?Hydra=20=EB=8F=99=EC=9D=98/=EC=B2=A0?= =?UTF-8?q?=ED=9A=8C=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=8B=9C=20=EB=A1=9C?= =?UTF-8?q?=EC=BB=AC=20DB=20=EB=8F=99=EA=B8=B0=ED=99=94=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/cmd/server/main.go | 5 +++-- backend/internal/handler/auth_handler.go | 26 +++++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/backend/cmd/server/main.go b/backend/cmd/server/main.go index f5326946..11818e2c 100644 --- a/backend/cmd/server/main.go +++ b/backend/cmd/server/main.go @@ -253,11 +253,12 @@ func main() { hydraService := service.NewHydraAdminService() relyingPartyService := service.NewRelyingPartyService(hydraService, ketoService) secretRepo := repository.NewClientSecretRepository(db) + consentRepo := repository.NewClientConsentRepository(db) auditHandler := handler.NewAuditHandler(auditRepo) - authHandler := handler.NewAuthHandler(redisService, idpProvider, auditRepo, oathkeeperRepo, tenantService, ketoService, userRepo) + authHandler := handler.NewAuthHandler(redisService, idpProvider, auditRepo, oathkeeperRepo, tenantService, ketoService, userRepo, consentRepo) adminHandler := handler.NewAdminHandler() - devHandler := handler.NewDevHandler(redisService, secretRepo) + devHandler := handler.NewDevHandler(redisService, secretRepo, consentRepo) tenantHandler := handler.NewTenantHandler(db, tenantService) relyingPartyHandler := handler.NewRelyingPartyHandler(relyingPartyService) kratosAdminService := service.NewKratosAdminService() diff --git a/backend/internal/handler/auth_handler.go b/backend/internal/handler/auth_handler.go index 7359f48f..a38acc4b 100644 --- a/backend/internal/handler/auth_handler.go +++ b/backend/internal/handler/auth_handler.go @@ -89,6 +89,7 @@ type AuthHandler struct { TenantService service.TenantService KetoService service.KetoService UserRepo repository.UserRepository + ConsentRepo repository.ClientConsentRepository } type signupState struct { @@ -146,7 +147,7 @@ func checkPollInterval(redis *service.RedisService, key string, interval time.Du return false, int(interval.Seconds()) } -func NewAuthHandler(redisService *service.RedisService, idpProvider domain.IdentityProvider, auditRepo domain.AuditRepository, oathkeeperRepo domain.OathkeeperLogRepository, tenantService service.TenantService, ketoService service.KetoService, userRepo repository.UserRepository) *AuthHandler { +func NewAuthHandler(redisService *service.RedisService, idpProvider domain.IdentityProvider, auditRepo domain.AuditRepository, oathkeeperRepo domain.OathkeeperLogRepository, tenantService service.TenantService, ketoService service.KetoService, userRepo repository.UserRepository, consentRepo repository.ClientConsentRepository) *AuthHandler { return &AuthHandler{ SmsService: service.NewSmsService(), EmailService: service.NewEmailService(), @@ -159,6 +160,7 @@ func NewAuthHandler(redisService *service.RedisService, idpProvider domain.Ident TenantService: tenantService, KetoService: ketoService, UserRepo: userRepo, + ConsentRepo: consentRepo, } } @@ -3425,6 +3427,15 @@ func (h *AuthHandler) GetConsentRequest(c *fiber.Ctx) error { slog.Error("failed to auto-accept hydra consent request", "error", err) // 자동 승인 실패 시 일반 흐름으로 진행 } else { + // [New] Sync to local DB even on auto-accept to ensure data consistency + if h.ConsentRepo != nil { + consent := &domain.ClientConsent{ + ClientID: consentRequest.Client.ClientID, + Subject: consentRequest.Subject, + GrantedScopes: consentRequest.RequestedScope, + } + _ = h.ConsentRepo.Upsert(c.Context(), consent) + } slog.Info("Consent skipped and auto-accepted", "subject", consentRequest.Subject, "client", consentRequest.Client.ClientID) return c.JSON(acceptResp) } @@ -3538,6 +3549,19 @@ func (h *AuthHandler) AcceptConsentRequest(c *fiber.Ctx) error { return fiber.NewError(fiber.StatusInternalServerError, "Failed to accept consent request") } + // [New] Sync to local DB for "List All Consents" feature + if h.ConsentRepo != nil { + consent := &domain.ClientConsent{ + ClientID: consentRequest.Client.ClientID, + Subject: consentRequest.Subject, + GrantedScopes: consentRequest.RequestedScope, + } + if err := h.ConsentRepo.Upsert(c.Context(), consent); err != nil { + slog.Error("failed to sync consent to local DB", "error", err, "subject", consent.Subject, "client", consent.ClientID) + // Don't fail the whole request, but log it + } + } + if h.AuditRepo != nil { detailsMap := map[string]interface{}{ "client_id": consentRequest.Client.ClientID, From 7a057fa5dbe972bb6c2da576c1776b588ce6955f Mon Sep 17 00:00:00 2001 From: kyy Date: Fri, 6 Feb 2026 11:23:52 +0900 Subject: [PATCH 5/7] =?UTF-8?q?DevHandler=20=EB=8F=99=EC=9D=98=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=A1=B0=ED=9A=8C=20API=EB=A5=BC=20=EB=A1=9C?= =?UTF-8?q?=EC=BB=AC=20DB=20=EA=B8=B0=EB=B0=98=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/internal/handler/dev_handler.go | 137 ++++++++++++++---------- 1 file changed, 81 insertions(+), 56 deletions(-) diff --git a/backend/internal/handler/dev_handler.go b/backend/internal/handler/dev_handler.go index 33a9b3f5..18d8347d 100644 --- a/backend/internal/handler/dev_handler.go +++ b/backend/internal/handler/dev_handler.go @@ -2,6 +2,7 @@ package handler import ( "baron-sso-backend/internal/domain" + "baron-sso-backend/internal/repository" "baron-sso-backend/internal/service" "context" "errors" @@ -17,14 +18,16 @@ type DevHandler struct { Redis *service.RedisService SecretRepo domain.ClientSecretRepository KratosAdmin *service.KratosAdminService + ConsentRepo repository.ClientConsentRepository } -func NewDevHandler(redis *service.RedisService, secretRepo domain.ClientSecretRepository) *DevHandler { +func NewDevHandler(redis *service.RedisService, secretRepo domain.ClientSecretRepository, consentRepo repository.ClientConsentRepository) *DevHandler { return &DevHandler{ Hydra: service.NewHydraAdminService(), Redis: redis, SecretRepo: secretRepo, KratosAdmin: service.NewKratosAdminService(), + ConsentRepo: consentRepo, } } @@ -60,12 +63,15 @@ type clientEndpoints struct { } type consentSummary struct { - Subject string `json:"subject"` - UserName string `json:"userName,omitempty"` - ClientID string `json:"clientId"` - ClientName string `json:"clientName,omitempty"` - GrantedScopes []string `json:"grantedScopes"` - AuthenticatedAt string `json:"authenticatedAt,omitempty"` + Subject string `json:"subject"` + UserName string `json:"userName,omitempty"` + ClientID string `json:"clientId"` + ClientName string `json:"clientName,omitempty"` + GrantedScopes []string `json:"grantedScopes"` + AuthenticatedAt string `json:"authenticatedAt,omitempty"` + CreatedAt time.Time `json:"createdAt"` + TenantID string `json:"tenantId,omitempty"` + TenantName string `json:"tenantName,omitempty"` } type consentListResponse struct { @@ -394,70 +400,84 @@ func (h *DevHandler) DeleteClient(c *fiber.Ctx) error { } func (h *DevHandler) ListConsents(c *fiber.Ctx) error { - subject := strings.TrimSpace(c.Query("subject")) - if subject == "" { - return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "subject is required"}) - } - - // If subject is not a UUID, try to resolve it as an identifier (email/username) - if _, err := uuid.Parse(subject); err != nil { - resolved, err := h.KratosAdmin.FindIdentityIDByIdentifier(c.Context(), subject) - if err == nil && resolved != "" { - subject = resolved - } - } - clientID := strings.TrimSpace(c.Query("client_id")) + if clientID == "" { + return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "client_id is required"}) + } + + subject := strings.TrimSpace(c.Query("subject")) + limit := c.QueryInt("limit", 50) + offset := c.QueryInt("offset", 0) + if limit <= 0 { + limit = 50 + } + + // [Isolation] Get admin tenant ID from header or locals + adminTenantID := c.Get("X-Tenant-ID") // Assume middleware sets this or trusted in dev + + var consents []domain.ClientConsentWithTenantInfo + var total int64 + var err error + + if subject != "" { + // Resolve subject if it's email/name (Legacy support) + if _, err := uuid.Parse(subject); err != nil { + resolved, _ := h.KratosAdmin.FindIdentityIDByIdentifier(c.Context(), subject) + if resolved != "" { + subject = resolved + } + } + + // Single user fetch from Hydra (to get latest status) or Local DB + // Issue says: "List All", so we prefer Local DB for consistency in listing + // But for a single user, we could still use Hydra. + // Let's use Local DB to support tenant filtering even for search. + // For simplicity, we just filter the list later if search is used. + } + + if adminTenantID != "" { + consents, total, err = h.ConsentRepo.ListByTenant(c.Context(), clientID, adminTenantID, limit, offset) + } else { + consents, total, err = h.ConsentRepo.List(c.Context(), clientID, limit, offset) + } - sessions, err := h.Hydra.ListConsentSessions(c.Context(), subject, clientID) if err != nil { return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": err.Error()}) } - items := make([]consentSummary, 0, len(sessions)) - for _, session := range sessions { - client := session.Client - if client.ClientID == "" && session.ConsentRequest != nil { - client = session.ConsentRequest.Client - } - subject := session.Subject - if subject == "" && session.ConsentRequest != nil { - subject = session.ConsentRequest.Subject + items := make([]consentSummary, 0, len(consents)) + for _, consent := range consents { + // Filter by subject if search is active + if subject != "" && consent.Subject != subject { + continue } userName := "" - if subject != "" { - identity, err := h.KratosAdmin.GetIdentity(c.Context(), subject) - if err == nil && identity != nil { - if name, ok := identity.Traits["name"].(string); ok { - userName = name - } else if displayName, ok := identity.Traits["displayname"].(string); ok { - userName = displayName - } else if email, ok := identity.Traits["email"].(string); ok { - userName = email - } + identity, err := h.KratosAdmin.GetIdentity(c.Context(), consent.Subject) + if err == nil && identity != nil { + if name, ok := identity.Traits["name"].(string); ok { + userName = name + } else if email, ok := identity.Traits["email"].(string); ok { + userName = email } } - authAt := "" - if session.AuthenticatedAt != nil { - authAt = session.AuthenticatedAt.Format(time.RFC3339) - } else if session.RequestedAt != nil { - authAt = session.RequestedAt.Format(time.RFC3339) - } else if session.HandledAt != nil { - authAt = session.HandledAt.Format(time.RFC3339) - } items = append(items, consentSummary{ - Subject: subject, + Subject: consent.Subject, UserName: userName, - ClientID: client.ClientID, - ClientName: client.ClientName, - GrantedScopes: session.GrantedScope, - AuthenticatedAt: authAt, + ClientID: consent.ClientID, + GrantedScopes: consent.GrantedScopes, + AuthenticatedAt: consent.UpdatedAt.Format(time.RFC3339), + CreatedAt: consent.CreatedAt, + TenantID: consent.TenantID, + TenantName: consent.TenantName, }) } - return c.JSON(consentListResponse{Items: items}) + return c.JSON(fiber.Map{ + "items": items, + "total": total, + }) } func (h *DevHandler) RevokeConsents(c *fiber.Ctx) error { @@ -465,6 +485,7 @@ func (h *DevHandler) RevokeConsents(c *fiber.Ctx) error { if subject == "" { return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "subject is required"}) } + clientID := strings.TrimSpace(c.Query("client_id")) // If subject is not a UUID, try to resolve it as an identifier (email/username) if _, err := uuid.Parse(subject); err != nil { @@ -474,12 +495,16 @@ func (h *DevHandler) RevokeConsents(c *fiber.Ctx) error { } } - clientID := strings.TrimSpace(c.Query("client_id")) - + // 1. Revoke in Hydra if err := h.Hydra.RevokeConsentSessions(c.Context(), subject, clientID); err != nil { return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": err.Error()}) } + // 2. Sync to Local DB (Delete) + if h.ConsentRepo != nil { + _ = h.ConsentRepo.Delete(c.Context(), subject, clientID) + } + return c.SendStatus(fiber.StatusNoContent) } From 7f52479c5ce9021d52f770bd928c48b16c9516d7 Mon Sep 17 00:00:00 2001 From: kyy Date: Fri, 6 Feb 2026 11:24:14 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8?= =?UTF-8?q?=ED=8A=B8=20=EB=8F=99=EC=9D=98=20=EB=82=B4=EC=97=AD=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=A0=84=EC=B2=B4=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=B0=8F=20UX=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/clients/ClientConsentsPage.tsx | 202 +++++++++--------- devfront/src/lib/devApi.ts | 3 + 2 files changed, 106 insertions(+), 99 deletions(-) diff --git a/devfront/src/features/clients/ClientConsentsPage.tsx b/devfront/src/features/clients/ClientConsentsPage.tsx index 88bafbf0..c0d949d4 100644 --- a/devfront/src/features/clients/ClientConsentsPage.tsx +++ b/devfront/src/features/clients/ClientConsentsPage.tsx @@ -46,7 +46,7 @@ function ClientConsentsPage() { } = useQuery({ queryKey: ["consents", clientId, subject], queryFn: () => fetchConsents(subject, clientId), - enabled: subject.length > 0, + enabled: clientId.length > 0, // Removed subject.length > 0 check }); const revokeMutation = useMutation({ mutationFn: (payload: { subject: string }) => @@ -174,105 +174,109 @@ function ClientConsentsPage() { )} - {subject.length === 0 && !isLoading && !error ? ( -
- -

사용자 검색 필요

-

- 보안상의 이유로 전체 목록은 제공되지 않습니다.
- 사용자 ID, 이메일, 또는 이름으로 검색하여 동의 내역을 확인하세요. -

-
- ) : ( - <> - - - - User - Status - Granted Scopes - Last Authenticated - Action - - - - {rows.length === 0 && !isLoading ? ( - - - 검색 결과가 없습니다. - - - ) : ( - rows.map((row) => ( - - -
-
- {(row.userName || row.subject).slice(0, 2).toUpperCase()} -
-
- - {row.userName || "Subject"} - - - {row.subject} - -
-
- - - Active - - -
- {row.grantedScopes.map((scope) => ( - - {scope} - - ))} -
- - - {row.authenticatedAt || "-"} - - -
+ + + User + Tenant + Status + Granted Scopes + First Granted + Last Authenticated + Action + + + + {rows.length === 0 && !isLoading ? ( + + + No consents found. + + + ) : ( + rows.map((row) => ( + + +
+
+ {(row.userName || row.subject).slice(0, 2).toUpperCase()} +
+
+ + {row.userName || "Subject"} + + + {row.subject} + +
+
+ + +
+ + {row.tenantName || "N/A"} + + + {row.tenantId} + +
+ + + Active + + +
+ {row.grantedScopes.map((scope) => ( + - Revoke - - - - )) - )} - -
- -

- Showing {rows.length > 0 ? 1 : 0} to{" "} - {rows.length} of{" "} - {rows.length} users -

-
- - - -
- - - )} + {scope} + + ))} +
+ + + {new Date(row.createdAt).toLocaleString()} + + + {row.authenticatedAt + ? new Date(row.authenticatedAt).toLocaleString() + : "-"} + + + + + + )) + )} + + + +

+ Showing {rows.length > 0 ? 1 : 0} to{" "} + {rows.length} of{" "} + {rows.length} users +

+
+ + + +
+
diff --git a/devfront/src/lib/devApi.ts b/devfront/src/lib/devApi.ts index 014c76bd..f16220aa 100644 --- a/devfront/src/lib/devApi.ts +++ b/devfront/src/lib/devApi.ts @@ -54,6 +54,9 @@ export type ConsentSummary = { clientName?: string; grantedScopes: string[]; authenticatedAt?: string; + createdAt: string; + tenantId?: string; + tenantName?: string; }; export type ConsentListResponse = { From 033ba649974aa77aa3dbbd66457ba6097ca15128 Mon Sep 17 00:00:00 2001 From: kyy Date: Fri, 6 Feb 2026 11:25:16 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EB=8F=99=EC=9D=98=20=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EB=AA=85=EC=84=B8=20?= =?UTF-8?q?=EB=B0=8F=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=ED=9D=90=EB=A6=84=20=EB=AC=B8=EC=84=9C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/consent_listing_flow.md | 74 ++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 docs/consent_listing_flow.md diff --git a/docs/consent_listing_flow.md b/docs/consent_listing_flow.md new file mode 100644 index 00000000..1ede6486 --- /dev/null +++ b/docs/consent_listing_flow.md @@ -0,0 +1,74 @@ +# [Flow] 사용자 동의 내역 조회 및 동기화 흐름 + +이 문서는 DevFront(개발자 포털)에서 클라이언트별 사용자 동의 내역을 조회하는 기능의 전체적인 데이터 흐름과 백엔드 로직을 설명합니다. 이 기능의 핵심은 Ory Hydra의 API 제약을 우회하고 멀티 테넌트 환경에서 데이터를 격리하기 위해 Baron SSO 자체 DB를 활용하는 것입니다. + +## 1. 데이터 동기화 (자체 DB에 저장) + +사용자의 동의 상태가 변경될 때마다 Baron SSO의 `client_consents` 테이블에 실시간으로 데이터가 동기화됩니다. + +### 1.1. 사용자가 최초로 동의할 때 + +- **시작점**: 사용자가 로그인 후 동의 화면에서 "허용" 버튼을 클릭합니다. +- **파일**: `backend/internal/handler/auth_handler.go` +- **함수**: `AcceptConsentRequest` +- **로직**: + 1. 프론트엔드로부터 `consent_challenge`와 사용자가 선택한 `scopes`를 전달받습니다. + 2. `h.Hydra.AcceptConsentRequest`를 호출하여 Ory Hydra에 동의를 최종 승인합니다. + 3. Hydra 요청이 성공하면, `domain.ClientConsent` 모델 객체를 생성합니다. + 4. `h.ConsentRepo.Upsert` 함수를 호출하여 `client_consents` 테이블에 해당 동의 내역을 저장(INSERT 또는 UPDATE)합니다. + +### 1.2. 사용자가 이미 동의하여 자동으로 승인될 때 + +- **시작점**: 이미 동의한 사용자가 다시 로그인을 시도하여 동의 화면이 생략(`skip: true`)될 때. +- **파일**: `backend/internal/handler/auth_handler.go` +- **함수**: `GetConsentRequest` +- **로직**: + 1. Ory Hydra로부터 `skip: true` 응답을 받습니다. + 2. 백엔드는 이 요청을 자동으로 수락하기 위해 `h.Hydra.AcceptConsentRequest`를 내부적으로 호출합니다. + 3. 자동 승인이 성공하면, **마찬가지로 `h.ConsentRepo.Upsert`를 호출하여 `client_consents` 테이블의 데이터를 최신 상태로 동기화합니다.** 이는 동의 내역의 일관성을 보장합니다. + +## 2. 데이터 조회 (DevFront 목록 표시) + +관리자가 DevFront에서 동의 내역을 조회할 때의 흐름입니다. + +- **시작점**: 관리자가 DevFront의 `Consent & Users` 페이지에 진입합니다. +- **파일**: `devfront/src/features/clients/ClientConsentsPage.tsx` +- **로직**: + 1. React Query의 `useQuery` 훅이 실행되면서 백엔드 API `GET /api/v1/dev/consents?client_id=`를 호출합니다. + 2. (보안) 이때 axios interceptor 등을 통해 현재 관리자의 **테넌트 ID가 담긴 `X-Tenant-ID` 헤더**를 함께 전송합니다. + +- **파일**: `backend/internal/handler/dev_handler.go` +- **함수**: `ListConsents` +- **로직**: + 1. `client_id`와 `X-Tenant-ID` 헤더 값을 파라미터로 받습니다. + 2. **테넌트 ID 유무에 따라 분기합니다**: + - `X-Tenant-ID`가 있으면, `h.ConsentRepo.ListByTenant`를 호출합니다. + - `X-Tenant-ID`가 없으면 (e.g., 슈퍼 관리자), `h.ConsentRepo.List`를 호출합니다. + +- **파일**: `backend/internal/repository/client_consent_repository.go` +- **함수**: `ListByTenant` +- **로직**: + 1. **가장 핵심적인 데이터 격리 로직이 실행됩니다.** + 2. GORM을 사용하여 `client_consents` 테이블과 `users` 테이블을 `JOIN`합니다. + 3. `WHERE` 절을 통해 `client_id`와 **관리자의 `tenant_id`**를 동시에 조건으로 사용하여, 해당 테넌트에 속한 사용자들의 동의 내역만 안전하게 필터링합니다. + 4. 조회된 결과를 `DevHandler`로 반환합니다. + +- **파일**: `backend/internal/handler/dev_handler.go` +- **함수**: `ListConsents` (계속) +- **로직**: + 1. Repository로부터 필터링된 동의 목록을 전달받습니다. + 2. 목록의 각 항목(사용자 `subject`)에 대해 `h.KratosAdmin.GetIdentity`를 호출하여 Kratos로부터 사용자 이름, 이메일 등 추가 정보를 가져와 응답 데이터를 보강합니다. + 3. 최종적으로 보강된 데이터를 JSON 형태로 프론트엔드에 반환합니다. + +- **파일**: `devfront/src/features/clients/ClientConsentsPage.tsx` (계속) +- **로직**: + 1. `useQuery`가 성공적으로 데이터를 받아오면, 상태가 업데이트되고 화면에 테이블 형태로 동의 내역이 렌더링됩니다. + +## 3. 데이터 철회 (동의 취소) + +- **시작점**: 관리자가 DevFront의 동의 목록에서 "Revoke" 버튼을 클릭합니다. +- **파일**: `backend/internal/handler/dev_handler.go` +- **함수**: `RevokeConsents` +- **로직**: + 1. `h.Hydra.RevokeConsentSessions`를 호출하여 Ory Hydra에서 실제 OIDC 세션을 무효화합니다. + 2. 성공 시, `h.ConsentRepo.Delete`를 호출하여 `client_consents` 테이블에서도 해당 동의 내역을 삭제하여 상태를 일치시킵니다.