kevin/baron-sso
1
0
Fork 0
forked from baron/baron-sso
Code Pull Requests Activity

code-check 및 사용자 상세 claim 관련 오류 수정

Browse Source
This commit is contained in:
김용연
2026-06-10 10:37:51 +09:00
parent 4c9d219fd4
commit 85c2eb1690
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
adminfront/tests/users.spec.ts
View File

@@ -315,7 +315,7 @@ test.describe("User Management", () => {
await expect(page.getByText(/저장/i).first()).toBeVisible(); await expect(page.getByText(/저장/i).first()).toBeVisible();
}); });
test("should manage global custom claim permissions in user detail", async ({ test("should manage global custom claim values in user detail", async ({
page, page,
}) => { }) => {
let updatePayload: Record<string, unknown> | undefined; let updatePayload: Record<string, unknown> | undefined;
@@ -375,19 +375,14 @@ test.describe("User Management", () => {
.getByRole("tab", { name: /전역 Custom Claims|Custom Claims/i }) .getByRole("tab", { name: /전역 Custom Claims|Custom Claims/i })
.click(); .click();
await expect( await expect(page.getByText("contract_date")).toBeVisible();
page.getByTestId("global-custom-claim-key-contract_date"), const valueInput = page.getByTestId(
).toHaveValue("contract_date"); "global-custom-claim-value-contract_date",
await expect( );
page.getByTestId("global-custom-claim-read-permission-contract_date"), await expect(valueInput).toHaveValue("2026-06-09");
).toHaveValue("user_and_admin"); await expect(valueInput).toHaveAttribute("type", "date");
await expect(
page.getByTestId("global-custom-claim-write-permission-contract_date"),
).toHaveValue("admin_only");
await page await valueInput.fill("2026-07-01");
.getByTestId("global-custom-claim-write-permission-contract_date")
.selectOption("user_and_admin");
await page.screenshot({ await page.screenshot({
path: "test-results/adminfront-global-custom-claim-permissions.png", path: "test-results/adminfront-global-custom-claim-permissions.png",
@@ -403,15 +398,15 @@ test.describe("User Management", () => {
.toMatchObject({ .toMatchObject({
metadata: { metadata: {
global_custom_claims: { global_custom_claims: {
contract_date: "2026-06-09", contract_date: "2026-07-01",
}, },
global_custom_claim_types: { global_custom_claim_types: {
contract_date: "date", contract_date: "date",
}, },
global_custom_claim_permissions: { global_custom_claim_permissions: {
contract_date: { contract_date: {
readPermission: "user_and_admin", readPermission: "admin_only",
writePermission: "user_and_admin", writePermission: "admin_only",
}, },
}, },
}, },

9
backend/internal/handler/dev_handler.go
View File

@@ -49,9 +49,10 @@ type DevHandler struct {
type developerRequestService interface { type developerRequestService interface {
RequestAccess(ctx context.Context, req domain.DeveloperRequest) error RequestAccess(ctx context.Context, req domain.DeveloperRequest) error
GetRequestStatus(ctx context.Context, userID, tenantID string) (*domain.DeveloperRequest, error) GetRequestStatus(ctx context.Context, userID, tenantID string) (*domain.DeveloperAccessStatus, error)
GetRequestByID(ctx context.Context, id uint) (*domain.DeveloperRequest, error) GetRequestByID(ctx context.Context, id uint) (*domain.DeveloperRequest, error)
ListRequests(ctx context.Context, userID, status string) ([]domain.DeveloperRequest, error) ListRequests(ctx context.Context, userID, status, tenantID string) ([]domain.DeveloperRequest, error)
CreateGrant(ctx context.Context, req domain.DeveloperRequest) error
ApproveRequest(ctx context.Context, id uint, adminNotes string) error ApproveRequest(ctx context.Context, id uint, adminNotes string) error
RejectRequest(ctx context.Context, id uint, adminNotes string) error RejectRequest(ctx context.Context, id uint, adminNotes string) error
CancelApprovedRequest(ctx context.Context, id uint, adminNotes string) error CancelApprovedRequest(ctx context.Context, id uint, adminNotes string) error
@@ -505,9 +506,7 @@ func (h *DevHandler) hasApprovedDeveloperRequest(c *fiber.Ctx, profile *domain.U
if err != nil || status == nil { if err != nil || status == nil {
return false return false
} }
return status.Status == domain.DeveloperRequestStatusApproved && return status.Status == domain.DeveloperRequestStatusApproved
strings.TrimSpace(status.UserID) == userID &&
strings.TrimSpace(status.TenantID) == tenantID
} }
func (h *DevHandler) canOperateClientByPermit(c *fiber.Ctx, profile *domain.UserProfileResponse, summary clientSummary, relation string) bool { func (h *DevHandler) canOperateClientByPermit(c *fiber.Ctx, profile *domain.UserProfileResponse, summary clientSummary, relation string) bool {

15
backend/internal/handler/dev_handler_test.go
View File

@@ -71,10 +71,10 @@ func (m *devMockDeveloperService) RequestAccess(ctx context.Context, req domain.
return args.Error(0) return args.Error(0)
} }
func (m *devMockDeveloperService) GetRequestStatus(ctx context.Context, userID, tenantID string) (*domain.DeveloperRequest, error) { func (m *devMockDeveloperService) GetRequestStatus(ctx context.Context, userID, tenantID string) (*domain.DeveloperAccessStatus, error) {
args := m.Called(ctx, userID, tenantID) args := m.Called(ctx, userID, tenantID)
if req, ok := args.Get(0).(*domain.DeveloperRequest); ok { if status, ok := args.Get(0).(*domain.DeveloperAccessStatus); ok {
return req, args.Error(1) return status, args.Error(1)
} }
return nil, args.Error(1) return nil, args.Error(1)
} }
@@ -87,14 +87,19 @@ func (m *devMockDeveloperService) GetRequestByID(ctx context.Context, id uint) (
return nil, args.Error(1) return nil, args.Error(1)
} }
func (m *devMockDeveloperService) ListRequests(ctx context.Context, userID, status string) ([]domain.DeveloperRequest, error) { func (m *devMockDeveloperService) ListRequests(ctx context.Context, userID, status, tenantID string) ([]domain.DeveloperRequest, error) {
args := m.Called(ctx, userID, status) args := m.Called(ctx, userID, status, tenantID)
if requests, ok := args.Get(0).([]domain.DeveloperRequest); ok { if requests, ok := args.Get(0).([]domain.DeveloperRequest); ok {
return requests, args.Error(1) return requests, args.Error(1)
} }
return nil, args.Error(1) return nil, args.Error(1)
} }
func (m *devMockDeveloperService) CreateGrant(ctx context.Context, req domain.DeveloperRequest) error {
args := m.Called(ctx, req)
return args.Error(0)
}
func (m *devMockDeveloperService) ApproveRequest(ctx context.Context, id uint, adminNotes string) error { func (m *devMockDeveloperService) ApproveRequest(ctx context.Context, id uint, adminNotes string) error {
args := m.Called(ctx, id, adminNotes) args := m.Called(ctx, id, adminNotes)
return args.Error(0) return args.Error(0)