Merge branch 'refs/heads/master' into mikrotik_integration

# Conflicts:
#	internal/app/wireguard/wireguard_peers.go
This commit is contained in:
Christoph Haas
2025-08-09 16:09:39 +02:00
9 changed files with 102 additions and 93 deletions

View File

@@ -1969,7 +1969,7 @@
"type": "string"
}
},
"Suffix": {
"Prefix": {
"type": "string"
}
}

View File

@@ -206,7 +206,7 @@ definitions:
items:
type: string
type: array
Suffix:
Prefix:
type: string
type: object
model.Peer:

View File

@@ -139,7 +139,8 @@ func (s *Server) setupRoutes(endpoints ...ApiEndpointSetupFunc) {
s.versions[version].HandleFunc("GET /swagger/index.html", s.rapiDocHandler(version)) // Deprecated: old link
s.versions[version].HandleFunc("GET /doc.html", s.rapiDocHandler(version))
groupSetupFn(s.versions[version])
versionGroup := s.versions[version].Group()
groupSetupFn(versionGroup)
}
}
}

View File

@@ -172,13 +172,13 @@ func NewDomainPeer(src *Peer) *domain.Peer {
type MultiPeerRequest struct {
Identifiers []string `json:"Identifiers"`
Suffix string `json:"Suffix"`
Prefix string `json:"Prefix"`
}
func NewDomainPeerCreationRequest(src *MultiPeerRequest) *domain.PeerCreationRequest {
return &domain.PeerCreationRequest{
UserIdentifiers: src.Identifiers,
Suffix: src.Suffix,
Prefix: src.Prefix,
}
}