Refactor code for improved performance and readability

Author: ShocOne

apihandlers/graph/graph_api_handler.go

@@ -0,0 +1,10 @@
+package graph
+
+import "github.com/deploymenttheory/go-api-http-client/logger"
+
+// GraphAPIHandler implements the APIHandler interface for the Jamf Pro API.
+type GraphAPIHandler struct {
+	OverrideBaseDomain string        // OverrideBaseDomain is used to override the base domain for URL construction.
+	InstanceName       string        // InstanceName is the name of the Jamf instance.
+	Logger             logger.Logger // Logger is the structured logger used for logging.
+}

apihandlers/graph/graph_api_handler_constants.go

@@ -0,0 +1,54 @@
+package graph
+
+// Endpoint constants represent the URL suffixes used for Jamf API token interactions.
+const (
+	APIName                            = "graph"               // APIName: represents the name of the API.
+	DefaultBaseDomain                  = "graph.microsoft.com" // DefaultBaseDomain: represents the base domain for the jamf instance.
+	OAuthTokenEndpoint                 = ""                    // OAuthTokenEndpoint: The endpoint to obtain an OAuth token.
+	BearerTokenEndpoint                = ""                    // BearerTokenEndpoint: The endpoint to obtain a bearer token.
+	TokenRefreshEndpoint               = ""                    // TokenRefreshEndpoint: The endpoint to refresh an existing token.
+	TokenInvalidateEndpoint            = ""                    // TokenInvalidateEndpoint: The endpoint to invalidate an active token.
+	BearerTokenAuthenticationSupport   = true                  // BearerTokenAuthSuppport: A boolean to indicate if the API supports bearer token authentication.
+	OAuthAuthenticationSupport         = true                  // OAuthAuthSuppport: A boolean to indicate if the API supports OAuth authentication.
+	OAuthWithCertAuthenticationSupport = true                  // OAuthWithCertAuthSuppport: A boolean to indicate if the API supports OAuth with client certificate authentication.
+)
+
+// GetDefaultBaseDomain returns the default base domain used for constructing API URLs to the http client.
+func (g *GraphAPIHandler) GetDefaultBaseDomain() string {
+	return DefaultBaseDomain
+}
+
+// GetOAuthTokenEndpoint returns the endpoint for obtaining an OAuth token. Used for constructing API URLs for the http client.
+func (g *GraphAPIHandler) GetOAuthTokenEndpoint() string {
+	return OAuthTokenEndpoint
+}
+
+// GetBearerTokenEndpoint returns the endpoint for obtaining a bearer token. Used for constructing API URLs for the http client.
+func (g *GraphAPIHandler) GetBearerTokenEndpoint() string {
+	return BearerTokenEndpoint
+}
+
+// GetTokenRefreshEndpoint returns the endpoint for refreshing an existing token. Used for constructing API URLs for the http client.
+func (g *GraphAPIHandler) GetTokenRefreshEndpoint() string {
+	return TokenRefreshEndpoint
+}
+
+// GetTokenInvalidateEndpoint returns the endpoint for invalidating an active token. Used for constructing API URLs for the http client.
+func (g *GraphAPIHandler) GetTokenInvalidateEndpoint() string {
+	return TokenInvalidateEndpoint
+}
+
+// GetAPIBearerTokenAuthenticationSupportStatus returns a boolean indicating if bearer token authentication is supported in the api handler.
+func (g *GraphAPIHandler) GetAPIBearerTokenAuthenticationSupportStatus() bool {
+	return BearerTokenAuthenticationSupport
+}
+
+// GetAPIOAuthAuthenticationSupportStatus returns a boolean indicating if OAuth authentication is supported in the api handler.
+func (g *GraphAPIHandler) GetAPIOAuthAuthenticationSupportStatus() bool {
+	return OAuthAuthenticationSupport
+}
+
+// GetAPIOAuthWithCertAuthenticationSupportStatus returns a boolean indicating if OAuth with client certificate authentication is supported in the api handler.
+func (g *GraphAPIHandler) GetAPIOAuthWithCertAuthenticationSupportStatus() bool {
+	return OAuthWithCertAuthenticationSupport
+}

apihandlers/graph/graph_api_url.go

@@ -0,0 +1,34 @@
+// graph_api_url.go
+package graph
+
+import (
+	"fmt"
+
+	"github.com/deploymenttheory/go-api-http-client/logger"
+	"go.uber.org/zap"
+)
+
+// SetBaseDomain returns the appropriate base domain for URL construction.
+// It uses j.OverrideBaseDomain if set, otherwise falls back to DefaultBaseDomain.
+func (g *GraphAPIHandler) SetBaseDomain() string {
+	if g.OverrideBaseDomain != "" {
+		return g.OverrideBaseDomain
+	}
+	return DefaultBaseDomain
+}
+
+// ConstructAPIResourceEndpoint constructs the full URL for a Jamf API resource endpoint path and logs the URL.
+func (g *GraphAPIHandler) ConstructAPIResourceEndpoint(instanceName string, endpointPath string, log logger.Logger) string {
+	urlBaseDomain := g.SetBaseDomain()
+	url := fmt.Sprintf("https://%s%s%s", instanceName, urlBaseDomain, endpointPath)
+	g.Logger.Debug(fmt.Sprintf("Constructed %s API resource endpoint URL", APIName), zap.String("URL", url))
+	return url
+}
+
+// ConstructAPIAuthEndpoint constructs the full URL for a Jamf API auth endpoint path and logs the URL.
+func (g *GraphAPIHandler) ConstructAPIAuthEndpoint(instanceName string, endpointPath string, log logger.Logger) string {
+	urlBaseDomain := g.SetBaseDomain()
+	url := fmt.Sprintf("https://%s%s%s", instanceName, urlBaseDomain, endpointPath)
+	g.Logger.Debug(fmt.Sprintf("Constructed %s API authentication URL", APIName), zap.String("URL", url))
+	return url
+}