Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Role 구조체 변경으로 인한 Organization 생성 시 발생하는 Bugfix #335

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Role 구조체 변경으로 인한 Organization 생성 시 발생하는 Bugfix #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb689b5
bugfix. fix error on Oragnization Creation API
cho4036 Apr 4, 2024
77ea054
swagger fix
cho4036 Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions internal/delivery/http/organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ func NewOrganizationHandler(u usecase.Usecase) *OrganizationHandler {
// CreateOrganization godoc
//
// @Tags Organizations
// @Summary Create organization
// @Description Create organization
// @Summary Create organization in Admin portal
// @Description Create organization in Admin portal
// @Accept json
// @Produce json
// @Param body body domain.CreateOrganizationRequest true "create organization request"
// @Success 200 {object} object
// @Router /organizations [post]
// @Router /admin/organizations [post]
// @Security JWT
func (h *OrganizationHandler) Admin_CreateOrganization(w http.ResponseWriter, r *http.Request) {
input := domain.CreateOrganizationRequest{}
Expand Down Expand Up @@ -114,6 +114,13 @@ func (h *OrganizationHandler) Admin_CreateOrganization(w http.ResponseWriter, r
return
}

role, err := h.roleUsecase.GetTksRole(r.Context(), organizationId, adminRoleId)
if err != nil {
log.Errorf(r.Context(), "error is :%s(%T)", err.Error(), err)
ErrorJSON(w, r, err)
return
}

user := model.User{
Organization: model.Organization{
ID: organizationId,
Expand All @@ -122,9 +129,7 @@ func (h *OrganizationHandler) Admin_CreateOrganization(w http.ResponseWriter, r
Name: input.AdminName,
Email: input.AdminEmail,
Roles: []model.Role{
{
ID: adminRoleId,
},
*role,
},
}
// Admin user 생성
Expand Down
82 changes: 0 additions & 82 deletions internal/keycloak/keycloak.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,50 +267,6 @@ func (k *Keycloak) CreateRealm(ctx context.Context, organizationId string) (stri
return "", err
}
}
adminGroupUuid, err := k.createGroup(ctx, token.AccessToken, organizationId, "admin@"+organizationId)
if err != nil {
return realmUUID, err
}

realmManagementClientUuid, err := k.getClientByClientId(ctx, token.AccessToken, organizationId, "realm-management")
if err != nil {
return realmUUID, err
}

realmAdminRole, err := k.getClientRole(ctx, token.AccessToken, organizationId, realmManagementClientUuid, "realm-admin")
if err != nil {
return realmUUID, err
}

err = k.addClientRoleToGroup(ctx, token.AccessToken, organizationId, realmManagementClientUuid, adminGroupUuid,
&gocloak.Role{
ID: realmAdminRole.ID,
Name: realmAdminRole.Name,
})

if err != nil {
return "", err
}

userGroupUuid, err := k.createGroup(ctx, token.AccessToken, organizationId, "user@"+organizationId)
if err != nil {
return "", err
}

viewUserRole, err := k.getClientRole(ctx, token.AccessToken, organizationId, realmManagementClientUuid, "view-users")
if err != nil {
return "", err
}

err = k.addClientRoleToGroup(ctx, token.AccessToken, organizationId, realmManagementClientUuid, userGroupUuid,
&gocloak.Role{
ID: viewUserRole.ID,
Name: viewUserRole.Name,
})

if err != nil {
return "", err
}

// TODO: implement leader, member, viewer
//leaderGroup, err := c.ensureGroup(ctx, token, realmName, "leader@"+realmName)
Expand Down Expand Up @@ -810,44 +766,6 @@ func (k *Keycloak) ensureGroup(ctx context.Context, token *gocloak.JWT, realm st

return groups[0], err
}
func (k *Keycloak) createGroup(ctx context.Context, accessToken string, realm string, groupName string) (string, error) {
id, err := k.client.CreateGroup(context.Background(), accessToken, realm, gocloak.Group{Name: gocloak.StringP(groupName)})
if err != nil {
log.Error(ctx, "Creating Group is failed", err)
return "", err
}
return id, nil
}

func (k *Keycloak) getClientByClientId(ctx context.Context, accessToken string, realm string, clientId string) (
string, error) {
clients, err := k.client.GetClients(context.Background(), accessToken, realm, gocloak.GetClientsParams{ClientID: &clientId})
if err != nil {
log.Error(ctx, "Getting Client is failed", err)
return "", err
}
return *clients[0].ID, nil
}

func (k *Keycloak) getClientRole(ctx context.Context, accessToken string, realm string, clientUuid string,
roleName string) (*gocloak.Role, error) {
role, err := k.client.GetClientRole(context.Background(), accessToken, realm, clientUuid, roleName)
if err != nil {
log.Error(ctx, "Getting Client Role is failed", err)
return nil, err
}
return role, nil
}

func (k *Keycloak) addClientRoleToGroup(ctx context.Context, accessToken string, realm string, clientUuid string,
groupUuid string, role *gocloak.Role) error {
err := k.client.AddClientRolesToGroup(context.Background(), accessToken, realm, clientUuid, groupUuid, []gocloak.Role{*role})
if err != nil {
log.Error(ctx, "Adding Client Role to Group is failed", err)
return err
}
return nil
}

func (k *Keycloak) createClientProtocolMapper(ctx context.Context, accessToken string, realm string,
id string, mapper gocloak.ProtocolMapperRepresentation) (string, error) {
Expand Down
Loading