Adjust authentication method names and function names in the authentication package

Author: ShocOne

authenticationhandler/auth_bearer_token.go

@@ -14,8 +14,8 @@ import (
 	"go.uber.org/zap"
 )
 
-// ObtainToken fetches and sets an authentication token using the stored basic authentication credentials.
-func (h *AuthTokenHandler) ObtainToken(apiHandler apihandler.APIHandler, httpClient *http.Client, username string, password string) error {
+// BasicAuthTokenAcquisition fetches and sets an authentication token using the stored basic authentication credentials.
+func (h *AuthTokenHandler) BasicAuthTokenAcquisition(apiHandler apihandler.APIHandler, httpClient *http.Client, username string, password string) error {
 
 	// Use the APIHandler's method to get the bearer token endpoint
 	bearerTokenEndpoint := apiHandler.GetBearerTokenEndpoint()
@@ -60,8 +60,8 @@ func (h *AuthTokenHandler) ObtainToken(apiHandler apihandler.APIHandler, httpCli
 	return nil
 }
 
-// RefreshToken refreshes the current authentication token.
-func (h *AuthTokenHandler) RefreshToken(apiHandler apihandler.APIHandler, httpClient *http.Client) error {
+// RefreshBearerToken refreshes the current authentication token.
+func (h *AuthTokenHandler) RefreshBearerToken(apiHandler apihandler.APIHandler, httpClient *http.Client) error {
 	h.tokenLock.Lock()
 	defer h.tokenLock.Unlock()
 

authenticationhandler/auth_oauth.go authenticationhandler/auth_oauth2.goauthenticationhandler/auth_oauth.go renamed to authenticationhandler/auth_oauth2.go

@@ -30,9 +30,9 @@ type OAuthResponse struct {
 	Error        string `json:"error,omitempty"`         // Error contains details if an error occurs during the token acquisition process.
 }
 
-// ObtainOAuthToken fetches an OAuth access token using the provided client ID and client secret.
+// OAuth2TokenAcquisition fetches an OAuth access token using the provided client ID and client secret.
 // It updates the AuthTokenHandler's Token and Expires fields with the obtained values.
-func (h *AuthTokenHandler) ObtainOAuthToken(apiHandler apihandler.APIHandler, httpClient *http.Client, clientID, clientSecret string) error {
+func (h *AuthTokenHandler) OAuth2TokenAcquisition(apiHandler apihandler.APIHandler, httpClient *http.Client, clientID, clientSecret string) error {
 	// Get the OAuth token endpoint from the APIHandler
 	oauthTokenEndpoint := apiHandler.GetOAuthTokenEndpoint()
 

authenticationhandler/auth_token_management.go

@@ -16,12 +16,12 @@ func (h *AuthTokenHandler) ValidAuthTokenCheck(apiHandler apihandler.APIHandler,
 	if h.Token == "" {
 		h.Logger.Debug("No token found, attempting to obtain a new one")
 		var err error
-		if h.AuthMethod == "bearer" {
+		if h.AuthMethod == "basicauth" {
 			h.Logger.Info("Credential Match", zap.String("AuthMethod", h.AuthMethod))
-			err = h.ObtainToken(apiHandler, httpClient, clientCredentials.Username, clientCredentials.Password)
-		} else if h.AuthMethod == "oauth" {
+			err = h.BasicAuthTokenAcquisition(apiHandler, httpClient, clientCredentials.Username, clientCredentials.Password)
+		} else if h.AuthMethod == "oauth2" {
 			h.Logger.Info("Credential Match", zap.String("AuthMethod", h.AuthMethod))
-			err = h.ObtainOAuthToken(apiHandler, httpClient, clientCredentials.ClientID, clientCredentials.ClientSecret)
+			err = h.OAuth2TokenAcquisition(apiHandler, httpClient, clientCredentials.ClientID, clientCredentials.ClientSecret)
 		} else {
 			return false, h.Logger.Error("No valid credentials provided. Unable to obtain a token", zap.String("AuthMethod", h.AuthMethod))
 		}
@@ -34,9 +34,9 @@ func (h *AuthTokenHandler) ValidAuthTokenCheck(apiHandler apihandler.APIHandler,
 	if time.Until(h.Expires) < tokenRefreshBufferPeriod {
 		var err error
 		if clientCredentials.Username != "" && clientCredentials.Password != "" {
-			err = h.RefreshToken(apiHandler, httpClient)
+			err = h.RefreshBearerToken(apiHandler, httpClient)
 		} else if clientCredentials.ClientID != "" && clientCredentials.ClientSecret != "" {
-			err = h.ObtainOAuthToken(apiHandler, httpClient, clientCredentials.ClientID, clientCredentials.ClientSecret)
+			err = h.OAuth2TokenAcquisition(apiHandler, httpClient, clientCredentials.ClientID, clientCredentials.ClientSecret)
 		} else {
 			return false, h.Logger.Error("Unknown auth method", zap.String("authMethod", h.AuthMethod))
 		}

httpclient/auth_method.go

@@ -31,7 +31,7 @@ func DetermineAuthMethod(authConfig AuthConfig) (string, error) {
 		validClientSecret, clientSecretErrMsg = authenticationhandler.IsValidClientSecret(authConfig.ClientSecret)
 		// If both ClientID and ClientSecret are valid, use OAuth
 		if validClientID && validClientSecret {
-			return "oauth", nil
+			return "oauth2", nil
 		}
 	}
 
@@ -41,7 +41,7 @@ func DetermineAuthMethod(authConfig AuthConfig) (string, error) {
 		validPassword, passwordErrMsg = authenticationhandler.IsValidPassword(authConfig.Password)
 		// If both Username and Password are valid, use Bearer
 		if validUsername && validPassword {
-			return "bearer", nil
+			return "basicauth", nil
 		}
 	}