Merge branch 'develop' of https://github.com/gravitl/netmaker into NM-79

controllers/user.go

@@ -1006,11 +1006,9 @@ func getUserV1(w http.ResponseWriter, r *http.Request) {
 	}
 	for gId := range user.UserGroups {
 		grp, err := logic.GetUserGroup(gId)
-		if err != nil {
-			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
-			return
+		if err == nil {
+			resp.UserGroups[gId] = grp
 		}
-		resp.UserGroups[gId] = grp
 	}
 	logger.Log(2, r.Header.Get("user"), "fetched user", usernameFetched)
 	logic.ReturnSuccessResponseWithJson(w, r, resp, "fetched user with role info")

logic/acls.go

@@ -1635,7 +1635,12 @@ func ValidateCreateAclReq(req models.Acl) error {
 				return err
 			}
 
-			_, ok := userGroup.NetworkRoles[req.NetworkID]
+			_, ok := userGroup.NetworkRoles[models.AllNetworks]
+			if ok {
+				continue
+			}
+
+			_, ok = userGroup.NetworkRoles[req.NetworkID]
 			if !ok {
 				return fmt.Errorf("user group %s does not have access to network %s", src.Value, req.NetworkID)
 			}