From 03f0fc68168de8db1735cc7d1c4d328c4bdd03f2 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Wed, 24 Aug 2022 14:37:05 +0200 Subject: State + Server + Exports: Implement removing a server --- internal/server/custom.go | 6 ++++++ internal/server/instituteaccess.go | 14 ++++++++++++++ internal/server/secureinternet.go | 10 ++++++++++ 3 files changed, 30 insertions(+) create mode 100644 internal/server/custom.go (limited to 'internal/server') diff --git a/internal/server/custom.go b/internal/server/custom.go new file mode 100644 index 0000000..c757f76 --- /dev/null +++ b/internal/server/custom.go @@ -0,0 +1,6 @@ +package server + +func (servers *Servers) RemoveCustomServer(url string) { + servers.CustomServers.Remove(url) +} + diff --git a/internal/server/instituteaccess.go b/internal/server/instituteaccess.go index 6ac248d..e948480 100644 --- a/internal/server/instituteaccess.go +++ b/internal/server/instituteaccess.go @@ -22,6 +22,20 @@ type InstituteAccessServers struct { CurrentURL string `json:"current_url"` } +func (servers *Servers) RemoveInstituteAccess(url string) { + servers.InstituteServers.Remove(url) +} + +func (servers *InstituteAccessServers) Remove(url string) { + // Reset the current url + if servers.CurrentURL == url { + servers.CurrentURL = "" + } + + // Delete the url from the map + delete(servers.Map, url) +} + // For an institute, we can simply get the OAuth func (institute *InstituteAccessServer) GetOAuth() *oauth.OAuth { return &institute.OAuth diff --git a/internal/server/secureinternet.go b/internal/server/secureinternet.go index 3498bcc..40c429b 100644 --- a/internal/server/secureinternet.go +++ b/internal/server/secureinternet.go @@ -24,6 +24,16 @@ type SecureInternetHomeServer struct { CurrentLocation string `json:"current_location"` } +func (servers *Servers) RemoveSecureInternet() { + // Empty out the struct + servers.SecureInternetHomeServer = SecureInternetHomeServer{} + + // If the current server is secure internet, default to custom server + if servers.IsType == SecureInternetServerType { + servers.IsType = CustomServerType + } +} + func (secure *SecureInternetHomeServer) GetOAuth() *oauth.OAuth { return &secure.OAuth } -- cgit v1.2.3