Fix small bugs that arose from updating api

pkg/control/server/users.go

@@ -68,7 +68,7 @@ func getUserGroups(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	user, err := users.GetUser(username)
+	user, err := data.GetUserGroupMembership(username)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

pkg/control/wagctl/client.go

@@ -216,7 +216,7 @@ func (c *CtrlClient) ListAllGroups() (groups []control.GroupData, err error) {
 
 func (c *CtrlClient) UserGroups(username string) (userGroups []string, err error) {
 
-	response, err := c.httpClient.Get("http://unix/user/groups?username=" + url.QueryEscape(username))
+	response, err := c.httpClient.Get("http://unix/users/groups?username=" + url.QueryEscape(username))
 	if err != nil {
 		return nil, err
 	}
@@ -269,7 +269,7 @@ func (c *CtrlClient) ResetUserMFA(username string) error {
 
 func (c *CtrlClient) GetUsersAcls(username string) (acl acls.Acl, err error) {
 
-	response, err := c.httpClient.Get("http://unix/user/acls?username=" + url.QueryEscape(username))
+	response, err := c.httpClient.Get("http://unix/users/acls?username=" + url.QueryEscape(username))
 	if err != nil {
 		return acls.Acl{}, err
 	}
@@ -549,7 +549,7 @@ func (c *CtrlClient) GetAllSettings() (allSettings data.AllSettings, err error)
 
 func (c *CtrlClient) GetLockout() (lockout int, err error) {
 
-	response, err := c.httpClient.Get("http://unix/config/settings")
+	response, err := c.httpClient.Get("http://unix/config/settings/lockout")
 	if err != nil {
 		return 0, err
 	}

ui/devices.go

@@ -4,15 +4,9 @@ import (
 	"encoding/json"
 	"log"
 	"net/http"
-
-	"github.com/NHAS/wag/internal/data"
 )
 
 func devicesMgmtUI(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.NotFound(w, r)
-		return
-	}
 
 	_, u := sessionManager.GetSessionFromRequest(r)
 	if u == nil {
@@ -54,7 +48,7 @@ func devicesMgmt(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		lockout, err := data.GetLockout()
+		lockout, err := ctrl.GetLockout()
 		if err != nil {
 			log.Println("error getting lockout: ", err)
 

ui/diagnostics.go

@@ -128,28 +128,20 @@ func aclsTest(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var username string
-	switch r.Method {
-	case http.MethodPost:
-		username = r.PostFormValue("username")
-	case http.MethodGet:
-		username = ""
-	default:
-		http.NotFound(w, r)
-		return
-	}
+	var (
+		username string
+		acl      string
+	)
+	if r.Method == http.MethodPost {
 
-	acls, err := ctrl.GetUsersAcls(username)
-	if err != nil {
-		log.Println("unable to get users acls: ", err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	acl := ""
-	if username != "" {
-		b, _ := json.MarshalIndent(acls, "", "    ")
-		acl = string(b)
+		username = r.PostFormValue("username")
+		acls, err := ctrl.GetUsersAcls(username)
+		if err == nil {
+			b, _ := json.MarshalIndent(acls, "", "    ")
+			acl = string(b)
+		} else {
+			acl = err.Error()
+		}
 	}
 
 	d := struct {

ui/registration.go

@@ -54,7 +54,7 @@ func registrationTokens(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		var tokens []TokensData
+		tokens := []TokensData{}
 
 		for _, reg := range registrations {
 			tokens = append(tokens, TokensData{

ui/users.go

@@ -54,8 +54,7 @@ func manageUsers(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		var usersData []UsersData
-
+		usersData := []UsersData{}
 		for _, u := range users {
 			devices, err := ctrl.ListDevice(u.Username)
 			if err != nil {