ソースを参照

set admin field for backward compatbility

abhishek9686 1 年間 前
コミット
34bcff2b1d
5 ファイル変更16 行追加0 行削除
  1. 4 0
      controllers/user.go
  2. 3 0
      pro/auth/azure-ad.go
  3. 3 0
      pro/auth/github.go
  4. 3 0
      pro/auth/google.go
  5. 3 0
      pro/auth/oidc.go

+ 4 - 0
controllers/user.go

@@ -1112,6 +1112,7 @@ func userInviteSignUp(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("password cannot be empty"), "badrequest"))
 		return
 	}
+
 	for _, inviteGroupID := range in.Groups {
 		userG, err := logic.GetUserGroup(inviteGroupID)
 		if err != nil {
@@ -1121,6 +1122,9 @@ func userInviteSignUp(w http.ResponseWriter, r *http.Request) {
 		user.PlatformRoleID = userG.PlatformRole
 		user.UserGroups[inviteGroupID] = struct{}{}
 	}
+	if user.PlatformRoleID == models.AdminRole {
+		user.IsAdmin = true
+	}
 	user.NetworkRoles = make(map[models.NetworkID]map[models.UserRole]struct{})
 	user.IsSuperAdmin = false
 	err = logic.CreateUser(&user)

+ 3 - 0
pro/auth/azure-ad.go

@@ -107,6 +107,9 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 					user.PlatformRoleID = userG.PlatformRole
 					user.UserGroups[inviteGroupID] = struct{}{}
 				}
+				if user.PlatformRoleID == models.AdminRole {
+					user.IsAdmin = true
+				}
 				if err = logic.CreateUser(user); err != nil {
 					handleSomethingWentWrong(w)
 					return

+ 3 - 0
pro/auth/github.go

@@ -107,6 +107,9 @@ func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 					user.PlatformRoleID = userG.PlatformRole
 					user.UserGroups[inviteGroupID] = struct{}{}
 				}
+				if user.PlatformRoleID == models.AdminRole {
+					user.IsAdmin = true
+				}
 				if err = logic.CreateUser(user); err != nil {
 					handleSomethingWentWrong(w)
 					return

+ 3 - 0
pro/auth/google.go

@@ -108,6 +108,9 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
 					user.PlatformRoleID = userG.PlatformRole
 					user.UserGroups[inviteGroupID] = struct{}{}
 				}
+				if user.PlatformRoleID == models.AdminRole {
+					user.IsAdmin = true
+				}
 				if err = logic.CreateUser(user); err != nil {
 					handleSomethingWentWrong(w)
 					return

+ 3 - 0
pro/auth/oidc.go

@@ -119,6 +119,9 @@ func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 					user.PlatformRoleID = userG.PlatformRole
 					user.UserGroups[inviteGroupID] = struct{}{}
 				}
+				if user.PlatformRoleID == models.AdminRole {
+					user.IsAdmin = true
+				}
 				if err = logic.CreateUser(user); err != nil {
 					handleSomethingWentWrong(w)
 					return