support for raw-wireguard and wg-quick style peer configurations (#441)

docs/documentation/configuration/overview.md

@@ -673,6 +673,19 @@ Without a valid `external_url`, the login process may fail due to CSRF protectio
 ## Webhook
 
 The webhook section allows you to configure a webhook that is called on certain events in WireGuard Portal.
+A JSON object is sent in a POST request to the webhook URL with the following structure:
+```json
+{
+  "event": "update",
+  "entity": "peer",
+  "identifier": "the-peer-identifier",
+  "payload": {
+    // The payload of the event, e.g. peer data.
+    // Check the API documentation for the exact structure.
+  }
+}
+```
+
 Further details can be found in the [usage documentation](../usage/webhooks.md).
 
 ### `url`

docs/documentation/usage/webhooks.md

@@ -38,12 +38,11 @@ WireGuard Portal supports various events that can trigger webhooks. The followin
 - `connect`: Triggered when a user connects to the VPN.
 - `disconnect`: Triggered when a user disconnects from the VPN.
 
-The following entity models are supported for webhook events:
+The following entity types can trigger webhooks:
 
-- `user`: WireGuard Portal users support creation, update, or deletion events.
+- `user`: When a WireGuard Portal user is created, updated, or deleted.
-- `peer`: Peers support creation, update, or deletion events. Via the `peer_metric` entity, you can also receive connection status updates.
+- `peer`: When a peer is created, updated, or deleted. This entity can also trigger `connect` and `disconnect` events.
-- `peer_metric`: Peer metrics support connection status updates, such as when a peer connects or disconnects.
+- `interface`: When a device is created, updated, or deleted.
-- `interface`: WireGuard interfaces support creation, update, or deletion events.
 
 ## Payload Structure
 
@@ -52,234 +51,36 @@ A common shell structure for webhook payloads is as follows:
 
 ```json
 {
-  "event": "create", // The event type, e.g. "create", "update", "delete", "connect", "disconnect"
+  "event": "create",
-  "entity": "user",  // The entity type, e.g. "user", "peer", "peer_metric", "interface"
+  "entity": "user",
-  "identifier": "the-user-identifier", // Unique identifier of the entity, e.g. user ID or peer ID
+  "identifier": "the-user-identifier",
   "payload": {
-    // The payload of the event, e.g. a Peer model.
+    // The payload of the event, e.g. peer data.
-    // Detailed model descriptions are provided below.
+    // Check the API documentation for the exact structure.
   }
 }
 ```
 
-### Payload Models
 
-All payload models are encoded as JSON objects. Fields with empty values might be omitted in the payload.
+### Example Payload
-
-#### User Payload (entity: `user`)
-
-| JSON Field     | Type        | Description                       |
-|----------------|-------------|-----------------------------------|
-| CreatedBy      | string      | Creator identifier                |
-| UpdatedBy      | string      | Last updater identifier           |
-| CreatedAt      | time.Time   | Time of creation                  |
-| UpdatedAt      | time.Time   | Time of last update               |
-| Identifier     | string      | Unique user identifier            |
-| Email          | string      | User email                        |
-| Source         | string      | Authentication source             |
-| ProviderName   | string      | Name of auth provider             |
-| IsAdmin        | bool        | Whether user has admin privileges |
-| Firstname      | string      | User's first name (optional)      |
-| Lastname       | string      | User's last name (optional)       |
-| Phone          | string      | Contact phone number (optional)   |
-| Department     | string      | User's department (optional)      |
-| Notes          | string      | Additional notes (optional)       |
-| Disabled       | *time.Time  | When user was disabled            |
-| DisabledReason | string      | Reason for deactivation           |
-| Locked         | *time.Time  | When user account was locked      |
-| LockedReason   | string      | Reason for being locked           |
-
-
-#### Peer Payload (entity: `peer`)
-
-| JSON Field           | Type       | Description                            |
-|----------------------|------------|----------------------------------------|
-| CreatedBy            | string     | Creator identifier                     |
-| UpdatedBy            | string     | Last updater identifier                |
-| CreatedAt            | time.Time  | Creation timestamp                     |
-| UpdatedAt            | time.Time  | Last update timestamp                  |
-| Endpoint             | string     | Peer endpoint address                  |
-| EndpointPublicKey    | string     | Public key of peer endpoint            |
-| AllowedIPsStr        | string     | Allowed IPs                            |
-| ExtraAllowedIPsStr   | string     | Extra allowed IPs                      |
-| PresharedKey         | string     | Pre-shared key for encryption          |
-| PersistentKeepalive  | int        | Keepalive interval in seconds          |
-| DisplayName          | string     | Display name of the peer               |
-| Identifier           | string     | Unique identifier                      |
-| UserIdentifier       | string     | Associated user ID (optional)          |
-| InterfaceIdentifier  | string     | Interface this peer is attached to     |
-| Disabled             | *time.Time | When the peer was disabled             |
-| DisabledReason       | string     | Reason for being disabled              |
-| ExpiresAt            | *time.Time | Expiration date                        |
-| Notes                | string     | Notes for this peer                    |
-| AutomaticallyCreated | bool       | Whether peer was auto-generated        |
-| PrivateKey           | string     | Peer private key                       |
-| PublicKey            | string     | Peer public key                        |
-| InterfaceType        | string     | Type of the peer interface             |
-| Addresses            | []string   | IP addresses                           |
-| CheckAliveAddress    | string     | Address used for alive checks          |
-| DnsStr               | string     | DNS servers                            |
-| DnsSearchStr         | string     | DNS search domains                     |
-| Mtu                  | int        | MTU (Maximum Transmission Unit)        |
-| FirewallMark         | uint32     | Firewall mark (optional)               |
-| RoutingTable         | string     | Custom routing table (optional)        |
-| PreUp                | string     | Command before bringing up interface   |
-| PostUp               | string     | Command after bringing up interface    |
-| PreDown              | string     | Command before bringing down interface |
-| PostDown             | string     | Command after bringing down interface  |
-
-
-#### Interface Payload (entity: `interface`)
-
-| JSON Field                 | Type       | Description                            |
-|----------------------------|------------|----------------------------------------|
-| CreatedBy                  | string     | Creator identifier                     |
-| UpdatedBy                  | string     | Last updater identifier                |
-| CreatedAt                  | time.Time  | Creation timestamp                     |
-| UpdatedAt                  | time.Time  | Last update timestamp                  |
-| Identifier                 | string     | Unique identifier                      |
-| PrivateKey                 | string     | Private key for the interface          |
-| PublicKey                  | string     | Public key for the interface           |
-| ListenPort                 | int        | Listening port                         |
-| Addresses                  | []string   | IP addresses                           |
-| DnsStr                     | string     | DNS servers                            |
-| DnsSearchStr               | string     | DNS search domains                     |
-| Mtu                        | int        | MTU (Maximum Transmission Unit)        |
-| FirewallMark               | uint32     | Firewall mark                          |
-| RoutingTable               | string     | Custom routing table                   |
-| PreUp                      | string     | Command before bringing up interface   |
-| PostUp                     | string     | Command after bringing up interface    |
-| PreDown                    | string     | Command before bringing down interface |
-| PostDown                   | string     | Command after bringing down interface  |
-| SaveConfig                 | bool       | Whether to save config to file         |
-| DisplayName                | string     | Human-readable name                    |
-| Type                       | string     | Type of interface                      |
-| DriverType                 | string     | Driver used                            |
-| Disabled                   | *time.Time | When the interface was disabled        |
-| DisabledReason             | string     | Reason for being disabled              |
-| PeerDefNetworkStr          | string     | Default peer network configuration     |
-| PeerDefDnsStr              | string     | Default peer DNS servers               |
-| PeerDefDnsSearchStr        | string     | Default peer DNS search domains        |
-| PeerDefEndpoint            | string     | Default peer endpoint                  |
-| PeerDefAllowedIPsStr       | string     | Default peer allowed IPs               |
-| PeerDefMtu                 | int        | Default peer MTU                       |
-| PeerDefPersistentKeepalive | int        | Default keepalive value                |
-| PeerDefFirewallMark        | uint32     | Default firewall mark for peers        |
-| PeerDefRoutingTable        | string     | Default routing table for peers        |
-| PeerDefPreUp               | string     | Default peer pre-up command            |
-| PeerDefPostUp              | string     | Default peer post-up command           |
-| PeerDefPreDown             | string     | Default peer pre-down command          |
-| PeerDefPostDown            | string     | Default peer post-down command         |
-
-
-#### Peer Metrics Payload (entity: `peer_metric`)
-
-| JSON Field | Type       | Description                |
-|------------|------------|----------------------------|
-| Status     | PeerStatus | Current status of the peer |
-| Peer       | Peer       | Peer  data                 |
-
-`PeerStatus` sub-structure:
-
-| JSON Field       | Type       | Description                  |
-|------------------|------------|------------------------------|
-| UpdatedAt        | time.Time  | Time of last status update   |
-| IsConnected      | bool       | Is peer currently connected  |
-| IsPingable       | bool       | Can peer be pinged           |
-| LastPing         | *time.Time | Time of last successful ping |
-| BytesReceived    | uint64     | Bytes received from peer     |
-| BytesTransmitted | uint64     | Bytes sent to peer           |
-| Endpoint         | string     | Last known endpoint          |
-| LastHandshake    | *time.Time | Last successful handshake    |
-| LastSessionStart | *time.Time | Time the last session began  |
-
-
-### Example Payloads
 
 The following payload is an example of a webhook event when a peer connects to the VPN:
 
 ```json
 {
   "event": "connect",
-  "entity": "peer_metric",
-  "identifier": "Fb5TaziAs1WrPBjC/MFbWsIelVXvi0hDKZ3YQM9wmU8=",
-  "payload": {
-    "Status": {
-      "UpdatedAt": "2025-06-27T22:20:08.734900034+02:00",
-      "IsConnected": true,
-      "IsPingable": false,
-      "BytesReceived": 212,
-      "BytesTransmitted": 2884,
-      "Endpoint": "10.55.66.77:58756",
-      "LastHandshake": "2025-06-27T22:19:46.580842776+02:00",
-      "LastSessionStart": "2025-06-27T22:19:46.580842776+02:00"
-    },
-    "Peer": {
-      "CreatedBy": "admin@wgportal.local",
-      "UpdatedBy": "admin@wgportal.local",
-      "CreatedAt": "2025-06-26T21:43:49.251839574+02:00",
-      "UpdatedAt": "2025-06-27T22:18:39.67763985+02:00",
-      "Endpoint": "10.55.66.1:51820",
-      "EndpointPublicKey": "eiVibpi3C2PUPcx2kwA5s09OgHx7AEaKMd33k0LQ5mM=",
-      "AllowedIPsStr": "10.11.12.0/24,fdfd:d3ad:c0de:1234::/64",
-      "ExtraAllowedIPsStr": "",
-      "PresharedKey": "p9DDeLUSLOdQcjS8ZsBAiqUzwDIUvTyzavRZFuzhvyE=",
-      "PersistentKeepalive": 16,
-      "DisplayName": "Peer Fb5TaziA",
-      "Identifier": "Fb5TaziAs1WrPBjC/MFbWsIelVXvi0hDKZ3YQM9wmU8=",
-      "UserIdentifier": "admin@wgportal.local",
-      "InterfaceIdentifier": "wgTesting",
-      "AutomaticallyCreated": false,
-      "PrivateKey": "QBFNBe+7J49ergH0ze2TGUJMFrL/2bOL50Z2cgluYW8=",
-      "PublicKey": "Fb5TaziAs1WrPBjC/MFbWsIelVXvi0hDKZ3YQM9wmU8=",
-      "InterfaceType": "client",
-      "Addresses": [
-        "10.11.12.10/32",
-        "fdfd:d3ad:c0de:1234::a/128"
-      ],
-      "CheckAliveAddress": "",
-      "DnsStr": "",
-      "DnsSearchStr": "",
-      "Mtu": 1420
-    }
-  }
-}
-```
-
-Here is another example of a webhook event when a peer is updated:
-
-```json
-{
-  "event": "update",
   "entity": "peer",
   "identifier": "Fb5TaziAs1WrPBjC/MFbWsIelVXvi0hDKZ3YQM9wmU8=",
   "payload": {
-    "CreatedBy": "admin@wgportal.local",
+    "PeerId": "Fb5TaziAs1WrPBjC/MFbWsIelVXvi0hDKZ3YQM9wmU8=",
-    "UpdatedBy": "admin@wgportal.local",
+    "IsConnected": true,
-    "CreatedAt": "2025-06-26T21:43:49.251839574+02:00",
+    "IsPingable": false,
-    "UpdatedAt": "2025-06-27T22:18:39.67763985+02:00",
+    "LastPing": null,
-    "Endpoint": "10.55.66.1:51820",
+    "BytesReceived": 1860,
-    "EndpointPublicKey": "eiVibpi3C2PUPcx2kwA5s09OgHx7AEaKMd33k0LQ5mM=",
+    "BytesTransmitted": 10824,
-    "AllowedIPsStr": "10.11.12.0/24,fdfd:d3ad:c0de:1234::/64",
+    "LastHandshake": "2025-06-26T23:04:33.325216659+02:00",
-    "ExtraAllowedIPsStr": "",
+    "Endpoint": "10.55.66.77:33874",
-    "PresharedKey": "p9DDeLUSLOdQcjS8ZsBAiqUzwDIUvTyzavRZFuzhvyE=",
+    "LastSessionStart": "2025-06-26T22:50:40.10221606+02:00"
-    "PersistentKeepalive": 16,
-    "DisplayName": "Peer Fb5TaziA",
-    "Identifier": "Fb5TaziAs1WrPBjC/MFbWsIelVXvi0hDKZ3YQM9wmU8=",
-    "UserIdentifier": "admin@wgportal.local",
-    "InterfaceIdentifier": "wgTesting",
-    "AutomaticallyCreated": false,
-    "PrivateKey": "QBFNBe+7J49ergH0ze2TGUJMFrL/2bOL50Z2cgluYW8=",
-    "PublicKey": "Fb5TaziAs1WrPBjC/MFbWsIelVXvi0hDKZ3YQM9wmU8=",
-    "InterfaceType": "client",
-    "Addresses": [
-      "10.11.12.10/32",
-      "fdfd:d3ad:c0de:1234::a/128"
-    ],
-    "CheckAliveAddress": "",
-    "DnsStr": "",
-    "DnsSearchStr": "",
-    "Mtu": 1420
   }
 }
 ```

frontend/src/components/PeerViewModal.vue

@@ -50,7 +50,7 @@ const selectedStats = computed(() => {
 
   if (!s) {
     if (!!props.peerId || props.peerId.length) {
-      p = profile.Statistics(props.peerId)
+      s = profile.Statistics(props.peerId)
     } else {
       s = freshStats() // dummy stats to avoid 'undefined' exceptions
     }
@@ -79,13 +79,19 @@ const title = computed(() => {
   }
 })
 
+const configStyle = ref("wgquick")
+
 watch(() => props.visible, async (newValue, oldValue) => {
   if (oldValue === false && newValue === true) { // if modal is shown
-    await peers.LoadPeerConfig(selectedPeer.value.Identifier)
+    await peers.LoadPeerConfig(selectedPeer.value.Identifier, configStyle.value)
     configString.value = peers.configuration
   }
-}
+})
-)
+
+watch(() => configStyle.value, async () => {
+  await peers.LoadPeerConfig(selectedPeer.value.Identifier, configStyle.value)
+  configString.value = peers.configuration
+})
 
 function download() {
   // credit: https://www.bitdegree.org/learn/javascript-download
@@ -103,7 +109,7 @@ function download() {
 }
 
 function email() {
-  peers.MailPeerConfig(settings.Setting("MailLinkOnly"), [selectedPeer.value.Identifier]).catch(e => {
+  peers.MailPeerConfig(settings.Setting("MailLinkOnly"), configStyle.value, [selectedPeer.value.Identifier]).catch(e => {
     notify({
       title: "Failed to send mail with peer configuration!",
       text: e.toString(),
@@ -114,7 +120,7 @@ function email() {
 
 function ConfigQrUrl() {
   if (props.peerId.length) {
-    return apiWrapper.url(`/peer/config-qr/${base64_url_encode(props.peerId)}`)
+    return apiWrapper.url(`/peer/config-qr/${base64_url_encode(props.peerId)}?style=${configStyle.value}`)
   }
   return ''
 }
@@ -124,6 +130,15 @@ function ConfigQrUrl() {
 <template>
   <Modal :title="title" :visible="visible" @close="close">
     <template #default>
+      <div class="d-flex justify-content-end align-items-center mb-1">
+        <span class="me-2">{{ $t('modals.peer-view.style-label') }}: </span>
+        <div class="btn-group btn-switch-group" role="group" aria-label="Configuration Style">
+          <input type="radio" class="btn-check" name="configstyle" id="raw" value="raw" autocomplete="off" checked="" v-model="configStyle">
+          <label class="btn btn-outline-primary btn-sm" for="raw">Raw</label>
+          <input type="radio" class="btn-check" name="configstyle" id="wgquick" value="wgquick" autocomplete="off" checked="" v-model="configStyle">
+          <label class="btn btn-outline-primary btn-sm" for="wgquick">WG-Quick</label>
+        </div>
+      </div>
       <div class="accordion" id="peerInformation">
         <div class="accordion-item">
           <h2 class="accordion-header">
@@ -213,6 +228,14 @@ function ConfigQrUrl() {
   </template>
 </Modal></template>
 
-<style>.config-qr-img {
+<style>
+.config-qr-img {
   max-width: 100%;
-}</style>
+}
+
+.btn-switch-group .btn {
+  border-width: 1px;
+  padding: 5px;
+  line-height: 1;
+}
+</style>

frontend/src/lang/translations/de.json

@@ -467,7 +467,8 @@
       "connected-since": "Verbunden seit",
       "endpoint": "Endpunkt",
       "button-download": "Konfiguration herunterladen",
-      "button-email": "Konfiguration per E-Mail senden"
+      "button-email": "Konfiguration per E-Mail senden",
+      "style-label": "Konfigurationsformat"
     },
     "peer-edit": {
       "headline-edit-peer": "Peer bearbeiten:",

frontend/src/lang/translations/en.json

@@ -468,7 +468,8 @@
       "connected-since": "Connected since",
       "endpoint": "Endpoint",
       "button-download": "Download configuration",
-      "button-email": "Send configuration via E-Mail"
+      "button-email": "Send configuration via E-Mail",
+      "style-label": "Configuration Style"
     },
     "peer-edit": {
       "headline-edit-peer": "Edit peer:",

frontend/src/stores/peers.js

@@ -142,8 +142,8 @@ export const peerStore = defineStore('peers', {
           })
         })
     },
-    async MailPeerConfig(linkOnly, ids) {
+    async MailPeerConfig(linkOnly, style, ids) {
-      return apiWrapper.post(`${baseUrl}/config-mail`, {
+      return apiWrapper.post(`${baseUrl}/config-mail?style=${style}`, {
           Identifiers: ids,
           LinkOnly: linkOnly
         })
@@ -158,8 +158,8 @@ export const peerStore = defineStore('peers', {
           throw new Error(error)
         })
     },
-    async LoadPeerConfig(id) {
+    async LoadPeerConfig(id, style) {
-      return apiWrapper.get(`${baseUrl}/config/${base64_url_encode(id)}`)
+      return apiWrapper.get(`${baseUrl}/config/${base64_url_encode(id)}?style=${style}`)
         .then(this.setPeerConfig)
         .catch(error => {
           this.configuration = ""

internal/app/api/core/assets/doc/v0_swagger.json

@@ -819,6 +819,12 @@
                         "schema": {
                             "$ref": "#/definitions/model.PeerMailRequest"
                         }
+                    },
+                    {
+                        "type": "string",
+                        "description": "The configuration style",
+                        "name": "style",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -858,6 +864,12 @@
                         "name": "id",
                         "in": "path",
                         "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "The configuration style",
+                        "name": "style",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -899,6 +911,12 @@
                         "name": "id",
                         "in": "path",
                         "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "The configuration style",
+                        "name": "style",
+                        "in": "query"
                     }
                 ],
                 "responses": {

internal/app/api/core/assets/doc/v0_swagger.yaml

@@ -1072,6 +1072,10 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.PeerMailRequest'
+      - description: The configuration style
+        in: query
+        name: style
+        type: string
       produces:
       - application/json
       responses:
@@ -1097,6 +1101,10 @@ paths:
         name: id
         required: true
         type: string
+      - description: The configuration style
+        in: query
+        name: style
+        type: string
       produces:
       - image/png
       - application/json
@@ -1125,6 +1133,10 @@ paths:
         name: id
         required: true
         type: string
+      - description: The configuration style
+        in: query
+        name: style
+        type: string
       produces:
       - application/json
       responses:

internal/app/api/v0/backend/peer_service.go

@@ -27,12 +27,12 @@ type PeerServicePeerManager interface {
 }
 
 type PeerServiceConfigFileManager interface {
-	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error)
-	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error)
 }
 
 type PeerServiceMailManager interface {
-	SendPeerEmail(ctx context.Context, linkOnly bool, peers ...domain.PeerIdentifier) error
+	SendPeerEmail(ctx context.Context, linkOnly bool, style string, peers ...domain.PeerIdentifier) error
 }
 
 // endregion dependencies
@@ -95,16 +95,24 @@ func (p PeerService) DeletePeer(ctx context.Context, id domain.PeerIdentifier) e
 	return p.peers.DeletePeer(ctx, id)
 }
 
-func (p PeerService) GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error) {
+func (p PeerService) GetPeerConfig(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error) {
-	return p.configFile.GetPeerConfig(ctx, id)
+	return p.configFile.GetPeerConfig(ctx, id, style)
 }
 
-func (p PeerService) GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error) {
+func (p PeerService) GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier, style string) (
-	return p.configFile.GetPeerConfigQrCode(ctx, id)
+	io.Reader,
+	error,
+) {
+	return p.configFile.GetPeerConfigQrCode(ctx, id, style)
 }
 
-func (p PeerService) SendPeerEmail(ctx context.Context, linkOnly bool, peers ...domain.PeerIdentifier) error {
+func (p PeerService) SendPeerEmail(
-	return p.mailer.SendPeerEmail(ctx, linkOnly, peers...)
+	ctx context.Context,
+	linkOnly bool,
+	style string,
+	peers ...domain.PeerIdentifier,
+) error {
+	return p.mailer.SendPeerEmail(ctx, linkOnly, style, peers...)
 }
 
 func (p PeerService) GetPeerStats(ctx context.Context, id domain.InterfaceIdentifier) ([]domain.PeerStatus, error) {

internal/app/api/v0/handlers/endpoint_peers.go

@@ -34,11 +34,11 @@ type PeerService interface {
 	// DeletePeer deletes the peer with the given id.
 	DeletePeer(ctx context.Context, id domain.PeerIdentifier) error
 	// GetPeerConfig returns the peer configuration for the given id.
-	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error)
 	// GetPeerConfigQrCode returns the peer configuration as qr code for the given id.
-	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error)
 	// SendPeerEmail sends the peer configuration via email.
-	SendPeerEmail(ctx context.Context, linkOnly bool, peers ...domain.PeerIdentifier) error
+	SendPeerEmail(ctx context.Context, linkOnly bool, style string, peers ...domain.PeerIdentifier) error
 	// GetPeerStats returns the peer stats for the given interface.
 	GetPeerStats(ctx context.Context, id domain.InterfaceIdentifier) ([]domain.PeerStatus, error)
 }
@@ -355,6 +355,7 @@ func (e PeerEndpoint) handleDelete() http.HandlerFunc {
 // @Summary Get peer configuration as string.
 // @Produce json
 // @Param id path string true "The peer identifier"
+// @Param style query string false "The configuration style"
 // @Success 200 {object} string
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
@@ -369,7 +370,9 @@ func (e PeerEndpoint) handleConfigGet() http.HandlerFunc {
 			return
 		}
 
-		configTxt, err := e.peerService.GetPeerConfig(r.Context(), domain.PeerIdentifier(id))
+		configStyle := e.getConfigStyle(r)
+
+		configTxt, err := e.peerService.GetPeerConfig(r.Context(), domain.PeerIdentifier(id), configStyle)
 		if err != nil {
 			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
@@ -397,6 +400,7 @@ func (e PeerEndpoint) handleConfigGet() http.HandlerFunc {
 // @Produce png
 // @Produce json
 // @Param id path string true "The peer identifier"
+// @Param style query string false "The configuration style"
 // @Success 200 {file} binary
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
@@ -411,7 +415,9 @@ func (e PeerEndpoint) handleQrCodeGet() http.HandlerFunc {
 			return
 		}
 
-		configQr, err := e.peerService.GetPeerConfigQrCode(r.Context(), domain.PeerIdentifier(id))
+		configStyle := e.getConfigStyle(r)
+
+		configQr, err := e.peerService.GetPeerConfigQrCode(r.Context(), domain.PeerIdentifier(id), configStyle)
 		if err != nil {
 			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
@@ -438,6 +444,7 @@ func (e PeerEndpoint) handleQrCodeGet() http.HandlerFunc {
 // @Summary Send peer configuration via email.
 // @Produce json
 // @Param request body model.PeerMailRequest true "The peer mail request data"
+// @Param style query string false "The configuration style"
 // @Success 204 "No content if mail sending was successful"
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
@@ -460,11 +467,13 @@ func (e PeerEndpoint) handleEmailPost() http.HandlerFunc {
 			return
 		}
 
+		configStyle := e.getConfigStyle(r)
+
 		peerIds := make([]domain.PeerIdentifier, len(req.Identifiers))
 		for i := range req.Identifiers {
 			peerIds[i] = domain.PeerIdentifier(req.Identifiers[i])
 		}
-		if err := e.peerService.SendPeerEmail(r.Context(), req.LinkOnly, peerIds...); err != nil {
+		if err := e.peerService.SendPeerEmail(r.Context(), req.LinkOnly, configStyle, peerIds...); err != nil {
 			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
@@ -504,3 +513,11 @@ func (e PeerEndpoint) handleStatsGet() http.HandlerFunc {
 		respond.JSON(w, http.StatusOK, model.NewPeerStats(e.cfg.Statistics.CollectPeerData, stats))
 	}
 }
+
+func (e PeerEndpoint) getConfigStyle(r *http.Request) string {
+	configStyle := request.QueryDefault(r, "style", domain.ConfigStyleWgQuick)
+	if configStyle != domain.ConfigStyleWgQuick && configStyle != domain.ConfigStyleRaw {
+		configStyle = domain.ConfigStyleWgQuick // default to wg-quick style
+	}
+	return configStyle
+}

internal/app/api/v1/backend/provisioning_service.go

@@ -23,8 +23,8 @@ type ProvisioningServicePeerManagerRepo interface {
 }
 
 type ProvisioningServiceConfigFileManagerRepo interface {
-	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error)
-	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error)
 }
 
 type ProvisioningService struct {
@@ -96,7 +96,7 @@ func (p ProvisioningService) GetPeerConfig(ctx context.Context, peerId domain.Pe
 		return nil, err
 	}
 
-	peerCfgReader, err := p.configFiles.GetPeerConfig(ctx, peer.Identifier)
+	peerCfgReader, err := p.configFiles.GetPeerConfig(ctx, peer.Identifier, domain.ConfigStyleWgQuick)
 	if err != nil {
 		return nil, err
 	}
@@ -119,7 +119,7 @@ func (p ProvisioningService) GetPeerQrPng(ctx context.Context, peerId domain.Pee
 		return nil, err
 	}
 
-	peerCfgQrReader, err := p.configFiles.GetPeerConfigQrCode(ctx, peer.Identifier)
+	peerCfgQrReader, err := p.configFiles.GetPeerConfigQrCode(ctx, peer.Identifier, domain.ConfigStyleWgQuick)
 	if err != nil {
 		return nil, err
 	}

internal/app/configfile/manager.go

@@ -46,7 +46,7 @@ type TemplateRenderer interface {
 	// GetInterfaceConfig returns the configuration file for the given interface.
 	GetInterfaceConfig(iface *domain.Interface, peers []domain.Peer) (io.Reader, error)
 	// GetPeerConfig returns the configuration file for the given peer.
-	GetPeerConfig(peer *domain.Peer) (io.Reader, error)
+	GetPeerConfig(peer *domain.Peer, style string) (io.Reader, error)
 }
 
 type EventBus interface {
@@ -186,7 +186,7 @@ func (m Manager) GetInterfaceConfig(ctx context.Context, id domain.InterfaceIden
 
 // GetPeerConfig returns the configuration file for the given peer.
 // The file is structured in wg-quick format.
-func (m Manager) GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error) {
+func (m Manager) GetPeerConfig(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error) {
 	peer, err := m.wg.GetPeer(ctx, id)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch peer %s: %w", id, err)
@@ -196,11 +196,11 @@ func (m Manager) GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (i
 		return nil, err
 	}
 
-	return m.tplHandler.GetPeerConfig(peer)
+	return m.tplHandler.GetPeerConfig(peer, style)
 }
 
 // GetPeerConfigQrCode returns a QR code image containing the configuration for the given peer.
-func (m Manager) GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error) {
+func (m Manager) GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error) {
 	peer, err := m.wg.GetPeer(ctx, id)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch peer %s: %w", id, err)
@@ -210,7 +210,7 @@ func (m Manager) GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifi
 		return nil, err
 	}
 
-	cfgData, err := m.tplHandler.GetPeerConfig(peer)
+	cfgData, err := m.tplHandler.GetPeerConfig(peer, style)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get peer config for %s: %w", id, err)
 	}

internal/app/configfile/template.go

@@ -55,11 +55,12 @@ func (c TemplateHandler) GetInterfaceConfig(cfg *domain.Interface, peers []domai
 }
 
 // GetPeerConfig returns the rendered configuration file for a WireGuard peer.
-func (c TemplateHandler) GetPeerConfig(peer *domain.Peer) (io.Reader, error) {
+func (c TemplateHandler) GetPeerConfig(peer *domain.Peer, style string) (io.Reader, error) {
 	var tplBuff bytes.Buffer
 
 	err := c.templates.ExecuteTemplate(&tplBuff, "wg_peer.tpl", map[string]any{
-		"Peer": peer,
+		"Style": style,
+		"Peer":  peer,
 		"Portal": map[string]any{
 			"Version": "unknown",
 		},

internal/app/configfile/tpl_files/wg_peer.tpl

@@ -1,6 +1,8 @@
 # AUTOGENERATED FILE - DO NOT EDIT
-# This file uses wg-quick format.
+# This file uses {{ .Style }} format.
+{{- if eq .Style "wgquick"}}
 # See https://man7.org/linux/man-pages/man8/wg-quick.8.html#CONFIGURATION
+{{- end}}
 # Lines starting with the -WGP- tag are used by
 # the WireGuard Portal configuration parser.
 
@@ -21,22 +23,27 @@
 
 # Core settings
 PrivateKey = {{ .Peer.Interface.KeyPair.PrivateKey }}
+{{- if eq .Style "wgquick"}}
 Address = {{ CidrsToString .Peer.Interface.Addresses }}
+{{- end}}
 
 # Misc. settings (optional)
+{{- if eq .Style "wgquick"}}
 {{- if .Peer.Interface.DnsStr.GetValue}}
 DNS = {{ .Peer.Interface.DnsStr.GetValue }} {{- if .Peer.Interface.DnsSearchStr.GetValue}}, {{ .Peer.Interface.DnsSearchStr.GetValue }} {{- end}}
 {{- end}}
 {{- if ne .Peer.Interface.Mtu.GetValue 0}}
 MTU = {{ .Peer.Interface.Mtu.GetValue }}
 {{- end}}
-{{- if ne .Peer.Interface.FirewallMark.GetValue 0}}
-FwMark = {{ .Peer.Interface.FirewallMark.GetValue }}
-{{- end}}
 {{- if ne .Peer.Interface.RoutingTable.GetValue ""}}
 Table = {{ .Peer.Interface.RoutingTable.GetValue }}
 {{- end}}
+{{- end}}
+{{- if ne .Peer.Interface.FirewallMark.GetValue 0}}
+FwMark = {{ .Peer.Interface.FirewallMark.GetValue }}
+{{- end}}
 
+{{- if eq .Style "wgquick"}}
 # Interface hooks (optional)
 {{- if .Peer.Interface.PreUp.GetValue}}
 PreUp = {{ .Peer.Interface.PreUp.GetValue }}
@@ -50,6 +57,7 @@ PreDown = {{ .Peer.Interface.PreDown.GetValue }}
 {{- if .Peer.Interface.PostDown.GetValue}}
 PostDown = {{ .Peer.Interface.PostDown.GetValue }}
 {{- end}}
+{{- end}}
 
 [Peer]
 PublicKey = {{ .Peer.EndpointPublicKey.GetValue }}

internal/app/mail/manager.go

@@ -21,9 +21,9 @@ type ConfigFileManager interface {
 	// GetInterfaceConfig returns the configuration for the given interface.
 	GetInterfaceConfig(ctx context.Context, id domain.InterfaceIdentifier) (io.Reader, error)
 	// GetPeerConfig returns the configuration for the given peer.
-	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error)
 	// GetPeerConfigQrCode returns the QR code for the given peer.
-	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier, style string) (io.Reader, error)
 }
 
 type UserDatabaseRepo interface {
@@ -89,7 +89,7 @@ func NewMailManager(
 }
 
 // SendPeerEmail sends an email to the user linked to the given peers.
-func (m Manager) SendPeerEmail(ctx context.Context, linkOnly bool, peers ...domain.PeerIdentifier) error {
+func (m Manager) SendPeerEmail(ctx context.Context, linkOnly bool, style string, peers ...domain.PeerIdentifier) error {
 	for _, peerId := range peers {
 		peer, err := m.wg.GetPeer(ctx, peerId)
 		if err != nil {
@@ -123,7 +123,7 @@ func (m Manager) SendPeerEmail(ctx context.Context, linkOnly bool, peers ...doma
 			continue
 		}
 
-		err = m.sendPeerEmail(ctx, linkOnly, user, peer)
+		err = m.sendPeerEmail(ctx, linkOnly, style, user, peer)
 		if err != nil {
 			return fmt.Errorf("failed to send peer email for %s: %w", peerId, err)
 		}
@@ -132,7 +132,13 @@ func (m Manager) SendPeerEmail(ctx context.Context, linkOnly bool, peers ...doma
 	return nil
 }
 
-func (m Manager) sendPeerEmail(ctx context.Context, linkOnly bool, user *domain.User, peer *domain.Peer) error {
+func (m Manager) sendPeerEmail(
+	ctx context.Context,
+	linkOnly bool,
+	style string,
+	user *domain.User,
+	peer *domain.Peer,
+) error {
 	qrName := "WireGuardQRCode.png"
 	configName := peer.GetConfigFileName()
 
@@ -148,12 +154,12 @@ func (m Manager) sendPeerEmail(ctx context.Context, linkOnly bool, user *domain.
 		}
 
 	} else {
-		peerConfig, err := m.configFiles.GetPeerConfig(ctx, peer.Identifier)
+		peerConfig, err := m.configFiles.GetPeerConfig(ctx, peer.Identifier, style)
 		if err != nil {
 			return fmt.Errorf("failed to fetch peer config for %s: %w", peer.Identifier, err)
 		}
 
-		peerConfigQr, err := m.configFiles.GetPeerConfigQrCode(ctx, peer.Identifier)
+		peerConfigQr, err := m.configFiles.GetPeerConfigQrCode(ctx, peer.Identifier, style)
 		if err != nil {
 			return fmt.Errorf("failed to fetch peer config QR code for %s: %w", peer.Identifier, err)
 		}

internal/app/webhooks/manager.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 
 	"github.com/h44z/wg-portal/internal/app"
-	"github.com/h44z/wg-portal/internal/app/webhooks/models"
 	"github.com/h44z/wg-portal/internal/config"
 	"github.com/h44z/wg-portal/internal/domain"
 )
@@ -102,46 +101,46 @@ func (m Manager) sendWebhook(ctx context.Context, data io.Reader) error {
 }
 
 func (m Manager) handleUserCreateEvent(user domain.User) {
-	m.handleGenericEvent(WebhookEventCreate, models.NewUser(user))
+	m.handleGenericEvent(WebhookEventCreate, user)
 }
 
 func (m Manager) handleUserUpdateEvent(user domain.User) {
-	m.handleGenericEvent(WebhookEventUpdate, models.NewUser(user))
+	m.handleGenericEvent(WebhookEventUpdate, user)
 }
 
 func (m Manager) handleUserDeleteEvent(user domain.User) {
-	m.handleGenericEvent(WebhookEventDelete, models.NewUser(user))
+	m.handleGenericEvent(WebhookEventDelete, user)
 }
 
 func (m Manager) handlePeerCreateEvent(peer domain.Peer) {
-	m.handleGenericEvent(WebhookEventCreate, models.NewPeer(peer))
+	m.handleGenericEvent(WebhookEventCreate, peer)
 }
 
 func (m Manager) handlePeerUpdateEvent(peer domain.Peer) {
-	m.handleGenericEvent(WebhookEventUpdate, models.NewPeer(peer))
+	m.handleGenericEvent(WebhookEventUpdate, peer)
 }
 
 func (m Manager) handlePeerDeleteEvent(peer domain.Peer) {
-	m.handleGenericEvent(WebhookEventDelete, models.NewPeer(peer))
+	m.handleGenericEvent(WebhookEventDelete, peer)
 }
 
 func (m Manager) handleInterfaceCreateEvent(iface domain.Interface) {
-	m.handleGenericEvent(WebhookEventCreate, models.NewInterface(iface))
+	m.handleGenericEvent(WebhookEventCreate, iface)
 }
 
 func (m Manager) handleInterfaceUpdateEvent(iface domain.Interface) {
-	m.handleGenericEvent(WebhookEventUpdate, models.NewInterface(iface))
+	m.handleGenericEvent(WebhookEventUpdate, iface)
 }
 
 func (m Manager) handleInterfaceDeleteEvent(iface domain.Interface) {
-	m.handleGenericEvent(WebhookEventDelete, models.NewInterface(iface))
+	m.handleGenericEvent(WebhookEventDelete, iface)
 }
 
-func (m Manager) handlePeerStateChangeEvent(peerStatus domain.PeerStatus, peer domain.Peer) {
+func (m Manager) handlePeerStateChangeEvent(peerStatus domain.PeerStatus) {
 	if peerStatus.IsConnected {
-		m.handleGenericEvent(WebhookEventConnect, models.NewPeerMetrics(peerStatus, peer))
+		m.handleGenericEvent(WebhookEventConnect, peerStatus)
 	} else {
-		m.handleGenericEvent(WebhookEventDisconnect, models.NewPeerMetrics(peerStatus, peer))
+		m.handleGenericEvent(WebhookEventDisconnect, peerStatus)
 	}
 }
 
@@ -178,18 +177,18 @@ func (m Manager) createWebhookData(action WebhookEvent, payload any) (*WebhookDa
 	}
 
 	switch v := payload.(type) {
-	case models.User:
+	case domain.User:
 		d.Entity = WebhookEntityUser
-		d.Identifier = v.Identifier
+		d.Identifier = string(v.Identifier)
-	case models.Peer:
+	case domain.Peer:
 		d.Entity = WebhookEntityPeer
-		d.Identifier = v.Identifier
+		d.Identifier = string(v.Identifier)
-	case models.Interface:
+	case domain.Interface:
 		d.Entity = WebhookEntityInterface
-		d.Identifier = v.Identifier
+		d.Identifier = string(v.Identifier)
-	case models.PeerMetrics:
+	case domain.PeerStatus:
-		d.Entity = WebhookEntityPeerMetric
+		d.Entity = WebhookEntityPeer
-		d.Identifier = v.Peer.Identifier
+		d.Identifier = string(v.PeerId)
 	default:
 		return nil, fmt.Errorf("unsupported payload type: %T", v)
 	}

internal/app/webhooks/model.go

@@ -34,10 +34,9 @@ func (d *WebhookData) Serialize() (io.Reader, error) {
 type WebhookEntity = string
 
 const (
-	WebhookEntityUser       WebhookEntity = "user"
+	WebhookEntityUser      WebhookEntity = "user"
-	WebhookEntityPeer       WebhookEntity = "peer"
+	WebhookEntityPeer      WebhookEntity = "peer"
-	WebhookEntityPeerMetric WebhookEntity = "peer_metric"
+	WebhookEntityInterface WebhookEntity = "interface"
-	WebhookEntityInterface  WebhookEntity = "interface"
 )
 
 type WebhookEvent = string

internal/app/webhooks/models/interface.go

@@ -1,99 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/h44z/wg-portal/internal/domain"
-)
-
-// Interface represents an interface model for webhooks. For details about the fields, see the domain.Interface struct.
-type Interface struct {
-	CreatedBy string    `json:"CreatedBy"`
-	UpdatedBy string    `json:"UpdatedBy"`
-	CreatedAt time.Time `json:"CreatedAt"`
-	UpdatedAt time.Time `json:"UpdatedAt"`
-
-	Identifier string `json:"Identifier"`
-	PrivateKey string `json:"PrivateKey"`
-	PublicKey  string `json:"PublicKey"`
-	ListenPort int    `json:"ListenPort"`
-
-	Addresses    []string `json:"Addresses"`
-	DnsStr       string   `json:"DnsStr"`
-	DnsSearchStr string   `json:"DnsSearchStr"`
-
-	Mtu          int    `json:"Mtu"`
-	FirewallMark uint32 `json:"FirewallMark"`
-	RoutingTable string `json:"RoutingTable"`
-
-	PreUp    string `json:"PreUp"`
-	PostUp   string `json:"PostUp"`
-	PreDown  string `json:"PreDown"`
-	PostDown string `json:"PostDown"`
-
-	SaveConfig bool `json:"SaveConfig"`
-
-	DisplayName    string     `json:"DisplayName"`
-	Type           string     `json:"Type"`
-	DriverType     string     `json:"DriverType"`
-	Disabled       *time.Time `json:"Disabled,omitempty"`
-	DisabledReason string     `json:"DisabledReason,omitempty"`
-
-	PeerDefNetworkStr          string `json:"PeerDefNetworkStr,omitempty"`
-	PeerDefDnsStr              string `json:"PeerDefDnsStr,omitempty"`
-	PeerDefDnsSearchStr        string `json:"PeerDefDnsSearchStr,omitempty"`
-	PeerDefEndpoint            string `json:"PeerDefEndpoint,omitempty"`
-	PeerDefAllowedIPsStr       string `json:"PeerDefAllowedIPsStr,omitempty"`
-	PeerDefMtu                 int    `json:"PeerDefMtu,omitempty"`
-	PeerDefPersistentKeepalive int    `json:"PeerDefPersistentKeepalive,omitempty"`
-	PeerDefFirewallMark        uint32 `json:"PeerDefFirewallMark,omitempty"`
-	PeerDefRoutingTable        string `json:"PeerDefRoutingTable,omitempty"`
-
-	PeerDefPreUp    string `json:"PeerDefPreUp,omitempty"`
-	PeerDefPostUp   string `json:"PeerDefPostUp,omitempty"`
-	PeerDefPreDown  string `json:"PeerDefPreDown,omitempty"`
-	PeerDefPostDown string `json:"PeerDefPostDown,omitempty"`
-}
-
-// NewInterface creates a new Interface model from a domain.Interface.
-func NewInterface(src domain.Interface) Interface {
-	return Interface{
-		CreatedBy:                  src.CreatedBy,
-		UpdatedBy:                  src.UpdatedBy,
-		CreatedAt:                  src.CreatedAt,
-		UpdatedAt:                  src.UpdatedAt,
-		Identifier:                 string(src.Identifier),
-		PrivateKey:                 src.KeyPair.PrivateKey,
-		PublicKey:                  src.KeyPair.PublicKey,
-		ListenPort:                 src.ListenPort,
-		Addresses:                  domain.CidrsToStringSlice(src.Addresses),
-		DnsStr:                     src.DnsStr,
-		DnsSearchStr:               src.DnsSearchStr,
-		Mtu:                        src.Mtu,
-		FirewallMark:               src.FirewallMark,
-		RoutingTable:               src.RoutingTable,
-		PreUp:                      src.PreUp,
-		PostUp:                     src.PostUp,
-		PreDown:                    src.PreDown,
-		PostDown:                   src.PostDown,
-		SaveConfig:                 src.SaveConfig,
-		DisplayName:                string(src.Identifier),
-		Type:                       string(src.Type),
-		DriverType:                 src.DriverType,
-		Disabled:                   src.Disabled,
-		DisabledReason:             src.DisabledReason,
-		PeerDefNetworkStr:          src.PeerDefNetworkStr,
-		PeerDefDnsStr:              src.PeerDefDnsStr,
-		PeerDefDnsSearchStr:        src.PeerDefDnsSearchStr,
-		PeerDefEndpoint:            src.PeerDefEndpoint,
-		PeerDefAllowedIPsStr:       src.PeerDefAllowedIPsStr,
-		PeerDefMtu:                 src.PeerDefMtu,
-		PeerDefPersistentKeepalive: src.PeerDefPersistentKeepalive,
-		PeerDefFirewallMark:        src.PeerDefFirewallMark,
-		PeerDefRoutingTable:        src.PeerDefRoutingTable,
-		PeerDefPreUp:               src.PeerDefPreUp,
-		PeerDefPostUp:              src.PeerDefPostUp,
-		PeerDefPreDown:             src.PeerDefPreDown,
-		PeerDefPostDown:            src.PeerDefPostDown,
-	}
-}

internal/app/webhooks/models/peer.go

@@ -1,89 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/h44z/wg-portal/internal/domain"
-)
-
-// Peer represents a peer model for webhooks.  For details about the fields, see the domain.Peer struct.
-type Peer struct {
-	CreatedBy string    `json:"CreatedBy"`
-	UpdatedBy string    `json:"UpdatedBy"`
-	CreatedAt time.Time `json:"CreatedAt"`
-	UpdatedAt time.Time `json:"UpdatedAt"`
-
-	Endpoint            string `json:"Endpoint"`
-	EndpointPublicKey   string `json:"EndpointPublicKey"`
-	AllowedIPsStr       string `json:"AllowedIPsStr"`
-	ExtraAllowedIPsStr  string `json:"ExtraAllowedIPsStr"`
-	PresharedKey        string `json:"PresharedKey"`
-	PersistentKeepalive int    `json:"PersistentKeepalive"`
-
-	DisplayName          string     `json:"DisplayName"`
-	Identifier           string     `json:"Identifier"`
-	UserIdentifier       string     `json:"UserIdentifier"`
-	InterfaceIdentifier  string     `json:"InterfaceIdentifier"`
-	Disabled             *time.Time `json:"Disabled,omitempty"`
-	DisabledReason       string     `json:"DisabledReason,omitempty"`
-	ExpiresAt            *time.Time `json:"ExpiresAt,omitempty"`
-	Notes                string     `json:"Notes,omitempty"`
-	AutomaticallyCreated bool       `json:"AutomaticallyCreated"`
-
-	PrivateKey string `json:"PrivateKey"`
-	PublicKey  string `json:"PublicKey"`
-
-	InterfaceType string `json:"InterfaceType"`
-
-	Addresses         []string `json:"Addresses"`
-	CheckAliveAddress string   `json:"CheckAliveAddress"`
-	DnsStr            string   `json:"DnsStr"`
-	DnsSearchStr      string   `json:"DnsSearchStr"`
-	Mtu               int      `json:"Mtu"`
-	FirewallMark      uint32   `json:"FirewallMark,omitempty"`
-	RoutingTable      string   `json:"RoutingTable,omitempty"`
-
-	PreUp    string `json:"PreUp,omitempty"`
-	PostUp   string `json:"PostUp,omitempty"`
-	PreDown  string `json:"PreDown,omitempty"`
-	PostDown string `json:"PostDown,omitempty"`
-}
-
-// NewPeer creates a new Peer model from a domain.Peer.
-func NewPeer(src domain.Peer) Peer {
-	return Peer{
-		CreatedBy:            src.CreatedBy,
-		UpdatedBy:            src.UpdatedBy,
-		CreatedAt:            src.CreatedAt,
-		UpdatedAt:            src.UpdatedAt,
-		Endpoint:             src.Endpoint.GetValue(),
-		EndpointPublicKey:    src.EndpointPublicKey.GetValue(),
-		AllowedIPsStr:        src.AllowedIPsStr.GetValue(),
-		ExtraAllowedIPsStr:   src.ExtraAllowedIPsStr,
-		PresharedKey:         string(src.PresharedKey),
-		PersistentKeepalive:  src.PersistentKeepalive.GetValue(),
-		DisplayName:          src.DisplayName,
-		Identifier:           string(src.Identifier),
-		UserIdentifier:       string(src.UserIdentifier),
-		InterfaceIdentifier:  string(src.InterfaceIdentifier),
-		Disabled:             src.Disabled,
-		DisabledReason:       src.DisabledReason,
-		ExpiresAt:            src.ExpiresAt,
-		Notes:                src.Notes,
-		AutomaticallyCreated: src.AutomaticallyCreated,
-		PrivateKey:           src.Interface.KeyPair.PrivateKey,
-		PublicKey:            src.Interface.KeyPair.PublicKey,
-		InterfaceType:        string(src.Interface.Type),
-		Addresses:            domain.CidrsToStringSlice(src.Interface.Addresses),
-		CheckAliveAddress:    src.Interface.CheckAliveAddress,
-		DnsStr:               src.Interface.DnsStr.GetValue(),
-		DnsSearchStr:         src.Interface.DnsSearchStr.GetValue(),
-		Mtu:                  src.Interface.Mtu.GetValue(),
-		FirewallMark:         src.Interface.FirewallMark.GetValue(),
-		RoutingTable:         src.Interface.RoutingTable.GetValue(),
-		PreUp:                src.Interface.PreUp.GetValue(),
-		PostUp:               src.Interface.PostUp.GetValue(),
-		PreDown:              src.Interface.PreDown.GetValue(),
-		PostDown:             src.Interface.PostDown.GetValue(),
-	}
-}

internal/app/webhooks/models/peer_metrics.go

@@ -1,50 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/h44z/wg-portal/internal/domain"
-)
-
-// PeerMetrics represents a peer metrics model for webhooks.
-// For details about the fields, see the domain.PeerStatus and domain.Peer structs.
-type PeerMetrics struct {
-	Status PeerStatus `json:"Status"`
-	Peer   Peer       `json:"Peer"`
-}
-
-// PeerStatus represents the status of a peer for webhooks.
-// For details about the fields, see the domain.PeerStatus struct.
-type PeerStatus struct {
-	UpdatedAt time.Time `json:"UpdatedAt"`
-
-	IsConnected bool `json:"IsConnected"`
-
-	IsPingable bool       `json:"IsPingable"`
-	LastPing   *time.Time `json:"LastPing,omitempty"`
-
-	BytesReceived    uint64 `json:"BytesReceived"`
-	BytesTransmitted uint64 `json:"BytesTransmitted"`
-
-	Endpoint         string     `json:"Endpoint"`
-	LastHandshake    *time.Time `json:"LastHandshake,omitempty"`
-	LastSessionStart *time.Time `json:"LastSessionStart,omitempty"`
-}
-
-// NewPeerMetrics creates a new PeerMetrics model from the domain.PeerStatus and domain.Peer models.
-func NewPeerMetrics(status domain.PeerStatus, peer domain.Peer) PeerMetrics {
-	return PeerMetrics{
-		Status: PeerStatus{
-			UpdatedAt:        status.UpdatedAt,
-			IsConnected:      status.IsConnected,
-			IsPingable:       status.IsPingable,
-			LastPing:         status.LastPing,
-			BytesReceived:    status.BytesReceived,
-			BytesTransmitted: status.BytesTransmitted,
-			Endpoint:         status.Endpoint,
-			LastHandshake:    status.LastHandshake,
-			LastSessionStart: status.LastSessionStart,
-		},
-		Peer: NewPeer(peer),
-	}
-}

internal/app/webhooks/models/user.go

@@ -1,56 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/h44z/wg-portal/internal/domain"
-)
-
-// User represents a user model for webhooks. For details about the fields, see the domain.User struct.
-type User struct {
-	CreatedBy string    `json:"CreatedBy"`
-	UpdatedBy string    `json:"UpdatedBy"`
-	CreatedAt time.Time `json:"CreatedAt"`
-	UpdatedAt time.Time `json:"UpdatedAt"`
-
-	Identifier   string `json:"Identifier"`
-	Email        string `json:"Email"`
-	Source       string `json:"Source"`
-	ProviderName string `json:"ProviderName"`
-	IsAdmin      bool   `json:"IsAdmin"`
-
-	Firstname  string `json:"Firstname,omitempty"`
-	Lastname   string `json:"Lastname,omitempty"`
-	Phone      string `json:"Phone,omitempty"`
-	Department string `json:"Department,omitempty"`
-	Notes      string `json:"Notes,omitempty"`
-
-	Disabled       *time.Time `json:"Disabled,omitempty"`
-	DisabledReason string     `json:"DisabledReason,omitempty"`
-	Locked         *time.Time `json:"Locked,omitempty"`
-	LockedReason   string     `json:"LockedReason,omitempty"`
-}
-
-// NewUser creates a new User model from a domain.User
-func NewUser(src domain.User) User {
-	return User{
-		CreatedBy:      src.CreatedBy,
-		UpdatedBy:      src.UpdatedBy,
-		CreatedAt:      src.CreatedAt,
-		UpdatedAt:      src.UpdatedAt,
-		Identifier:     string(src.Identifier),
-		Email:          src.Email,
-		Source:         string(src.Source),
-		ProviderName:   src.ProviderName,
-		IsAdmin:        src.IsAdmin,
-		Firstname:      src.Firstname,
-		Lastname:       src.Lastname,
-		Phone:          src.Phone,
-		Department:     src.Department,
-		Notes:          src.Notes,
-		Disabled:       src.Disabled,
-		DisabledReason: src.DisabledReason,
-		Locked:         src.Locked,
-		LockedReason:   src.LockedReason,
-	}
-}

internal/app/wireguard/statistics.go

@@ -213,14 +213,8 @@ func (c *StatisticsCollector) collectPeerData(ctx context.Context) {
 					}
 
 					if connectionStateChanged {
-						peerModel, err := c.db.GetPeer(ctx, peer.Identifier)
-						if err != nil {
-							slog.Error("failed to fetch peer for data collection", "peer", peer.Identifier, "error",
-								err)
-							continue
-						}
 						// publish event if connection state changed
-						c.bus.Publish(app.TopicPeerStateChanged, newPeerStatus, *peerModel)
+						c.bus.Publish(app.TopicPeerStateChanged, newPeerStatus)
 					}
 				}
 			}
@@ -362,7 +356,7 @@ func (c *StatisticsCollector) pingWorker(ctx context.Context) {
 
 		if connectionStateChanged {
 			// publish event if connection state changed
-			c.bus.Publish(app.TopicPeerStateChanged, newPeerStatus, peer)
+			c.bus.Publish(app.TopicPeerStateChanged, newPeerStatus)
 		}
 	}
 }

internal/domain/base.go

@@ -62,4 +62,7 @@ const (
 
 	LockedReasonAdmin = "locked by admin"
 	LockedReasonApi   = "locked by admin"
+
+	ConfigStyleRaw     = "raw"
+	ConfigStyleWgQuick = "wgquick"
 )