From 565237c14a303a46d62d240b35c6f0082424256a Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Tue, 11 Oct 2022 10:19:56 +0200
Subject: Client: Refactor out adding a Server from getting a config

---
 wrappers/python/eduvpn_common/loader.py | 12 ++++++++++++
 wrappers/python/eduvpn_common/main.py   | 20 +++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'wrappers/python/eduvpn_common')

diff --git a/wrappers/python/eduvpn_common/loader.py b/wrappers/python/eduvpn_common/loader.py
index 0192815..23851f3 100644
--- a/wrappers/python/eduvpn_common/loader.py
+++ b/wrappers/python/eduvpn_common/loader.py
@@ -91,6 +91,18 @@ def initialize_functions(lib):
         c_char_p,
         c_char_p,
     ], c_void_p
+    lib.AddInstituteAccess.argtypes, lib.AddInstituteAccess.restype = [
+            c_char_p,
+            c_char_p,
+    ], c_void_p
+    lib.AddSecureInternetHomeServer.argtypes, lib.AddSecureInternetHomeServer.restype = [
+            c_char_p,
+            c_char_p,
+    ], c_void_p
+    lib.AddCustomServer.argtypes, lib.AddCustomServer.restype = [
+            c_char_p,
+            c_char_p,
+    ], c_void_p
     lib.RemoveInstituteAccess.argtypes, lib.RemoveInstituteAccess.restype = [
         c_char_p,
         c_char_p,
diff --git a/wrappers/python/eduvpn_common/main.py b/wrappers/python/eduvpn_common/main.py
index 03e1045..382f356 100644
--- a/wrappers/python/eduvpn_common/main.py
+++ b/wrappers/python/eduvpn_common/main.py
@@ -121,6 +121,25 @@ class EduVPN(object):
         if remove_err:
             raise remove_err
 
+    def add_institute_access(self, url: str):
+        add_err = self.go_function(self.lib.AddInstituteAccess, url)
+
+        if add_err:
+            raise add_err
+
+    def add_secure_internet_home(self, org_id: str):
+        self.location_event = threading.Event()
+        add_err = self.go_function(self.lib.AddSecureInternetHomeServer, org_id)
+
+        if add_err:
+            raise add_err
+
+    def add_custom_server(self, url: str):
+        add_err = self.go_function(self.lib.AddCustomServer, url)
+
+        if add_err:
+            raise add_err
+
     def remove_institute_access(self, url: str):
         remove_err = self.go_function(self.lib.RemoveInstituteAccess, url)
 
@@ -162,7 +181,6 @@ class EduVPN(object):
     def get_config_secure_internet(
         self, url: str, prefer_tcp: bool = False
     ) -> Tuple[str, str]:
-        self.location_event = threading.Event()
         return self.get_config(url, self.lib.GetConfigSecureInternet, prefer_tcp)
 
     def go_back(self) -> None:
-- 
cgit v1.2.3