fix: fix some requests (#198)

* fix: alway do permission check

* fix: alway do permission check

* fix: add project query to applications search request

* fix: add email template to statik

* fix: org members

internal/api/auth/authorization.go

@@ -20,10 +20,6 @@ func CheckUserAuthorization(ctx context.Context, req interface{}, token, orgID s
 	}
 
 	var perms []string
-	//TODO: Remove as soon as authentification is implemented
-	if CheckInternal(ctx) {
-		return ctx, nil
-	}
 	if requiredAuthOption.Permission == authenticated {
 		return ctx, nil
 	}

internal/auth/repository/eventsourcing/eventstore/user_session.go

@@ -13,7 +13,7 @@ type UserSessionRepo struct {
 }
 
 func (repo *UserSessionRepo) GetMyUserSessions(ctx context.Context) ([]*usr_model.UserSessionView, error) {
-	userSessions, err := repo.View.UserSessionsByUserID(auth.GetCtxData(ctx).UserID)
+	userSessions, err := repo.View.UserSessionsByAgentID(auth.GetCtxData(ctx).AgentID)
 	if err != nil {
 		return nil, err
 	}

internal/management/repository/eventsourcing/eventstore/org.go

@@ -2,6 +2,8 @@ package eventstore
 
 import (
 	"context"
+	"github.com/caos/zitadel/internal/api/auth"
+	"github.com/caos/zitadel/internal/model"
 	"strings"
 
 	"github.com/caos/zitadel/internal/errors"
@@ -48,21 +50,24 @@ func (repo *OrgRepository) OrgMemberByID(ctx context.Context, orgID, userID stri
 	return repo.OrgEventstore.OrgMemberByIDs(ctx, member)
 }
 
-func (repo *OrgRepository) AddOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error) {
+func (repo *OrgRepository) AddMyOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error) {
+	member.AggregateID = auth.GetCtxData(ctx).OrgID
 	return repo.OrgEventstore.AddOrgMember(ctx, member)
 }
 
-func (repo *OrgRepository) ChangeOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error) {
+func (repo *OrgRepository) ChangeMyOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error) {
+	member.AggregateID = auth.GetCtxData(ctx).OrgID
 	return repo.OrgEventstore.ChangeOrgMember(ctx, member)
 }
 
-func (repo *OrgRepository) RemoveOrgMember(ctx context.Context, orgID, userID string) error {
+func (repo *OrgRepository) RemoveMyOrgMember(ctx context.Context, userID string) error {
-	member := org_model.NewOrgMember(orgID, userID)
+	member := org_model.NewOrgMember(auth.GetCtxData(ctx).OrgID, userID)
 	return repo.OrgEventstore.RemoveOrgMember(ctx, member)
 }
 
-func (repo *OrgRepository) SearchOrgMembers(ctx context.Context, request *org_model.OrgMemberSearchRequest) (*org_model.OrgMemberSearchResponse, error) {
+func (repo *OrgRepository) SearchMyOrgMembers(ctx context.Context, request *org_model.OrgMemberSearchRequest) (*org_model.OrgMemberSearchResponse, error) {
 	request.EnsureLimit(repo.SearchLimit)
+	request.Queries[len(request.Queries)-1] = &org_model.OrgMemberSearchQuery{Key: org_model.ORGMEMBERSEARCHKEY_ORG_ID, Method: model.SEARCHMETHOD_EQUALS, Value: auth.GetCtxData(ctx).OrgID}
 	members, count, err := repo.View.SearchOrgMembers(request)
 	if err != nil {
 		return nil, err

internal/management/repository/org.go

@@ -13,10 +13,10 @@ type OrgRepository interface {
 	DeactivateOrg(ctx context.Context, id string) (*org_model.Org, error)
 	ReactivateOrg(ctx context.Context, id string) (*org_model.Org, error)
 
-	SearchOrgMembers(ctx context.Context, request *org_model.OrgMemberSearchRequest) (*org_model.OrgMemberSearchResponse, error)
+	SearchMyOrgMembers(ctx context.Context, request *org_model.OrgMemberSearchRequest) (*org_model.OrgMemberSearchResponse, error)
-	AddOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error)
+	AddMyOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error)
-	ChangeOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error)
+	ChangeMyOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error)
-	RemoveOrgMember(ctx context.Context, orgID, userID string) error
+	RemoveMyOrgMember(ctx context.Context, userID string) error
 
 	GetOrgMemberRoles() []string
 }

internal/notification/repository/eventsourcing/handler/handler.go

@@ -10,6 +10,7 @@ import (
 	"github.com/caos/zitadel/internal/i18n"
 	"github.com/caos/zitadel/internal/notification/repository/eventsourcing/view"
 	usr_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
+	"net/http"
 	"time"
 )
 
@@ -30,7 +31,7 @@ type EventstoreRepos struct {
 	UserEvents *usr_event.UserEventstore
 }
 
-func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, eventstore eventstore.Eventstore, repos EventstoreRepos, systemDefaults sd.SystemDefaults, i18n *i18n.Translator) []spooler.Handler {
+func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, eventstore eventstore.Eventstore, repos EventstoreRepos, systemDefaults sd.SystemDefaults, i18n *i18n.Translator, dir http.FileSystem) []spooler.Handler {
 	aesCrypto, err := crypto.NewAESCrypto(systemDefaults.UserVerificationKey)
 	if err != nil {
 		logging.Log("HANDL-s90ew").WithError(err).Debug("error create new aes crypto")
@@ -44,6 +45,7 @@ func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, ev
 			systemDefaults: systemDefaults,
 			AesCrypto:      aesCrypto,
 			i18n:           i18n,
+			statikDir:      dir,
 		},
 	}
 }

