From 279c0de75629de5868c3ac1b3272a2850e6b62f7 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Mon, 28 Nov 2022 13:28:27 +0100 Subject: OAuth: Refactor Token getting and do not save them in the config This commit refactors getting the tokens into receiver methods. This means that functions do not have to call the cryptic "EnsureTokens" method. The receiver getter then already verifier whether or not the tokens could be obtained (and refreshes too). The downside is that some things are now private, so testing for invalid tokens needs to be done somewhere else. This needs another patch such that clients can save the tokens themselves using a keyring. --- internal/server/api.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/server/api.go') diff --git a/internal/server/api.go b/internal/server/api.go index eb55bd8..65aadca 100644 --- a/internal/server/api.go +++ b/internal/server/api.go @@ -64,13 +64,13 @@ func apiAuthorized( url.Path = path.Join(url.Path, endpoint) // Make sure the tokens are valid, this will return an error if re-login is needed - oauthErr := EnsureTokens(server) - if oauthErr != nil { - return nil, nil, types.NewWrappedError(errorMessage, oauthErr) + token, tokenErr := HeaderToken(server) + if tokenErr != nil { + return nil, nil, types.NewWrappedError(errorMessage, tokenErr) } headerKey := "Authorization" - headerValue := fmt.Sprintf("Bearer %s", HeaderToken(server)) + headerValue := fmt.Sprintf("Bearer %s", token) if opts.Headers != nil { opts.Headers.Add(headerKey, headerValue) } else { -- cgit v1.2.3