Merge remote-tracking branch 'origin/main'

backend/internal/domain/auth_models.go

@@ -54,14 +54,15 @@ type VerifySignupCodeRequest struct {
 }
 
 type SignupRequest struct {
-	Email           string `json:"email"`
-	Password        string `json:"password"`
-	Name            string `json:"name"`
-	Phone           string `json:"phone"`
-	AffiliationType string `json:"affiliationType"` // "AFFILIATE" or "GENERAL"
-	CompanyCode     string `json:"companyCode,omitempty"`
-	Department      string `json:"department"`
-	TermsAccepted   bool   `json:"termsAccepted"`
+	Email           string  `json:"email"`
+	Password        string  `json:"password"`
+	Name            string  `json:"name"`
+	Phone           string  `json:"phone"`
+	AffiliationType string  `json:"affiliationType"` // "AFFILIATE" or "GENERAL"
+	CompanyCode     string  `json:"companyCode,omitempty"`
+	Department      string  `json:"department"`
+	Metadata        JSONMap `json:"metadata,omitempty"`
+	TermsAccepted   bool    `json:"termsAccepted"`
 }
 
 // User Profile Models
@@ -71,9 +72,12 @@ type UserProfileResponse struct {
 	Email           string `json:"email"`
 	Name            string `json:"name"`
 	Phone           string `json:"phone"`
+	Role            string `json:"role"` // 추가
 	Department      string  `json:"department"`
 	AffiliationType string         `json:"affiliationType"`
 	CompanyCode     string         `json:"companyCode,omitempty"`
+	TenantID        *string        `json:"tenantId,omitempty"` // 추가
+	RelyingPartyID  *string        `json:"relyingPartyId,omitempty"` // 추가
 	Metadata        map[string]any `json:"metadata,omitempty"`
 	Tenant          *Tenant        `json:"tenant,omitempty"`
 }

backend/internal/domain/tenant.go

@@ -7,13 +7,21 @@ import (
 	"gorm.io/gorm"
 )
 
+// Tenant statuses
+const (
+	TenantStatusPending   = "pending"
+	TenantStatusActive    = "active"
+	TenantStatusSuspended = "suspended"
+	TenantStatusDeleted   = "deleted"
+)
+
 // Tenant represents a tenant model stored in PostgreSQL.
 type Tenant struct {
 	ID          string         `gorm:"primaryKey;type:uuid;default:gen_random_uuid()" json:"id"`
 	Name        string         `gorm:"not null" json:"name"`
 	Slug        string         `gorm:"uniqueIndex;not null" json:"slug"`
 	Description string         `json:"description"`
-	Status      string         `gorm:"default:'active'" json:"status"`
+	Status      string         `gorm:"default:'pending'" json:"status"`
 	Domains     []TenantDomain `gorm:"foreignKey:TenantID" json:"domains,omitempty"`
 	Config      JSONMap        `gorm:"type:jsonb" json:"config,omitempty"`
 	CreatedAt   time.Time      `json:"createdAt"`
@@ -21,6 +29,10 @@ type Tenant struct {
 	DeletedAt   gorm.DeletedAt `gorm:"index" json:"-"`
 }
 
+func (t *Tenant) IsActive() bool {
+	return t.Status == TenantStatusActive
+}
+
 // BeforeCreate hook to generate UUID if not present.
 func (t *Tenant) BeforeCreate(tx *gorm.DB) (err error) {
 	if t.ID == "" {

backend/internal/domain/user.go

@@ -7,6 +7,14 @@ import (
 	"gorm.io/gorm"
 )
 
+// User roles
+const (
+	RoleSuperAdmin  = "super_admin"  // 시스템 전역 관리자
+	RoleTenantAdmin = "tenant_admin" // 테넌트 관리자
+	RoleRPAdmin     = "rp_admin"     // 특정 앱(RP) 관리자
+	RoleUser        = "user"         // 일반 사용자
+)
+
 // User represents the user model stored in PostgreSQL
 type User struct {
 	ID              string         `gorm:"primaryKey;type:uuid;default:gen_random_uuid()" json:"id"`
@@ -14,11 +22,12 @@ type User struct {
 	PasswordHash    string         `gorm:"not null" json:"-"`
 	Name            string         `gorm:"not null" json:"name"`
 	Phone           string         `json:"phone"`
-	Role            string         `gorm:"default:'user'" json:"role"` // 'admin', 'user'
+	Role            string         `gorm:"default:'user';not null" json:"role"` // super_admin, tenant_admin, rp_admin, user
 	AffiliationType string         `json:"affiliationType"`
 	CompanyCode     string         `json:"companyCode"`
 	TenantID        *string        `gorm:"type:uuid;index" json:"tenantId,omitempty"`
 	Tenant          *Tenant        `gorm:"foreignKey:TenantID" json:"tenant,omitempty"`
+	RelyingPartyID  *string        `gorm:"type:uuid;index" json:"relyingPartyId,omitempty"` // RP Admin용
 	Department      string         `json:"department"`
 	Metadata        JSONMap        `gorm:"type:jsonb" json:"metadata,omitempty"`
 	Status          string         `gorm:"default:'active'" json:"status"`