summaryrefslogtreecommitdiff
path: root/internal/server
diff options
context:
space:
mode:
Diffstat (limited to 'internal/server')
-rw-r--r--internal/server/custom.go10
-rw-r--r--internal/server/institute.go10
-rw-r--r--internal/server/secureinternet.go10
-rw-r--r--internal/server/server.go10
-rw-r--r--internal/server/servers.go4
5 files changed, 22 insertions, 22 deletions
diff --git a/internal/server/custom.go b/internal/server/custom.go
index a9a26b9..0837c86 100644
--- a/internal/server/custom.go
+++ b/internal/server/custom.go
@@ -5,8 +5,8 @@ import (
"log/slog"
"time"
- "codeberg.org/eduVPN/eduvpn-common/internal/api"
"codeberg.org/eduVPN/eduvpn-common/internal/config/v2"
+ "codeberg.org/eduVPN/eduvpn-common/internal/eduvpnapi"
"codeberg.org/eduVPN/eduvpn-common/types/server"
"codeberg.org/jwijenbergh/eduoauth-go/v2"
)
@@ -16,7 +16,7 @@ import (
// `id` is the identifier of the server, the base URL
// `ot` specifies specifies the start time OAuth was already triggered
func (s *Servers) AddCustom(ctx context.Context, id string, ot *int64) error {
- sd := api.ServerData{
+ sd := eduvpnapi.ServerData{
ID: id,
Type: server.TypeCustom,
BaseWK: id,
@@ -40,7 +40,7 @@ func (s *Servers) AddCustom(ctx context.Context, id string, ot *int64) error {
}
// Authorize by creating the API object
- _, err = api.NewAPI(ctx, s.clientID, sd, s.cb, nil)
+ _, err = eduvpnapi.NewAPI(ctx, s.clientID, sd, s.cb, nil)
if err != nil {
// authorization has failed, remove the server again
rerr := s.config.RemoveServer(id, server.TypeCustom)
@@ -58,7 +58,7 @@ func (s *Servers) AddCustom(ctx context.Context, id string, ot *int64) error {
// `tok` are the tokens such that we can initialize the API
// `disableAuth` is set to True when authorization should not be triggered
func (s *Servers) GetCustom(ctx context.Context, id string, tok *eduoauth.Token, disableAuth bool) (*Server, error) {
- sd := api.ServerData{
+ sd := eduvpnapi.ServerData{
ID: id,
Type: server.TypeCustom,
BaseWK: id,
@@ -71,7 +71,7 @@ func (s *Servers) GetCustom(ctx context.Context, id string, tok *eduoauth.Token,
if err != nil {
return nil, err
}
- a, err := api.NewAPI(ctx, s.clientID, sd, s.cb, tok)
+ a, err := eduvpnapi.NewAPI(ctx, s.clientID, sd, s.cb, tok)
if err != nil {
return nil, err
}
diff --git a/internal/server/institute.go b/internal/server/institute.go
index c357a4d..9280d1e 100644
--- a/internal/server/institute.go
+++ b/internal/server/institute.go
@@ -5,9 +5,9 @@ import (
"log/slog"
"time"
- "codeberg.org/eduVPN/eduvpn-common/internal/api"
"codeberg.org/eduVPN/eduvpn-common/internal/config/v2"
"codeberg.org/eduVPN/eduvpn-common/internal/discovery"
+ "codeberg.org/eduVPN/eduvpn-common/internal/eduvpnapi"
"codeberg.org/eduVPN/eduvpn-common/types/server"
"codeberg.org/jwijenbergh/eduoauth-go/v2"
)
@@ -24,7 +24,7 @@ func (s *Servers) AddInstitute(ctx context.Context, disco *discovery.Discovery,
return err
}
- sd := api.ServerData{
+ sd := eduvpnapi.ServerData{
ID: dsrv.BaseURL,
Type: server.TypeInstituteAccess,
BaseWK: dsrv.BaseURL,
@@ -49,7 +49,7 @@ func (s *Servers) AddInstitute(ctx context.Context, disco *discovery.Discovery,
}
// Authorize by creating the API object
- _, err = api.NewAPI(ctx, s.clientID, sd, s.cb, nil)
+ _, err = eduvpnapi.NewAPI(ctx, s.clientID, sd, s.cb, nil)
if err != nil {
// authorization has failed, remove the server again
rerr := s.config.RemoveServer(dsrv.BaseURL, server.TypeInstituteAccess)
@@ -79,7 +79,7 @@ func (s *Servers) GetInstitute(ctx context.Context, id string, disco *discovery.
if err != nil {
return nil, err
}
- sd := api.ServerData{
+ sd := eduvpnapi.ServerData{
ID: dsrv.BaseURL,
Type: server.TypeInstituteAccess,
BaseWK: dsrv.BaseURL,
@@ -87,7 +87,7 @@ func (s *Servers) GetInstitute(ctx context.Context, id string, disco *discovery.
DisableAuthorize: disableAuth,
}
// Authorize by creating the API object
- a, err := api.NewAPI(ctx, s.clientID, sd, s.cb, tok)
+ a, err := eduvpnapi.NewAPI(ctx, s.clientID, sd, s.cb, tok)
if err != nil {
return nil, err
}
diff --git a/internal/server/secureinternet.go b/internal/server/secureinternet.go
index d25750f..e97efbd 100644
--- a/internal/server/secureinternet.go
+++ b/internal/server/secureinternet.go
@@ -8,9 +8,9 @@ import (
"strings"
"time"
- "codeberg.org/eduVPN/eduvpn-common/internal/api"
"codeberg.org/eduVPN/eduvpn-common/internal/config/v2"
"codeberg.org/eduVPN/eduvpn-common/internal/discovery"
+ "codeberg.org/eduVPN/eduvpn-common/internal/eduvpnapi"
"codeberg.org/eduVPN/eduvpn-common/types/server"
"codeberg.org/jwijenbergh/eduoauth-go/v2"
)
@@ -54,7 +54,7 @@ func (s *Servers) AddSecure(ctx context.Context, disco *discovery.Discovery, org
return err
}
- sd := api.ServerData{
+ sd := eduvpnapi.ServerData{
ID: dorg.OrgID,
Type: server.TypeSecureInternet,
BaseWK: dsrv.BaseURL,
@@ -92,7 +92,7 @@ func (s *Servers) AddSecure(ctx context.Context, disco *discovery.Discovery, org
}
// Authorize by creating the API object
- _, err = api.NewAPI(ctx, s.clientID, sd, s.cb, nil)
+ _, err = eduvpnapi.NewAPI(ctx, s.clientID, sd, s.cb, nil)
if err != nil {
// authorization has failed, remove the server again
rerr := s.config.RemoveServer(orgID, server.TypeSecureInternet)
@@ -126,7 +126,7 @@ func (s *Servers) GetSecure(ctx context.Context, orgID string, disco *discovery.
return nil, err
}
- sd := api.ServerData{
+ sd := eduvpnapi.ServerData{
ID: dorg.OrgID,
Type: server.TypeSecureInternet,
BaseWK: dloc.BaseURL,
@@ -148,7 +148,7 @@ func (s *Servers) GetSecure(ctx context.Context, orgID string, disco *discovery.
DisableAuthorize: disableAuth,
}
- a, err := api.NewAPI(ctx, s.clientID, sd, s.cb, tok)
+ a, err := eduvpnapi.NewAPI(ctx, s.clientID, sd, s.cb, tok)
if err != nil {
return nil, err
}
diff --git a/internal/server/server.go b/internal/server/server.go
index 2372494..4623224 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -7,9 +7,9 @@ import (
"os"
"time"
- "codeberg.org/eduVPN/eduvpn-common/internal/api"
- "codeberg.org/eduVPN/eduvpn-common/internal/api/profiles"
v2 "codeberg.org/eduVPN/eduvpn-common/internal/config/v2"
+ "codeberg.org/eduVPN/eduvpn-common/internal/eduvpnapi"
+ "codeberg.org/eduVPN/eduvpn-common/internal/eduvpnapi/profiles"
"codeberg.org/eduVPN/eduvpn-common/types/protocol"
srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server"
)
@@ -18,7 +18,7 @@ import (
type Server struct {
identifier string
t srvtypes.Type
- apiw *api.API
+ apiw *eduvpnapi.API
storage *v2.V2
}
@@ -26,7 +26,7 @@ type Server struct {
var ErrInvalidProfile = errors.New("invalid profile")
// NewServer creates a new server
-func (s *Servers) NewServer(identifier string, t srvtypes.Type, api *api.API) Server {
+func (s *Servers) NewServer(identifier string, t srvtypes.Type, api *eduvpnapi.API) Server {
return Server{
identifier: identifier,
t: t,
@@ -65,7 +65,7 @@ func (s *Server) FreshProfiles(ctx context.Context) (*profiles.Info, error) {
return prfs, nil
}
-func (s *Server) api() (*api.API, error) {
+func (s *Server) api() (*eduvpnapi.API, error) {
if s.apiw == nil {
return nil, errors.New("no API object found")
}
diff --git a/internal/server/servers.go b/internal/server/servers.go
index bd22ffd..43716a4 100644
--- a/internal/server/servers.go
+++ b/internal/server/servers.go
@@ -5,9 +5,9 @@ import (
"errors"
"fmt"
- "codeberg.org/eduVPN/eduvpn-common/internal/api"
"codeberg.org/eduVPN/eduvpn-common/internal/config/v2"
"codeberg.org/eduVPN/eduvpn-common/internal/discovery"
+ "codeberg.org/eduVPN/eduvpn-common/internal/eduvpnapi"
srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server"
"codeberg.org/jwijenbergh/eduoauth-go/v2"
)
@@ -15,7 +15,7 @@ import (
// Callbacks defines the interface for doing certain callback operations
type Callbacks interface {
// api.Callbacks is the API callback interface
- api.Callbacks
+ eduvpnapi.Callbacks
// GettingConfig is called when the config is obtained
GettingConfig() error
// InvalidProfile is called when an invalid profile is found