diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2023-05-15 14:10:55 +0200 |
|---|---|---|
| committer | Jeroen Wijenbergh <46386452+jwijenbergh@users.noreply.github.com> | 2023-09-25 09:43:37 +0200 |
| commit | 4480416a3f4424eeefdf4117b7cf5120bfeafbcc (patch) | |
| tree | 5fd7283c492f2ceb709432d1c571ae29b1d8b161 /internal/server/list.go | |
| parent | 680c91aff531fca6fa2394094252520adac5f9e3 (diff) | |
Client + OAuth + Server: Initialize the OAuth clientID on add
Diffstat (limited to 'internal/server/list.go')
| -rw-r--r-- | internal/server/list.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/internal/server/list.go b/internal/server/list.go index 2660102..f3ae4e8 100644 --- a/internal/server/list.go +++ b/internal/server/list.go @@ -44,8 +44,8 @@ func (l *List) Current() (Server, error) { return l.InstituteServers.Current() } -func (l *List) AddCustom(ctx context.Context, url string) (Server, error) { - srv, err := custom.New(ctx, url) +func (l *List) AddCustom(ctx context.Context, clientID string, url string) (Server, error) { + srv, err := custom.New(ctx, clientID, url) if err != nil { return nil, err } @@ -53,8 +53,8 @@ func (l *List) AddCustom(ctx context.Context, url string) (Server, error) { return srv, nil } -func (l *List) AddInstituteAccess(ctx context.Context, discoServer *discotypes.Server) (Server, error) { - srv, err := institute.New(ctx, discoServer.BaseURL, discoServer.DisplayName, discoServer.SupportContact) +func (l *List) AddInstituteAccess(ctx context.Context, clientID string, discoServer *discotypes.Server) (Server, error) { + srv, err := institute.New(ctx, clientID, discoServer.BaseURL, discoServer.DisplayName, discoServer.SupportContact) if err != nil { return nil, err } @@ -64,12 +64,13 @@ func (l *List) AddInstituteAccess(ctx context.Context, discoServer *discotypes.S func (l *List) AddSecureInternet( ctx context.Context, + clientID string, secureOrg *discotypes.Organization, secureServer *discotypes.Server, ) (*secure.Server, error) { // If we have specified an organization ID // We also need to get an authorization template - err := l.SecureInternetHomeServer.Init(ctx, secureOrg, secureServer) + err := l.SecureInternetHomeServer.Init(ctx, clientID, secureOrg, secureServer) if err != nil { return nil, err } |