|
@@ -503,6 +503,9 @@ func updateUserGroup(w http.ResponseWriter, r *http.Request) {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ userGroup.ExternalIdentityProviderID = currUserG.ExternalIdentityProviderID
|
|
|
|
+
|
|
err = proLogic.UpdateUserGroup(userGroup)
|
|
err = proLogic.UpdateUserGroup(userGroup)
|
|
if err != nil {
|
|
if err != nil {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
@@ -1336,9 +1339,11 @@ func approvePendingUser(w http.ResponseWriter, r *http.Request) {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
if err = logic.CreateUser(&models.User{
|
|
if err = logic.CreateUser(&models.User{
|
|
- UserName: user.UserName,
|
|
|
|
- Password: newPass,
|
|
|
|
- PlatformRoleID: models.ServiceUser,
|
|
|
|
|
|
+ UserName: user.UserName,
|
|
|
|
+ ExternalIdentityProviderID: user.ExternalIdentityProviderID,
|
|
|
|
+ Password: newPass,
|
|
|
|
+ AuthType: user.AuthType,
|
|
|
|
+ PlatformRoleID: models.ServiceUser,
|
|
}); err != nil {
|
|
}); err != nil {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to create user: %s", err), "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to create user: %s", err), "internal"))
|
|
return
|
|
return
|