internal/notification/repository/eventsourcing/handler/notification.go

@@ -10,6 +10,7 @@ import (
 	"github.com/caos/zitadel/internal/notification/types"
 	usr_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
+	"net/http"
 	"time"
 
 	"github.com/caos/logging"
@@ -26,6 +27,7 @@ type Notification struct {
 	systemDefaults sd.SystemDefaults
 	AesCrypto      crypto.EncryptionAlgorithm
 	i18n           *i18n.Translator
+	statikDir      http.FileSystem
 }
 
 const (
@@ -77,7 +79,7 @@ func (n *Notification) handleInitUserCode(event *models.Event) (err error) {
 	if err != nil {
 		return err
 	}
-	err = types.SendUserInitCode(n.i18n, user, initCode, n.systemDefaults, n.AesCrypto)
+	err = types.SendUserInitCode(n.statikDir, n.i18n, user, initCode, n.systemDefaults, n.AesCrypto)
 	if err != nil {
 		return err
 	}
@@ -95,7 +97,7 @@ func (n *Notification) handlePasswordCode(event *models.Event) (err error) {
 	if err != nil {
 		return err
 	}
-	err = types.SendPasswordCode(n.i18n, user, pwCode, n.systemDefaults, n.AesCrypto)
+	err = types.SendPasswordCode(n.statikDir, n.i18n, user, pwCode, n.systemDefaults, n.AesCrypto)
 	if err != nil {
 		return err
 	}
@@ -113,7 +115,7 @@ func (n *Notification) handleEmailVerificationCode(event *models.Event) (err err
 	if err != nil {
 		return err
 	}
-	err = types.SendEmailVerificationCode(n.i18n, user, emailCode, n.systemDefaults, n.AesCrypto)
+	err = types.SendEmailVerificationCode(n.statikDir, n.i18n, user, emailCode, n.systemDefaults, n.AesCrypto)
 	if err != nil {
 		return err
 	}

internal/notification/repository/eventsourcing/repository.go

@@ -52,7 +52,7 @@ func Start(conf Config, dir http.FileSystem, systemDefaults sd.SystemDefaults) (
 		return nil, err
 	}
 	eventstoreRepos := handler.EventstoreRepos{UserEvents: user}
-	spool := spooler.StartSpooler(conf.Spooler, es, view, sqlClient, eventstoreRepos, systemDefaults, i18n)
+	spool := spooler.StartSpooler(conf.Spooler, es, view, sqlClient, eventstoreRepos, systemDefaults, i18n, dir)
 
 	return &EsRepository{
 		spool,

internal/notification/repository/eventsourcing/spooler/spooler.go

@@ -9,6 +9,7 @@ import (
 	"github.com/caos/zitadel/internal/notification/repository/eventsourcing/handler"
 	"github.com/caos/zitadel/internal/notification/repository/eventsourcing/view"
 	usr_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
+	"net/http"
 )
 
 type SpoolerConfig struct {
@@ -22,12 +23,12 @@ type EventstoreRepos struct {
 	UserEvents *usr_event.UserEventstore
 }
 
-func StartSpooler(c SpoolerConfig, es eventstore.Eventstore, view *view.View, sql *sql.DB, eventstoreRepos handler.EventstoreRepos, systemDefaults sd.SystemDefaults, i18n *i18n.Translator) *spooler.Spooler {
+func StartSpooler(c SpoolerConfig, es eventstore.Eventstore, view *view.View, sql *sql.DB, eventstoreRepos handler.EventstoreRepos, systemDefaults sd.SystemDefaults, i18n *i18n.Translator, dir http.FileSystem) *spooler.Spooler {
 	spoolerConfig := spooler.Config{
 		Eventstore:      es,
 		Locker:          &locker{dbClient: sql},
 		ConcurrentTasks: c.ConcurrentTasks,
-		ViewHandlers:    handler.Register(c.Handlers, c.BulkLimit, c.FailureCountUntilSkip, view, es, eventstoreRepos, systemDefaults, i18n),
+		ViewHandlers:    handler.Register(c.Handlers, c.BulkLimit, c.FailureCountUntilSkip, view, es, eventstoreRepos, systemDefaults, i18n, dir),
 	}
 	spool := spoolerConfig.New()
 	spool.Start()

internal/notification/templates/template.go

@@ -3,25 +3,28 @@ package templates
 import (
 	"bytes"
 	"html/template"
+	"io/ioutil"
+	"net/http"
 )
 
 const (
+	templatesPath    = "/templates"
 	templateFileName = "template.html"
 )
 
-func GetParsedTemplate(contentData interface{}) (string, error) {
+func GetParsedTemplate(dir http.FileSystem, contentData interface{}) (string, error) {
-	template, err := ParseTemplateFile("", contentData)
+	template, err := ParseTemplateFile(dir, "", contentData)
 	if err != nil {
 		return "", err
 	}
 	return ParseTemplateText(template, contentData)
 }
 
-func ParseTemplateFile(fileName string, data interface{}) (string, error) {
+func ParseTemplateFile(dir http.FileSystem, fileName string, data interface{}) (string, error) {
 	if fileName == "" {
 		fileName = templateFileName
 	}
-	template, err := template.ParseFiles(fileName)
+	template, err := readFile(dir, fileName)
 	if err != nil {
 		return "", err
 	}
@@ -43,3 +46,20 @@ func parseTemplate(template *template.Template, data interface{}) (string, error
 	}
 	return buf.String(), nil
 }
+
+func readFile(dir http.FileSystem, fileName string) (*template.Template, error) {
+	f, err := dir.Open(templatesPath + "/" + fileName)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+	content, err := ioutil.ReadAll(f)
+	if err != nil {
+		return nil, err
+	}
+	tmpl, err := template.New(fileName).Parse(string(content))
+	if err != nil {
+		return nil, err
+	}
+	return tmpl, nil
+}

internal/notification/types/email_verification_code.go

@@ -7,6 +7,7 @@ import (
 	"github.com/caos/zitadel/internal/notification/templates"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	view_model "github.com/caos/zitadel/internal/user/repository/view/model"
+	"net/http"
 )
 
 type EmailVerificationCodeData struct {
@@ -14,7 +15,7 @@ type EmailVerificationCodeData struct {
 	URL string
 }
 
-func SendEmailVerificationCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.EmailCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
+func SendEmailVerificationCode(dir http.FileSystem, i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.EmailCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
 	codeString, err := crypto.DecryptString(code.Code, alg)
 	if err != nil {
 		return err
@@ -31,7 +32,7 @@ func SendEmailVerificationCode(i18n *i18n.Translator, user *view_model.NotifyUse
 	systemDefaults.Notifications.TemplateData.VerifyEmail.Translate(i18n, args, user.PreferredLanguage)
 	emailCodeData := &EmailVerificationCodeData{TemplateData: systemDefaults.Notifications.TemplateData.VerifyEmail, URL: url}
 
-	template, err := templates.GetParsedTemplate(emailCodeData)
+	template, err := templates.GetParsedTemplate(dir, emailCodeData)
 	if err != nil {
 		return err
 	}

internal/notification/types/init_code.go

@@ -7,6 +7,7 @@ import (
 	"github.com/caos/zitadel/internal/notification/templates"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	view_model "github.com/caos/zitadel/internal/user/repository/view/model"
+	"net/http"
 )
 
 type InitCodeEmailData struct {
@@ -19,7 +20,7 @@ type UrlData struct {
 	Code   string
 }
 
-func SendUserInitCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.InitUserCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
+func SendUserInitCode(dir http.FileSystem, i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.InitUserCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
 	codeString, err := crypto.DecryptString(code.Code, alg)
 	if err != nil {
 		return err
@@ -36,7 +37,7 @@ func SendUserInitCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *
 	systemDefaults.Notifications.TemplateData.InitCode.Translate(i18n, args, user.PreferredLanguage)
 	initCodeData := &InitCodeEmailData{TemplateData: systemDefaults.Notifications.TemplateData.InitCode, URL: url}
 
-	template, err := templates.GetParsedTemplate(initCodeData)
+	template, err := templates.GetParsedTemplate(dir, initCodeData)
 	if err != nil {
 		return err
 	}

internal/notification/types/password_code.go

@@ -7,6 +7,7 @@ import (
 	"github.com/caos/zitadel/internal/notification/templates"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	view_model "github.com/caos/zitadel/internal/user/repository/view/model"
+	"net/http"
 )
 
 type PasswordCodeData struct {
@@ -16,7 +17,7 @@ type PasswordCodeData struct {
 	URL       string
 }
 
-func SendPasswordCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.PasswordCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
+func SendPasswordCode(dir http.FileSystem, i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.PasswordCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
 	codeString, err := crypto.DecryptString(code.Code, alg)
 	if err != nil {
 		return err
@@ -33,7 +34,7 @@ func SendPasswordCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *
 	systemDefaults.Notifications.TemplateData.PasswordReset.Translate(i18n, args, user.PreferredLanguage)
 	passwordCodeData := &PasswordCodeData{TemplateData: systemDefaults.Notifications.TemplateData.PasswordReset, FirstName: user.FirstName, LastName: user.LastName, URL: url}
 
-	template, err := templates.GetParsedTemplate(passwordCodeData)
+	template, err := templates.GetParsedTemplate(dir, passwordCodeData)
 	if err != nil {
 		return err
 	}

internal/project/repository/view/model/granted_project.go

@@ -16,7 +16,7 @@ const (
 	GrantedProjectKeyGrantID       = "grant_id"
 	GrantedProjectKeyOrgID         = "org_id"
 	GrantedProjectKeyResourceOwner = "resource_owner"
-	GrantedProjectKeyName          = "name"
+	GrantedProjectKeyName          = "project_name"
 )
 
 type GrantedProjectView struct {

pkg/management/api/grpc/application_converter.go

@@ -3,6 +3,7 @@ package grpc
 import (
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/model"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/golang/protobuf/ptypes"
 )
@@ -106,15 +107,17 @@ func applicationSearchRequestsToModel(request *ApplicationSearchRequest) *proj_m
 	return &proj_model.ApplicationSearchRequest{
 		Offset:  request.Offset,
 		Limit:   request.Limit,
-		Queries: applicationSearchQueriesToModel(request.Queries),
+		Queries: applicationSearchQueriesToModel(request.ProjectId, request.Queries),
 	}
 }
 
-func applicationSearchQueriesToModel(queries []*ApplicationSearchQuery) []*proj_model.ApplicationSearchQuery {
+func applicationSearchQueriesToModel(projectID string, queries []*ApplicationSearchQuery) []*proj_model.ApplicationSearchQuery {
-	converted := make([]*proj_model.ApplicationSearchQuery, len(queries))
+	converted := make([]*proj_model.ApplicationSearchQuery, len(queries)+1)
 	for i, q := range queries {
 		converted[i] = applicationSearchQueryToModel(q)
 	}
+	converted[len(queries)] = &proj_model.ApplicationSearchQuery{Key: proj_model.APPLICATIONSEARCHKEY_PROJECT_ID, Method: model.SEARCHMETHOD_EQUALS, Value: projectID}
+
 	return converted
 }
 

pkg/management/api/grpc/management.pb.authoptions.go

@@ -235,22 +235,22 @@ var ManagementService_AuthMethods = utils_auth.MethodMapping{
 		CheckParam: "",
 	},
 
-	"/caos.zitadel.management.api.v1.ManagementService/AddOrgMember": utils_auth.Option{
+	"/caos.zitadel.management.api.v1.ManagementService/AddMyOrgMember": utils_auth.Option{
 		Permission: "org.member.write",
 		CheckParam: "",
 	},
 
-	"/caos.zitadel.management.api.v1.ManagementService/ChangeOrgMember": utils_auth.Option{
+	"/caos.zitadel.management.api.v1.ManagementService/ChangeMyOrgMember": utils_auth.Option{
 		Permission: "org.member.write",
 		CheckParam: "",
 	},
 
-	"/caos.zitadel.management.api.v1.ManagementService/RemoveOrgMember": utils_auth.Option{
+	"/caos.zitadel.management.api.v1.ManagementService/RemoveMyOrgMember": utils_auth.Option{
 		Permission: "org.member.delete",
 		CheckParam: "",
 	},
 
-	"/caos.zitadel.management.api.v1.ManagementService/SearchOrgMembers": utils_auth.Option{
+	"/caos.zitadel.management.api.v1.ManagementService/SearchMyOrgMembers": utils_auth.Option{
 		Permission: "org.member.read",
 		CheckParam: "",
 	},

pkg/management/api/grpc/management.pb.gw.go

@@ -1196,7 +1196,7 @@ func request_ManagementService_GetOrgMemberRoles_0(ctx context.Context, marshale
 
 }
 
-func request_ManagementService_AddOrgMember_0(ctx context.Context, marshaler runtime.Marshaler, client ManagementServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_ManagementService_AddMyOrgMember_0(ctx context.Context, marshaler runtime.Marshaler, client ManagementServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq AddOrgMemberRequest
 	var metadata runtime.ServerMetadata
 
@@ -1208,30 +1208,12 @@ func request_ManagementService_AddOrgMember_0(ctx context.Context, marshaler run
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	var (
+	msg, err := client.AddMyOrgMember(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["org_id"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "org_id")
-	}
-
-	protoReq.OrgId, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "org_id", err)
-	}
-
-	msg, err := client.AddOrgMember(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func request_ManagementService_ChangeOrgMember_0(ctx context.Context, marshaler runtime.Marshaler, client ManagementServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_ManagementService_ChangeMyOrgMember_0(ctx context.Context, marshaler runtime.Marshaler, client ManagementServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ChangeOrgMemberRequest
 	var metadata runtime.ServerMetadata
 
@@ -1250,17 +1232,6 @@ func request_ManagementService_ChangeOrgMember_0(ctx context.Context, marshaler
 		_   = err
 	)
 
-	val, ok = pathParams["org_id"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "org_id")
-	}
-
-	protoReq.OrgId, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "org_id", err)
-	}
-
 	val, ok = pathParams["user_id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "user_id")
@@ -1272,12 +1243,12 @@ func request_ManagementService_ChangeOrgMember_0(ctx context.Context, marshaler
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "user_id", err)
 	}
 
-	msg, err := client.ChangeOrgMember(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.ChangeMyOrgMember(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func request_ManagementService_RemoveOrgMember_0(ctx context.Context, marshaler runtime.Marshaler, client ManagementServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_ManagementService_RemoveMyOrgMember_0(ctx context.Context, marshaler runtime.Marshaler, client ManagementServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq RemoveOrgMemberRequest
 	var metadata runtime.ServerMetadata
 
@@ -1288,17 +1259,6 @@ func request_ManagementService_RemoveOrgMember_0(ctx context.Context, marshaler
 		_   = err
 	)
 
-	val, ok = pathParams["org_id"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "org_id")
-	}
-
-	protoReq.OrgId, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "org_id", err)
-	}
-
 	val, ok = pathParams["user_id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "user_id")
@@ -1310,12 +1270,12 @@ func request_ManagementService_RemoveOrgMember_0(ctx context.Context, marshaler
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "user_id", err)
 	}
 
-	msg, err := client.RemoveOrgMember(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.RemoveMyOrgMember(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func request_ManagementService_SearchOrgMembers_0(ctx context.Context, marshaler runtime.Marshaler, client ManagementServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_ManagementService_SearchMyOrgMembers_0(ctx context.Context, marshaler runtime.Marshaler, client ManagementServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq OrgMemberSearchRequest
 	var metadata runtime.ServerMetadata
 
@@ -1327,25 +1287,7 @@ func request_ManagementService_SearchOrgMembers_0(ctx context.Context, marshaler
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	var (
+	msg, err := client.SearchMyOrgMembers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["org_id"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "org_id")
-	}
-
-	protoReq.OrgId, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "org_id", err)
-	}
-
-	msg, err := client.SearchOrgMembers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
@@ -4601,7 +4543,7 @@ func RegisterManagementServiceHandlerClient(ctx context.Context, mux *runtime.Se
 
 	})
 
-	mux.Handle("POST", pattern_ManagementService_AddOrgMember_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("POST", pattern_ManagementService_AddMyOrgMember_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
@@ -4610,18 +4552,18 @@ func RegisterManagementServiceHandlerClient(ctx context.Context, mux *runtime.Se
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_ManagementService_AddOrgMember_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_ManagementService_AddMyOrgMember_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_ManagementService_AddOrgMember_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_ManagementService_AddMyOrgMember_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
-	mux.Handle("PUT", pattern_ManagementService_ChangeOrgMember_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("PUT", pattern_ManagementService_ChangeMyOrgMember_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
@@ -4630,18 +4572,18 @@ func RegisterManagementServiceHandlerClient(ctx context.Context, mux *runtime.Se
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_ManagementService_ChangeOrgMember_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_ManagementService_ChangeMyOrgMember_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_ManagementService_ChangeOrgMember_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_ManagementService_ChangeMyOrgMember_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
-	mux.Handle("DELETE", pattern_ManagementService_RemoveOrgMember_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("DELETE", pattern_ManagementService_RemoveMyOrgMember_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
@@ -4650,18 +4592,18 @@ func RegisterManagementServiceHandlerClient(ctx context.Context, mux *runtime.Se
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_ManagementService_RemoveOrgMember_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_ManagementService_RemoveMyOrgMember_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_ManagementService_RemoveOrgMember_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_ManagementService_RemoveMyOrgMember_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
-	mux.Handle("POST", pattern_ManagementService_SearchOrgMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("POST", pattern_ManagementService_SearchMyOrgMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
@@ -4670,14 +4612,14 @@ func RegisterManagementServiceHandlerClient(ctx context.Context, mux *runtime.Se
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_ManagementService_SearchOrgMembers_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_ManagementService_SearchMyOrgMembers_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_ManagementService_SearchOrgMembers_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_ManagementService_SearchMyOrgMembers_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -5919,13 +5861,13 @@ var (
 
 	pattern_ManagementService_GetOrgMemberRoles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"orgs", "members", "roles"}, ""))
 
-	pattern_ManagementService_AddOrgMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"orgs", "org_id", "members"}, ""))
+	pattern_ManagementService_AddMyOrgMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"orgs", "me", "members"}, ""))
 
-	pattern_ManagementService_ChangeOrgMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"orgs", "org_id", "members", "user_id"}, ""))
+	pattern_ManagementService_ChangeMyOrgMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"orgs", "me", "members", "user_id"}, ""))
 
-	pattern_ManagementService_RemoveOrgMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"orgs", "org_id", "members", "user_id"}, ""))
+	pattern_ManagementService_RemoveMyOrgMember_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"orgs", "me", "members", "user_id"}, ""))
 
-	pattern_ManagementService_SearchOrgMembers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 2, 3}, []string{"orgs", "org_id", "members", "_search"}, ""))
+	pattern_ManagementService_SearchMyOrgMembers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"orgs", "me", "members", "_search"}, ""))
 
 	pattern_ManagementService_SearchGrantedProjects_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"grantedprojects", "_search"}, ""))
 
@@ -6137,13 +6079,13 @@ var (
 
 	forward_ManagementService_GetOrgMemberRoles_0 = runtime.ForwardResponseMessage
 
-	forward_ManagementService_AddOrgMember_0 = runtime.ForwardResponseMessage
+	forward_ManagementService_AddMyOrgMember_0 = runtime.ForwardResponseMessage
 
-	forward_ManagementService_ChangeOrgMember_0 = runtime.ForwardResponseMessage
+	forward_ManagementService_ChangeMyOrgMember_0 = runtime.ForwardResponseMessage
 
-	forward_ManagementService_RemoveOrgMember_0 = runtime.ForwardResponseMessage
+	forward_ManagementService_RemoveMyOrgMember_0 = runtime.ForwardResponseMessage
 
-	forward_ManagementService_SearchOrgMembers_0 = runtime.ForwardResponseMessage
+	forward_ManagementService_SearchMyOrgMembers_0 = runtime.ForwardResponseMessage
 
 	forward_ManagementService_SearchGrantedProjects_0 = runtime.ForwardResponseMessage
 

pkg/management/api/grpc/management.swagger.json

@@ -207,6 +207,112 @@
         ]
       }
     },
+    "/orgs/me/members": {
+      "post": {
+        "operationId": "AddMyOrgMember",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/v1OrgMember"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/v1AddOrgMemberRequest"
+            }
+          }
+        ],
+        "tags": [
+          "ManagementService"
+        ]
+      }
+    },
+    "/orgs/me/members/_search": {
+      "post": {
+        "operationId": "SearchMyOrgMembers",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/v1OrgMemberSearchResponse"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/v1OrgMemberSearchRequest"
+            }
+          }
+        ],
+        "tags": [
+          "ManagementService"
+        ]
+      }
+    },
+    "/orgs/me/members/{user_id}": {
+      "delete": {
+        "operationId": "RemoveMyOrgMember",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "properties": {}
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "tags": [
+          "ManagementService"
+        ]
+      },
+      "put": {
+        "operationId": "ChangeMyOrgMember",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/v1OrgMember"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/v1ChangeOrgMemberRequest"
+            }
+          }
+        ],
+        "tags": [
+          "ManagementService"
+        ]
+      }
+    },
     "/orgs/members/roles": {
       "get": {
         "summary": "ORG_MEMBERS",
@@ -351,136 +457,6 @@
         ]
       }
     },
-    "/orgs/{org_id}/members": {
-      "post": {
-        "operationId": "AddOrgMember",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/v1OrgMember"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "org_id",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/v1AddOrgMemberRequest"
-            }
-          }
-        ],
-        "tags": [
-          "ManagementService"
-        ]
-      }
-    },
-    "/orgs/{org_id}/members/_search": {
-      "post": {
-        "operationId": "SearchOrgMembers",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/v1OrgMemberSearchResponse"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "org_id",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/v1OrgMemberSearchRequest"
-            }
-          }
-        ],
-        "tags": [
-          "ManagementService"
-        ]
-      }
-    },
-    "/orgs/{org_id}/members/{user_id}": {
-      "delete": {
-        "operationId": "RemoveOrgMember",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "properties": {}
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "org_id",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "user_id",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "ManagementService"
-        ]
-      },
-      "put": {
-        "operationId": "ChangeOrgMember",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/v1OrgMember"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "org_id",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "user_id",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/v1ChangeOrgMemberRequest"
-            }
-          }
-        ],
-        "tags": [
-          "ManagementService"
-        ]
-      }
-    },
     "/policies/passwords/age": {
       "get": {
         "summary": "PASSWORD_AGE_POLICY",
@@ -3395,9 +3371,6 @@
     "v1AddOrgMemberRequest": {
       "type": "object",
       "properties": {
-        "org_id": {
-          "type": "string"
-        },
         "user_id": {
           "type": "string"
         },
@@ -3686,9 +3659,6 @@
     "v1ChangeOrgMemberRequest": {
       "type": "object",
       "properties": {
-        "org_id": {
-          "type": "string"
-        },
         "user_id": {
           "type": "string"
         },
@@ -4213,9 +4183,6 @@
     "v1OrgMemberSearchRequest": {
       "type": "object",
       "properties": {
-        "org_id": {
-          "type": "string"
-        },
         "offset": {
           "type": "string",
           "format": "uint64"
@@ -4250,11 +4217,49 @@
         "result": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/v1OrgMember"
+            "$ref": "#/definitions/v1OrgMemberView"
           }
         }
       }
     },
+    "v1OrgMemberView": {
+      "type": "object",
+      "properties": {
+        "user_id": {
+          "type": "string"
+        },
+        "roles": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "change_date": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "creation_date": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "sequence": {
+          "type": "string",
+          "format": "uint64"
+        },
+        "user_name": {
+          "type": "string"
+        },
+        "email": {
+          "type": "string"
+        },
+        "first_name": {
+          "type": "string"
+        },
+        "last_name": {
+          "type": "string"
+        }
+      }
+    },
     "v1OrgState": {
       "type": "string",
       "enum": [

pkg/management/api/grpc/org_member.go

@@ -10,18 +10,16 @@ func (s *Server) GetOrgMemberRoles(ctx context.Context, _ *empty.Empty) (*OrgMem
 	return &OrgMemberRoles{Roles: s.org.GetOrgMemberRoles()}, nil
 }
 
-func (s *Server) SearchOrgMembers(ctx context.Context, in *OrgMemberSearchRequest) (*OrgMemberSearchResponse, error) {
+func (s *Server) SearchMyOrgMembers(ctx context.Context, in *OrgMemberSearchRequest) (*OrgMemberSearchResponse, error) {
-	members, err := s.org.SearchOrgMembers(ctx, orgMemberSearchRequestToModel(in))
+	members, err := s.org.SearchMyOrgMembers(ctx, orgMemberSearchRequestToModel(in))
 	if err != nil {
 		return nil, err
 	}
 	return orgMemberSearchResponseFromModel(members), nil
 }
 
-func (s *Server) AddOrgMember(ctx context.Context, member *AddOrgMemberRequest) (*OrgMember, error) {
+func (s *Server) AddMyOrgMember(ctx context.Context, member *AddOrgMemberRequest) (*OrgMember, error) {
-	repositoryMember := addOrgMemberToModel(member)
+	addedMember, err := s.org.AddMyOrgMember(ctx, addOrgMemberToModel(member))
-
-	addedMember, err := s.org.AddOrgMember(ctx, repositoryMember)
 	if err != nil {
 		return nil, err
 	}
@@ -29,16 +27,15 @@ func (s *Server) AddOrgMember(ctx context.Context, member *AddOrgMemberRequest)
 	return orgMemberFromModel(addedMember), nil
 }
 
-func (s *Server) ChangeOrgMember(ctx context.Context, member *ChangeOrgMemberRequest) (*OrgMember, error) {
+func (s *Server) ChangeMyOrgMember(ctx context.Context, member *ChangeOrgMemberRequest) (*OrgMember, error) {
-	repositoryMember := changeOrgMemberToModel(member)
+	changedMember, err := s.org.ChangeMyOrgMember(ctx, changeOrgMemberToModel(member))
-	changedMember, err := s.org.ChangeOrgMember(ctx, repositoryMember)
 	if err != nil {
 		return nil, err
 	}
 	return orgMemberFromModel(changedMember), nil
 }
 
-func (s *Server) RemoveOrgMember(ctx context.Context, member *RemoveOrgMemberRequest) (*empty.Empty, error) {
+func (s *Server) RemoveMyOrgMember(ctx context.Context, member *RemoveOrgMemberRequest) (*empty.Empty, error) {
-	err := s.org.RemoveOrgMember(ctx, member.OrgId, member.UserId)
+	err := s.org.RemoveMyOrgMember(ctx, member.UserId)
 	return &empty.Empty{}, err
 }

pkg/management/api/grpc/org_member_converter.go

@@ -8,14 +8,18 @@ import (
 )
 
 func addOrgMemberToModel(member *AddOrgMemberRequest) *org_model.OrgMember {
-	memberModel := org_model.NewOrgMember(member.OrgId, member.UserId)
+	memberModel := &org_model.OrgMember{
+		UserID: member.UserId,
+	}
 	memberModel.Roles = member.Roles
 
 	return memberModel
 }
 
 func changeOrgMemberToModel(member *ChangeOrgMemberRequest) *org_model.OrgMember {
-	memberModel := org_model.NewOrgMember(member.OrgId, member.UserId)
+	memberModel := &org_model.OrgMember{
+		UserID: member.UserId,
+	}
 	memberModel.Roles = member.Roles
 
 	return memberModel
@@ -46,7 +50,7 @@ func orgMemberSearchRequestToModel(request *OrgMemberSearchRequest) *org_model.O
 }
 
 func orgMemberSearchQueriesToModel(queries []*OrgMemberSearchQuery) []*org_model.OrgMemberSearchQuery {
-	modelQueries := make([]*org_model.OrgMemberSearchQuery, len(queries))
+	modelQueries := make([]*org_model.OrgMemberSearchQuery, len(queries)+1)
 
 	for i, query := range queries {
 		modelQueries[i] = orgMemberSearchQueryToModel(query)
@@ -105,8 +109,8 @@ func orgMemberSearchResponseFromModel(resp *org_model.OrgMemberSearchResponse) *
 		Result:      orgMembersFromView(resp.Result),
 	}
 }
-func orgMembersFromView(viewMembers []*org_model.OrgMemberView) []*OrgMember {
+func orgMembersFromView(viewMembers []*org_model.OrgMemberView) []*OrgMemberView {
-	members := make([]*OrgMember, len(viewMembers))
+	members := make([]*OrgMemberView, len(viewMembers))
 
 	for i, member := range viewMembers {
 		members[i] = orgMemberFromView(member)
@@ -115,17 +119,21 @@ func orgMembersFromView(viewMembers []*org_model.OrgMemberView) []*OrgMember {
 	return members
 }
 
-func orgMemberFromView(member *org_model.OrgMemberView) *OrgMember {
+func orgMemberFromView(member *org_model.OrgMemberView) *OrgMemberView {
 	changeDate, err := ptypes.TimestampProto(member.ChangeDate)
 	logging.Log("GRPC-S9LAZ").OnError(err).Debug("unable to parse changedate")
 	creationDate, err := ptypes.TimestampProto(member.CreationDate)
 	logging.Log("GRPC-oJN56").OnError(err).Debug("unable to parse creation date")
 
-	return &OrgMember{
+	return &OrgMemberView{
 		ChangeDate:   changeDate,
 		CreationDate: creationDate,
 		Roles:        member.Roles,
 		Sequence:     member.Sequence,
 		UserId:       member.UserID,
+		UserName:     member.UserName,
+		Email:        member.Email,
+		FirstName:    member.FirstName,
+		LastName:     member.LastName,
 	}
 }

pkg/management/api/proto/management.proto

@@ -527,9 +527,9 @@ service ManagementService {
         };
     }
 
-    rpc AddOrgMember(AddOrgMemberRequest) returns (OrgMember) {
+    rpc AddMyOrgMember(AddOrgMemberRequest) returns (OrgMember) {
         option (google.api.http) = {
-            post: "/orgs/{org_id}/members"
+            post: "/orgs/me/members"
             body: "*"
         };
 
@@ -538,9 +538,9 @@ service ManagementService {
         };
     }
 
-    rpc ChangeOrgMember(ChangeOrgMemberRequest) returns (OrgMember) {
+    rpc ChangeMyOrgMember(ChangeOrgMemberRequest) returns (OrgMember) {
         option (google.api.http) = {
-            put: "/orgs/{org_id}/members/{user_id}"
+            put: "/orgs/me/members/{user_id}"
             body: "*"
         };
 
@@ -549,9 +549,9 @@ service ManagementService {
         };
     }
 
-    rpc RemoveOrgMember(RemoveOrgMemberRequest) returns (google.protobuf.Empty) {
+    rpc RemoveMyOrgMember(RemoveOrgMemberRequest) returns (google.protobuf.Empty) {
         option (google.api.http) = {
-            delete: "/orgs/{org_id}/members/{user_id}"
+            delete: "/orgs/me/members/{user_id}"
         };
 
         option (caos.zitadel.utils.v1.auth_option) = {
@@ -559,9 +559,9 @@ service ManagementService {
         };
     }
 
-    rpc SearchOrgMembers(OrgMemberSearchRequest) returns (OrgMemberSearchResponse) {
+    rpc SearchMyOrgMembers(OrgMemberSearchRequest) returns (OrgMemberSearchResponse) {
         option (google.api.http) = {
-            post: "/orgs/{org_id}/members/_search"
+            post: "/orgs/me/members/_search"
             body: "*"
         };
 
@@ -1657,34 +1657,42 @@ message OrgMember {
 }
 
 message AddOrgMemberRequest {
-    string org_id = 1;
+    string user_id = 1;
-    string user_id = 2;
+    repeated string roles = 2;
-    repeated string roles = 3;
 }
 
 message ChangeOrgMemberRequest {
-    string org_id = 1;
+    string user_id = 1;
-    string user_id = 2;
+    repeated string roles = 2;
-    repeated string roles = 3;
 }
 
 message RemoveOrgMemberRequest {
-    string org_id = 1;
+    string user_id = 1;
-    string user_id = 2;
 }
 
 message OrgMemberSearchResponse {
     uint64 offset = 1;
     uint64 limit = 2;
     uint64 total_result = 3;
-    repeated OrgMember result = 4;
+    repeated OrgMemberView result = 4;
+}
+
+message OrgMemberView {
+    string user_id = 1;
+    repeated string roles = 2;
+    google.protobuf.Timestamp change_date = 3;
+    google.protobuf.Timestamp creation_date = 4;
+    uint64 sequence = 5;
+    string user_name = 6;
+    string email = 7;
+    string first_name = 8;
+    string last_name = 9;
 }
 
 message OrgMemberSearchRequest {
-    string org_id = 1;
+    uint64 offset = 1;
-    uint64 offset = 2;
+    uint64 limit = 2;
-    uint64 limit = 3;
+    repeated OrgMemberSearchQuery queries = 3;
-    repeated OrgMemberSearchQuery queries = 4;
 }
 
 message OrgMemberSearchQuery {