Merge pull request #6 from containerum/develop

Develop

pkg/clients/oauth.go

@@ -9,7 +9,7 @@ import (
 
 	"time"
 
-	cherry "git.containerum.net/ch/user-manager/pkg/umErrors"
+	cherry "git.containerum.net/ch/user-manager/pkg/umerrors"
 	"github.com/json-iterator/go"
 	"gopkg.in/resty.v1"
 )

pkg/clients/permissions.go

@@ -64,7 +64,7 @@ func (c *httpPermissionsClient) GetUserAccess(ctx context.Context, user *db.User
 func (c *httpPermissionsClient) DeleteUserNamespaces(ctx context.Context, user *db.User) error {
 	c.log.WithField("user_id", user.ID).Info("Deleting user namespaces")
 	headersMap := utils.RequestHeadersMap(ctx)
-	headersMap[headers.UserIDXHeader] = user.ID
+	headersMap["X-User-Id"] = user.ID
 	headersMap[headers.UserRoleXHeader] = user.Role
 	resp, err := c.rest.R().SetContext(ctx).
 		SetResult(authProto.ResourcesAccess{}).

pkg/db/postgres.go

@@ -159,7 +159,7 @@ type DB interface {
 
 	GetGroup(ctx context.Context, groupID string) (*UserGroup, error)
 	GetGroupMembers(ctx context.Context, groupID string) ([]UserGroupMember, error)
-	GetUserGroupsIDsAccesses(ctx context.Context, userID string) (map[string]string, error)
+	GetUserGroupsIDsAccesses(ctx context.Context, userID string, isAdmin bool) (map[string]string, error)
 	GetGroupListLabelID(ctx context.Context, ids []string) ([]UserGroup, error)
 	GetGroupListByIDs(ctx context.Context, ids []string) ([]UserGroup, error)
 	CreateGroup(ctx context.Context, group *UserGroup) error

pkg/db/postgres/groups.go

@@ -73,11 +73,17 @@ func (pgdb *pgDB) GetGroupMembers(ctx context.Context, groupID string) ([]db.Use
 	return resp, err
 }
 
-func (pgdb *pgDB) GetUserGroupsIDsAccesses(ctx context.Context, userID string) (map[string]string, error) {
+func (pgdb *pgDB) GetUserGroupsIDsAccesses(ctx context.Context, userID string, isAdmin bool) (map[string]string, error) {
 	pgdb.log.Infoln("Get users groups", userID)
 	resp := make(map[string]string)
 
-	rows, err := pgdb.qLog.QueryxContext(ctx, "SELECT group_id, default_access FROM groups_members WHERE user_id = $1", userID)
+	var rows *sqlx.Rows
+	var err error
+	if isAdmin {
+		rows, err = pgdb.qLog.QueryxContext(ctx, "SELECT group_id, default_access FROM groups_members")
+	} else {
+		rows, err = pgdb.qLog.QueryxContext(ctx, "SELECT group_id, default_access FROM groups_members WHERE user_id = $1", userID)
+	}
 	if err != nil {
 		return nil, err
 	}

pkg/router/handlers/accounts.go

@@ -6,7 +6,7 @@ import (
 	"git.containerum.net/ch/user-manager/pkg/models"
 	m "git.containerum.net/ch/user-manager/pkg/router/middleware"
 	"git.containerum.net/ch/user-manager/pkg/server"
-	"git.containerum.net/ch/user-manager/pkg/umErrors"
+	"git.containerum.net/ch/user-manager/pkg/umerrors"
 	"git.containerum.net/ch/user-manager/pkg/validation"
 	"github.com/containerum/cherry"
 	"github.com/containerum/cherry/adaptors/gonic"
@@ -38,7 +38,7 @@ func GetBoundAccountsHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableGetUserInfo(), ctx)
+			gonic.Gonic(umerrors.ErrUnableGetUserInfo(), ctx)
 		}
 		return
 	}
@@ -68,12 +68,12 @@ func AddBoundAccountHandler(ctx *gin.Context) {
 
 	var request models.OAuthLoginRequest
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
 	if errs := validation.ValidateOAuthLoginRequest(request); errs != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(errs...), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(errs...), ctx)
 		return
 	}
 
@@ -83,7 +83,7 @@ func AddBoundAccountHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableBindAccount(), ctx)
+			gonic.Gonic(umerrors.ErrUnableBindAccount(), ctx)
 		}
 		return
 	}
@@ -114,12 +114,12 @@ func DeleteBoundAccountHandler(ctx *gin.Context) {
 
 	var request models.BoundAccountDeleteRequest
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
 	if errs := validation.ValidateResource(request); errs != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(errs...), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(errs...), ctx)
 		return
 	}
 
@@ -129,7 +129,7 @@ func DeleteBoundAccountHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableUnbindAccount(), ctx)
+			gonic.Gonic(umerrors.ErrUnableUnbindAccount(), ctx)
 		}
 		return
 	}

pkg/router/handlers/admin.go

