opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 12:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove apiversion param from session

Browse Source
This commit is contained in:
QIU Jian
2022-08-25 09:43:50 +08:00
committed by Qiu Jian
parent c6f557fd68
commit 293afd2e69
165 changed files with 381 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/notify/models/receiver.go
+7 -7
View File
@@ -234,7 +234,7 @@ func (rm *SReceiverManager) ValidateCreateData(ctx context.Context, userCred mcc
return input, err
}
// check uid
session := auth.GetAdminSession(ctx, "", "")
session := auth.GetAdminSession(ctx, "")
if len(input.UID) > 0 {
userObj, err := modules.UsersV3.GetById(session, input.UID, nil)
if err != nil {
@@ -666,7 +666,7 @@ func (rm *SReceiverManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQue
}
func (rm *SReceiverManager) findUserIdsWithProjectDomain(ctx context.Context, userCred mcclient.TokenCredential, projectDomainId string) ([]string, error) {
session := auth.GetSession(ctx, userCred, "", "")
session := auth.GetSession(ctx, userCred, "")
query := jsonutils.NewDict()
query.Set("effective", jsonutils.JSONTrue)
query.Set("project_domain_id", jsonutils.NewString(projectDomainId))
@@ -1000,7 +1000,7 @@ func (rm *SReceiverManager) PerformIntellijGet(ctx context.Context, userCred mcc
getParam := jsonutils.NewDict()
getParam.Set("scope", jsonutils.NewString(input.Scope))
// try to get itself
s := auth.GetSession(ctx, userCred, "", "")
s := auth.GetSession(ctx, userCred, "")
// modules.NotifyReceiver
ret, err := notify_modules.NotifyReceiver.Get(s, input.UserId, getParam)
if err == nil {
@@ -1017,7 +1017,7 @@ func (rm *SReceiverManager) PerformIntellijGet(ctx context.Context, userCred mcc
return jsonutils.NewDict(), nil
}
// create one
adminSession := auth.GetAdminSession(ctx, "", "")
adminSession := auth.GetAdminSession(ctx, "")
ret, err = modules.UsersV3.GetById(adminSession, input.UserId, getParam)
if err != nil {
return nil, errors.Wrap(err, "unable get user from keystone")
@@ -1121,7 +1121,7 @@ func (r *SReceiver) PerformDisable(ctx context.Context, userCred mcclient.TokenC
}
func (r *SReceiver) Sync(ctx context.Context) error {
session := auth.GetAdminSessionWithInternal(ctx, "", "")
session := auth.GetAdminSessionWithInternal(ctx, "")
params := jsonutils.NewDict()
params.Set("scope", jsonutils.NewString("system"))
params.Set("system", jsonutils.JSONTrue)
@@ -1211,14 +1211,14 @@ func (rm *SReceiverManager) OnDelete(obj *jsonutils.JSONDict) {
return
}
receiver := &receivers[0]
err = receiver.Delete(context.Background(), auth.GetAdminSession(context.Background(), "", "").GetToken())
err = receiver.Delete(context.Background(), auth.GetAdminSession(context.Background(), "").GetToken())
if err != nil {
log.Errorf("fail to delete contact %q: %v", receiver.Id, err)
}
}
func (rm *SReceiverManager) StartWatchUserInKeystone() error {
adminSession := auth.GetAdminSession(context.Background(), "", "")
adminSession := auth.GetAdminSession(context.Background(), "")
watchMan, err := informer.NewWatchManagerBySession(adminSession)
if err != nil {
return err
pkg/notify/models/subscriber.go
+1 -1
View File
@@ -496,7 +496,7 @@ func (srm *SSubscriberManager) getReceiversSent(ctx context.Context, tid string,
}
query.Add(jsonutils.NewString(projectId), "scope", "project", "id")
}
s := auth.GetAdminSession(ctx, "", "")
s := auth.GetAdminSession(ctx, "")
log.Debugf("query for role-assignments: %s", query.String())
listRet, err := modules.RoleAssignments.List(s, query)
if err != nil {