From 793904e94231d038e0184e175a664567eaa72568 Mon Sep 17 00:00:00 2001 From: Gregory Wells Date: Thu, 6 Aug 2026 20:19:11 -0400 Subject: [PATCH] setup new provider endpoint creation --- auth/auth.go | 6 +++++- auth/oauth.go | 2 ++ auth/oauth_callback.go | 2 +- main/calandar_endpoint.go | 6 ++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/auth/auth.go b/auth/auth.go index 888cac1..3d50786 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -15,6 +15,10 @@ import ( var TestTokenStore TokenStore +func SetAuth() { + TestTokenStore = TokenStore{filePath: "token.json"} +} + func generateState() (string, error) { b := make([]byte, 32) if _, err := rand.Read(b); err != nil { @@ -80,7 +84,7 @@ func HandleOAuth(authData webserver.OAuthAuthData) bool { SameSite: http.SameSiteLaxMode, }) - url := OAuthConfigs[0].AuthCodeURL( + url := DefaultProvider.Config.AuthCodeURL( state, oauth2.S256ChallengeOption(verifier), ) diff --git a/auth/oauth.go b/auth/oauth.go index 3d144b8..ff7e064 100644 --- a/auth/oauth.go +++ b/auth/oauth.go @@ -18,6 +18,7 @@ type OAuthProvider struct { } var Providers []OAuthProvider +var DefaultProvider *OAuthProvider // Assumed to be the last created provider func CreateOAuthProvider(issuer string, clientID string) error { ctx := context.Background() @@ -42,5 +43,6 @@ func CreateOAuthProvider(issuer string, clientID string) error { Config: OAuthConfig, } Providers = append(Providers, newProvider) + DefaultProvider = &newProvider return nil } diff --git a/auth/oauth_callback.go b/auth/oauth_callback.go index d0b0ae0..8fda03f 100644 --- a/auth/oauth_callback.go +++ b/auth/oauth_callback.go @@ -38,7 +38,7 @@ func OAuthCallback(w http.ResponseWriter, r *http.Request) { verifier := verifierCookie.Value - token, err := OAuthConfigs[0].Exchange(context.Background(), code, oauth2.VerifierOption(verifier)) + token, err := DefaultProvider.Config.Exchange(context.Background(), code, oauth2.VerifierOption(verifier)) if err != nil { http.Error(w, "Failed to exchange token: "+err.Error(), http.StatusInternalServerError) return diff --git a/main/calandar_endpoint.go b/main/calandar_endpoint.go index 697fab2..df8fa3c 100644 --- a/main/calandar_endpoint.go +++ b/main/calandar_endpoint.go @@ -16,11 +16,9 @@ func handleUser(w http.ResponseWriter, r *http.Request) { return } - auth.OAuthProviders[0].UserInfoEndpoint() + client := auth.DefaultProvider.Config.Client(context.Background(), token) - client := auth.OAuthConfigs[0].Client(context.Background(), token) - - resp, err := client.Get(auth.OAuthProviders[0].UserInfoEndpoint()) + resp, err := client.Get(auth.DefaultProvider.Provider.UserInfoEndpoint()) if err != nil { http.Error(w, "Failed to fetch user: "+err.Error(), http.StatusInternalServerError) return