@@ -6,7 +6,7 @@ import (
 	"git.containerum.net/ch/user-manager/pkg/models"
 	m "git.containerum.net/ch/user-manager/pkg/router/middleware"
 	"git.containerum.net/ch/user-manager/pkg/server"
-	"git.containerum.net/ch/user-manager/pkg/umErrors"
+	"git.containerum.net/ch/user-manager/pkg/umerrors"
 	"git.containerum.net/ch/user-manager/pkg/validation"
 	"github.com/containerum/cherry"
 	"github.com/containerum/cherry/adaptors/gonic"
@@ -38,13 +38,13 @@ func AdminUserCreateHandler(ctx *gin.Context) {
 
 	var request models.UserLogin
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
 	errs := validation.ValidateUserLogin(request)
 	if errs != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(errs...), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(errs...), ctx)
 		return
 	}
 
@@ -54,7 +54,7 @@ func AdminUserCreateHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableCreateUser(), ctx)
+			gonic.Gonic(umerrors.ErrUnableCreateUser(), ctx)
 		}
 		return
 	}
@@ -84,7 +84,7 @@ func AdminUserActivateHandler(ctx *gin.Context) {
 
 	var request models.UserLogin
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
@@ -93,7 +93,7 @@ func AdminUserActivateHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableDeleteUser(), ctx)
+			gonic.Gonic(umerrors.ErrUnableDeleteUser(), ctx)
 		}
 		return
 	}
@@ -124,7 +124,7 @@ func AdminUserDeactivateHandler(ctx *gin.Context) {
 	var request models.UserLogin
 
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
@@ -134,7 +134,7 @@ func AdminUserDeactivateHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableDeleteUser(), ctx)
+			gonic.Gonic(umerrors.ErrUnableDeleteUser(), ctx)
 		}
 		return
 	}
@@ -165,7 +165,7 @@ func AdminSetAdminHandler(ctx *gin.Context) {
 	var request models.UserLogin
 
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
@@ -175,7 +175,7 @@ func AdminSetAdminHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableDeleteUser(), ctx)
+			gonic.Gonic(umerrors.ErrUnableDeleteUser(), ctx)
 		}
 		return
 	}
@@ -206,7 +206,7 @@ func AdminUnsetAdminHandler(ctx *gin.Context) {
 	var request models.UserLogin
 
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
@@ -216,7 +216,7 @@ func AdminUnsetAdminHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableDeleteUser(), ctx)
+			gonic.Gonic(umerrors.ErrUnableDeleteUser(), ctx)
 		}
 		return
 	}
@@ -249,7 +249,7 @@ func AdminResetPasswordHandler(ctx *gin.Context) {
 	var request models.UserLogin
 
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
@@ -259,7 +259,7 @@ func AdminResetPasswordHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableDeleteUser(), ctx)
+			gonic.Gonic(umerrors.ErrUnableDeleteUser(), ctx)
 		}
 		return
 	}

pkg/router/handlers/domain_blacklist.go

@@ -6,7 +6,7 @@ import (
 	"git.containerum.net/ch/user-manager/pkg/models"
 	m "git.containerum.net/ch/user-manager/pkg/router/middleware"
 	"git.containerum.net/ch/user-manager/pkg/server"
-	"git.containerum.net/ch/user-manager/pkg/umErrors"
+	"git.containerum.net/ch/user-manager/pkg/umerrors"
 	"git.containerum.net/ch/user-manager/pkg/validation"
 	"github.com/containerum/cherry"
 	"github.com/containerum/cherry/adaptors/gonic"
@@ -38,7 +38,7 @@ func BlacklistDomainsListGetHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableGetDomainBlacklist(), ctx)
+			gonic.Gonic(umerrors.ErrUnableGetDomainBlacklist(), ctx)
 		}
 		return
 	}
@@ -74,7 +74,7 @@ func BlacklistDomainGetHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableGetDomainBlacklist(), ctx)
+			gonic.Gonic(umerrors.ErrUnableGetDomainBlacklist(), ctx)
 		}
 		return
 	}
@@ -104,13 +104,13 @@ func BlacklistDomainAddHandler(ctx *gin.Context) {
 
 	var request models.Domain
 	if err := ctx.ShouldBindWith(&request, binding.JSON); err != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(err), ctx)
 		return
 	}
 
 	errs := validation.ValidateDomain(request)
 	if errs != nil {
-		gonic.Gonic(umErrors.ErrRequestValidationFailed().AddDetailsErr(errs...), ctx)
+		gonic.Gonic(umerrors.ErrRequestValidationFailed().AddDetailsErr(errs...), ctx)
 		return
 	}
 
@@ -120,7 +120,7 @@ func BlacklistDomainAddHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableBlacklistDomain(), ctx)
+			gonic.Gonic(umerrors.ErrUnableBlacklistDomain(), ctx)
 		}
 		return
 	}
@@ -154,7 +154,7 @@ func BlacklistDomainDeleteHandler(ctx *gin.Context) {
 			gonic.Gonic(cherr, ctx)
 		} else {
 			ctx.Error(err)
-			gonic.Gonic(umErrors.ErrUnableUnblacklistDomain(), ctx)
+			gonic.Gonic(umerrors.ErrUnableUnblacklistDomain(), ctx)
 		}
 		return
 	}