From 43604f7ffcbbf5b06ae481d2af7e66f6423f183f Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 3 May 2022 14:10:40 +0200 Subject: Refactor: Secure internet into a different type but with interface --- internal/wireguard.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'internal/wireguard.go') diff --git a/internal/wireguard.go b/internal/wireguard.go index 7977dbc..318e0dc 100644 --- a/internal/wireguard.go +++ b/internal/wireguard.go @@ -30,8 +30,14 @@ func wireguardConfigAddKey(config string, key wgtypes.Key) string { return interface_re.ReplaceAllString(config, to_replace) } -func (server *Server) WireguardGetConfig() (string, error) { - profile_id := server.Profiles.Current +func WireguardGetConfig(server Server) (string, error) { + base, baseErr := server.GetBase() + + if baseErr != nil { + return "", &WireguardGetConfigError{Err: baseErr} + } + + profile_id := base.Profiles.Current wireguardKey, wireguardErr := wireguardGenerateKey() if wireguardErr != nil { @@ -39,7 +45,7 @@ func (server *Server) WireguardGetConfig() (string, error) { } wireguardPublicKey := wireguardKey.PublicKey().String() - configWireguard, _, configErr := server.APIConnectWireguard(profile_id, wireguardPublicKey) + configWireguard, _, configErr := APIConnectWireguard(server, profile_id, wireguardPublicKey) if configErr != nil { return "", &WireguardGetConfigError{Err: wireguardErr} -- cgit v1.2.3