Merge pull request #479 from deploymenttheory/bugfix-computerprestages

bug fix for accept function

Author: ShocOne

examples/jamf_app_catalog_app_installers/AcceptJamfAppCatalogAppInstallerTermsAndConditions/AcceptJamfAppCatalogAppInstallerTermsAndConditions.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
 
@@ -18,10 +19,15 @@ func main() {
 	}
 
 	// Accept the terms and conditions
-	err = client.AcceptJamfAppCatalogAppInstallerTermsAndConditions()
+	status, err := client.AcceptJamfAppCatalogAppInstallerTermsAndConditions()
 	if err != nil {
-		log.Fatalf("Error: %v", err)
+		log.Fatalf("Error fetching Terms And Conditions Status: %v", err)
 	}
 
-	fmt.Println("Successfully accepted Jamf App Catalog App Installer terms and conditions.")
+	// Pretty print the fetched Terms And Conditions Status using JSON marshaling
+	statusJSON, err := json.MarshalIndent(status, "", "    ") // Indent with 4 spaces
+	if err != nil {
+		log.Fatalf("Error marshaling Terms And Conditions Status data: %v", err)
+	}
+	fmt.Println("Fetched Terms And Conditions Status:", string(statusJSON))
 }

sdk/jamfpro/jamfproapi_app_installers.go

@@ -133,19 +133,20 @@ func (c *Client) GetJamfAppCatalogAppInstallerTermsAndConditionsStatus() (*Respo
 
 // AcceptJamfAppCatalogAppInstallerTermsAndConditions accepts the terms and conditions for the Jamf App Catalog
 // This is required on an account by account basis.
-func (c *Client) AcceptJamfAppCatalogAppInstallerTermsAndConditions() error {
-	endpoint := fmt.Sprintf("%s/terms-and-conditions", uriJamfAppCatalogAppInstaller)
+func (c *Client) AcceptJamfAppCatalogAppInstallerTermsAndConditions() (*ResponseJamfAppCatalogDeploymentTermsAndConditionsStatus, error) {
+	endpoint := fmt.Sprintf("%s/terms-and-conditions/accept", uriJamfAppCatalogAppInstaller)
 
-	resp, err := c.HTTP.DoRequest("POST", endpoint, nil, nil)
+	var globalSettings ResponseJamfAppCatalogDeploymentTermsAndConditionsStatus
+	resp, err := c.HTTP.DoRequest("POST", endpoint, nil, &globalSettings)
 	if err != nil {
-		return fmt.Errorf("failed to accept terms and conditions: %v", err)
+		return nil, fmt.Errorf(errMsgFailedGet, "printers", err)
 	}
 
 	if resp != nil && resp.Body != nil {
 		defer resp.Body.Close()
 	}
 
-	return nil
+	return &globalSettings, nil
 }
 
 // Gets full list of Get Jamf App Catalog App Installer Titles & handles pagination