mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 15:26:04 +08:00
Merge pull request #1727 from gravitl/bugfix_v0.16.3_sso_user_resets
fixed admin issue and potential panics
This commit is contained in:
commit
030035922e
|
@ -101,7 +101,7 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
clients := []models.ExtClient{}
|
||||
var err error
|
||||
if networksSlice[0] == logic.ALL_NETWORK_ACCESS {
|
||||
if len(networksSlice) > 0 && networksSlice[0] == logic.ALL_NETWORK_ACCESS {
|
||||
clients, err = functions.GetAllExtClients()
|
||||
if err != nil && !database.IsEmptyRecord(err) {
|
||||
logger.Log(0, "failed to get all extclients: ", err.Error())
|
||||
|
|
|
@ -57,7 +57,7 @@ func getNetworks(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
allnetworks := []models.Network{}
|
||||
var err error
|
||||
if networksSlice[0] == logic.ALL_NETWORK_ACCESS {
|
||||
if len(networksSlice) > 0 && networksSlice[0] == logic.ALL_NETWORK_ACCESS {
|
||||
allnetworks, err = logic.GetNetworks()
|
||||
if err != nil && !database.IsEmptyRecord(err) {
|
||||
logger.Log(0, r.Header.Get("user"), "failed to fetch networks: ", err.Error())
|
||||
|
|
|
@ -282,6 +282,9 @@ func UpdateUser(userchange models.User, user models.User) (models.User, error) {
|
|||
|
||||
user.Password = userchange.Password
|
||||
}
|
||||
if userchange.IsAdmin != user.IsAdmin {
|
||||
user.IsAdmin = userchange.IsAdmin
|
||||
}
|
||||
|
||||
err := ValidateUser(user)
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in a new issue