fix: for constants usage

Author: ShocOne

axm/client/auth.go

@@ -41,10 +41,10 @@ type JWTAuthConfig struct {
 // NewJWTAuth creates a new OAuth 2.0 JWT authentication provider
 func NewJWTAuth(config JWTAuthConfig) *JWTAuth {
 	if config.Audience == "" {
-		config.Audience = "appstoreconnect-v1"
+		config.Audience = DefaultJWTAudience
 	}
 	if config.Scope == "" {
-		config.Scope = "business.api"
+		config.Scope = ScopeBusinessAPI
 	}
 
 	return &JWTAuth{
@@ -96,7 +96,6 @@ func (j *JWTAuth) getAccessToken() (string, error) {
 		return "", fmt.Errorf("failed to exchange for access token: %w", err)
 	}
 
-	// Store the token
 	j.accessToken = tokenResp.AccessToken
 	j.tokenExpiry = time.Now().Add(time.Duration(tokenResp.ExpiresIn) * time.Second)
 
@@ -111,7 +110,7 @@ func (j *JWTAuth) generateClientAssertion() (string, error) {
 	claims := jwt.MapClaims{
 		"iss": j.issuerID,                                       // team_id (issuer)
 		"sub": j.issuerID,                                       // client_id (subject) - same as issuer for Apple
-		"aud": "https://account.apple.com/auth/oauth2/v2/token", // OAuth 2.0 token endpoint
+		"aud": DefaultOAuthTokenEndpoint, // OAuth 2.0 token endpoint
 		"iat": now.Unix(),
 		"exp": now.Add(180 * 24 * time.Hour).Unix(), // Max 180 days as per Apple docs
 		"jti": fmt.Sprintf("%d", now.UnixNano()),    // Unique identifier
@@ -161,7 +160,7 @@ func (j *JWTAuth) exchangeForAccessToken(clientAssertion string) (*TokenResponse
 		SetHeader("Content-Type", "application/x-www-form-urlencoded").
 		SetHeader("Host", "account.apple.com").
 		SetResult(&tokenResp).
-		Post("https://account.apple.com/auth/oauth2/v2/token")
+		Post(DefaultOAuthTokenEndpoint)
 
 	if err != nil {
 		return nil, fmt.Errorf("failed to make token request: %w", err)
@@ -208,4 +207,3 @@ func (a *APIKeyAuth) ApplyAuth(req *resty.Request) error {
 	}
 	return nil
 }
-

axm/client/client.go

@@ -41,7 +41,7 @@ type APIResponse[T any] struct {
 // NewTransport creates a new HTTP transport for Apple Business Manager API
 func NewTransport(config Config) (*Client, error) {
 	if config.BaseURL == "" {
-		config.BaseURL = "https://api-business.apple.com/v1"
+		config.BaseURL = DefaultBaseURL
 	}
 	if config.Timeout == 0 {
 		config.Timeout = 30 * time.Second
@@ -165,12 +165,12 @@ func NewTransportFromEnv() (*Client, error) {
 	}
 
 	config := Config{
-		BaseURL: "https://api-business.apple.com/v1",
+		BaseURL: DefaultBaseURL,
 		Auth: NewJWTAuth(JWTAuthConfig{
 			KeyID:      keyID,
 			IssuerID:   issuerID,
 			PrivateKey: privateKey,
-			Audience:   "appstoreconnect-v1",
+			Audience:   DefaultJWTAudience,
 		}),
 		Timeout:    30 * time.Second,
 		RetryCount: 3,
@@ -199,12 +199,12 @@ func NewTransportFromFile(keyID, issuerID, privateKeyPath string) (*Client, erro
 	}
 
 	config := Config{
-		BaseURL: "https://api-business.apple.com/v1",
+		BaseURL: DefaultBaseURL,
 		Auth: NewJWTAuth(JWTAuthConfig{
 			KeyID:      keyID,
 			IssuerID:   issuerID,
 			PrivateKey: privateKey,
-			Audience:   "appstoreconnect-v1",
+			Audience:   DefaultJWTAudience,
 		}),
 		Timeout:    30 * time.Second,
 		RetryCount: 3,

axm/client/constants.go

@@ -1,5 +1,10 @@
 package client
 
+// API Base URL
+const (
+	DefaultBaseURL = "https://api-business.apple.com/v1"
+)
+
 // OAuth scope constants
 const (
 	ScopeBusinessAPI = "business.api"
@@ -8,6 +13,10 @@ const (
 
 // Default OAuth endpoints
 const (
-	DefaultOAuthTokenURL = "https://account.apple.com/auth/oauth2/token"
-	DefaultOAuthAudience = "https://account.apple.com/auth/oauth2/v2/token"
+	DefaultOAuthTokenEndpoint = "https://account.apple.com/auth/oauth2/v2/token"
+)
+
+// Default OAuth audience
+const (
+	DefaultJWTAudience = "appstoreconnect-v1"
 )

axm/new.go

@@ -20,12 +20,12 @@ type Client struct {
 // NewClient creates a new Apple Business Manager client
 func NewClient(keyID, issuerID string, privateKey any) (*Client, error) {
 	config := client.Config{
-		BaseURL: "https://api-business.apple.com/v1",
+		BaseURL: client.DefaultBaseURL,
 		Auth: client.NewJWTAuth(client.JWTAuthConfig{
 			KeyID:      keyID,
 			IssuerID:   issuerID,
 			PrivateKey: privateKey,
-			Audience:   "appstoreconnect-v1",
+			Audience:   client.DefaultJWTAudience,
 		}),
 		Timeout:    30 * time.Second,
 		RetryCount: 3,

examples/axm/devices/GetOrganizationDevices/main.go

@@ -14,10 +14,12 @@ import (
 func main() {
 	fmt.Println("=== Apple Business Manager Test Example ===")
 
-	keyID := "44f6a58a-xxxx-4cab-xxxx-d071a3c36a42"
-	issuerID := "BUSINESSAPI.3bb3a62b-xxxx-4802-xxxx-a69b86201c5a"
+	keyID := "bd4bd60b-6ddf-4fee-8f85-3ed8f6dc4bd1"
+	issuerID := "BUSINESSAPI.3bb3a62b-6f21-4802-95ad-a69b86201c5a"
 	privateKeyPEM := `-----BEGIN EC PRIVATE KEY-----
-your-abm-api-key
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSVST2uwXoc9Gc87H
+uqq7jYhn+PlsrtxPQebp0LeDXp2hRANCAASBtSEWU1075awq69clg4ZPNdPiAX77
+mdH5iVYM8fVK1mAAk1ewo3YWlhz2GEGuox04Ng5xVrpotMQXo2WQEi9C
 -----END EC PRIVATE KEY-----`
 
 	privateKey, err := client.ParsePrivateKey([]byte(privateKeyPEM))