Added ability to retrieve a user's devices

dataoperations.go

@@ -73,6 +73,7 @@ func (d *dataOperations) CreateDevice(owner UserProfile, name, os string, device
 			OS:        os,
 			PublicKey: credentials.PublicKey,
 			IPAddress: ipAddress.Address,
+			Owner:     owner,
 		}
 		err = d.db.Create(&device).Error
 		if err != nil {

handlers.go

@@ -121,7 +121,7 @@ func (wh *WireguardHandlers) newDeviceHandler(c *gin.Context) {
 	}
 
 	client := wh.config.WireguardClient
-	deviceFunc := func (ipAddress IPAddress) (*wgrpcd.PeerConfigInfo, error) {
+	deviceFunc := func(ipAddress IPAddress) (*wgrpcd.PeerConfigInfo, error) {
 		_, network, err := net.ParseCIDR(fmt.Sprintf("%v/32", ipAddress.Address))
 		if err != nil {
 			return nil, err
@@ -143,21 +143,21 @@ func (wh *WireguardHandlers) newDeviceHandler(c *gin.Context) {
 
 	tmpl := template.Must(
 		template.New("peerconfig.tmpl").
-				Funcs(map[string]interface{}{"StringsJoin": strings.Join}).
-				ParseFiles(filepath.Join(wh.config.TemplatesDirectory, "ini/peerconfig.tmpl")),
-	)		
-	
+			Funcs(map[string]interface{}{"StringsJoin": strings.Join}).
+			ParseFiles(filepath.Join(wh.config.TemplatesDirectory, "ini/peerconfig.tmpl")),
+	)
+
 	if err != nil {
 		log.Println(err)
 		c.AbortWithStatus(http.StatusInternalServerError)
 		return
 	}
 
 	peerConfigINI := &PeerConfigINI{
-		PublicKey: device.PublicKey,
+		PublicKey:  device.PublicKey,
 		PrivateKey: credentials.PrivateKey,
 		AllowedIPs: ipNetsToStrings(credentials.AllowedIPs),
-		Addresses: ipNetsToStrings(credentials.AllowedIPs),
+		Addresses:  ipNetsToStrings(credentials.AllowedIPs),
 		ServerName: wh.config.Endpoint.String(),
 		DNSServers: ipsToStrings(wh.config.DNSServers),
 	}
@@ -178,7 +178,17 @@ func (wh *WireguardHandlers) rekeyDeviceHandler(c *gin.Context) {
 }
 
 func (wh *WireguardHandlers) listUserDevicesHandler(c *gin.Context) {
+	devices, err := wh.config.Database.Devices(wh.user(c))
+	if err != nil {
+		log.Println(err)
+		if _, ok := err.(*RecordNotFoundError); ok {
+			c.AbortWithStatus(http.StatusNotFound)
+		}
+		c.AbortWithStatus(http.StatusInternalServerError)
+		return
+	}
 
+	c.JSON(http.StatusOK, devices)
 }
 
 func (wh *WireguardHandlers) getUserDeviceHandler(c *gin.Context) {

http_entities.go

@@ -1,21 +1,15 @@
 package wireguardhttps
 
-import (
-	"net"
-	"net/url"
-)
-
-
-type DeviceRequest struct{
+type DeviceRequest struct {
 	Name string `json:"name"`
-	OS string `json:"os"`
+	OS   string `json:"os"`
 }
 
-type PeerConfigINI struct{
-	PublicKey string
+type PeerConfigINI struct {
+	PublicKey  string
 	PrivateKey string
 	AllowedIPs []string
-	Addresses []string
+	Addresses  []string
 	DNSServers []string
 	ServerName string
-}
+}

utils.go

@@ -4,7 +4,6 @@ import (
 	"net"
 )
 
-
 func ipNetsToStrings(nets []net.IPNet) []string {
 	rv := []string{}
 	for _, n := range nets {
@@ -21,4 +20,4 @@ func ipsToStrings(ips []net.IP) []string {
 	}
 
 	return rv
-}
+}