Merge pull request #747 from deploymenttheory/fix/enrollment

fix: url construction for CreateAccountDrivenUserEnrollmentAccessGroup

Author: ShocOne

examples/enrollment/CreateAccountDrivenUserEnrollmentAccessGroup/CreateAccountDrivenUserEnrollmentAccessGroup.go

@@ -20,26 +20,30 @@ func main() {
 
 	// Define the new ADUE access group details
 	newGroup := jamfpro.ResourceAccountDrivenUserEnrollmentAccessGroup{
-		GroupID:                            "1", // Example Group ID, replace with actual
-		LdapServerID:                       "4", // Example LDAP Server ID, replace with actual
-		Name:                               "New Access Group",
-		SiteID:                             "-1", // Example Site ID, replace with actual
-		EnterpriseEnrollmentEnabled:        true,
+		GroupID:                            "cccdad37-ec0e-4738-956c-3f8c0203dace", // Example Group ID
+		LdapServerID:                       "1006",                                 // Example LDAP Server ID
+		Name:                               "some-group-name",
+		SiteID:                             "-1", // Example Site ID (global)
+		EnterpriseEnrollmentEnabled:        false,
 		PersonalEnrollmentEnabled:          false,
-		AccountDrivenUserEnrollmentEnabled: true,
+		AccountDrivenUserEnrollmentEnabled: false,
 		RequireEula:                        false,
 	}
 
-	// Create the new ADUE access group using the client
+	payload, err := json.MarshalIndent(newGroup, "", "    ")
+	if err != nil {
+		log.Fatalf("Failed to marshal request payload: %v", err)
+	}
+	fmt.Println("Request Payload to be sent to Jamf Pro API:\n", string(payload))
+
 	response, err := client.CreateAccountDrivenUserEnrollmentAccessGroup(&newGroup)
 	if err != nil {
 		log.Fatalf("Failed to create ADUE access group: %v", err)
 	}
 
-	// Pretty print the created script details in XML
-	JSON, err := json.MarshalIndent(response, "", "    ") // Indent with 4 spaces
+	JSON, err := json.MarshalIndent(response, "", "    ")
 	if err != nil {
-		log.Fatalf("Error marshaling created script data: %v", err)
+		log.Fatalf("Error marshaling created group data: %v", err)
 	}
-	fmt.Println("Created Script Details:\n", string(JSON))
+	fmt.Println("Created Group Response:\n", string(JSON))
 }

examples/enrollment/DeleteMultipleEnrollmentMessagesByLanguageIDs/DeleteMultipleEnrollmentMessagesByLanguageIDs.go

@@ -18,7 +18,7 @@ func main() {
 	}
 
 	// Define the language IDs to delete
-	languageIds := []string{"en", "fr", "es"}
+	languageIds := []string{"fr", "ji"}
 
 	// Call DeleteMultipleEnrollmentMessagesByLanguageIDs function
 	err = client.DeleteMultipleEnrollmentMessagesByLanguageIDs(languageIds)

examples/enrollment/UpdateAccountDrivenUserEnrollmentAccessGroupByID/UpdateAccountDrivenUserEnrollmentAccessGroupByID.go

@@ -19,18 +19,18 @@ func main() {
 	}
 
 	// Define the ID of the group to update
-	groupID := "1"
+	groupID := "12"
 
 	groupUpdate := &jamfpro.ResourceAccountDrivenUserEnrollmentAccessGroup{
 		ID:                                 groupID,
-		GroupID:                            "12345",
-		LdapServerID:                       "1",
-		Name:                               "Updated ADUE Access Group",
-		SiteID:                             "-1",
-		EnterpriseEnrollmentEnabled:        true,
+		GroupID:                            "cccdad37-ec0e-4738-956c-3f8c0203dace", // Example Group ID
+		LdapServerID:                       "1006",                                 // Example LDAP Server ID
+		Name:                               "some-group-name",
+		SiteID:                             "-1", // Example Site ID (global)
+		EnterpriseEnrollmentEnabled:        false,
 		PersonalEnrollmentEnabled:          false,
-		AccountDrivenUserEnrollmentEnabled: true,
-		RequireEula:                        true,
+		AccountDrivenUserEnrollmentEnabled: false,
+		RequireEula:                        false,
 	}
 
 	updatedGroup, err := client.UpdateAccountDrivenUserEnrollmentAccessGroupByID(groupID, groupUpdate)

examples/enrollment/UpdateEnrollmentMessageByLanguageID/UpdateEnrollmentMessageByLanguageID.go

@@ -85,6 +85,10 @@ func main() {
 	}
 
 	// Specify the Two letter ISO 639-1 Language Code to update used as ur Path Params
+	/* Needs to match the req fields
+	LanguageCode:     "fr",
+	Name:             "French",
+	*/
 	languageId := "fr"
 
 	// Call UpdateEnrollmentMessageByLanguageID function

sdk/jamfpro/jamfproapi_enrollment.go

@@ -246,7 +246,7 @@ func (c *Client) GetAccountDrivenUserEnrollmentAccessGroupByName(name string) (*
 
 // CreateAccountDrivenUserEnrollmentAccessGroup creates a new ADUE access group
 func (c *Client) CreateAccountDrivenUserEnrollmentAccessGroup(script *ResourceAccountDrivenUserEnrollmentAccessGroup) (*ResponseAccountDrivenUserEnrollmentAccessGroupCreateAndUpdate, error) {
-	endpoint := uriEnrollmentV3
+	endpoint := fmt.Sprintf("%s/access-groups", uriEnrollmentV3)
 	var out ResponseAccountDrivenUserEnrollmentAccessGroupCreateAndUpdate
 
 	resp, err := c.HTTP.DoRequest("POST", endpoint, script, &out)
@@ -510,46 +510,46 @@ func (c *Client) DeleteMultipleEnrollmentMessagesByLanguageIDs(languageIds []str
 		return fmt.Errorf("failed to retrieve language codes for validation: %v", err)
 	}
 
-	// Create a map of valid language codes for faster lookup
+	// Create a map of valid language codes
 	validCodes := make(map[string]bool)
 	for _, code := range languageCodes {
 		validCodes[code.Value] = true
 	}
 
-	// Validate each language ID against available codes
+	// Validate input list
 	var invalidIDs []string
 	for _, id := range languageIds {
 		if !validCodes[id] {
 			invalidIDs = append(invalidIDs, id)
 		}
 	}
-
 	if len(invalidIDs) > 0 {
 		return fmt.Errorf("invalid language IDs found: %v", invalidIDs)
 	}
 
-	// Proceed with the API call for valid language IDs
+	// Send delete request
 	endpoint := fmt.Sprintf("%s/languages/delete-multiple", uriEnrollmentV3)
-
-	// Create request body
-	request := RequestDeleteMultipleLanguages{
-		IDs: languageIds,
-	}
+	request := RequestDeleteMultipleLanguages{IDs: languageIds}
 
 	resp, err := c.HTTP.DoRequest("POST", endpoint, request, nil)
 	if err != nil {
 		return fmt.Errorf(errMsgFailedDelete, "multiple enrollment language messages", err)
 	}
+	defer func() {
+		if resp != nil && resp.Body != nil {
+			resp.Body.Close()
+		}
+	}()
 
-	if resp != nil && resp.Body != nil {
-		defer resp.Body.Close()
+	// No content? Success!
+	if resp.StatusCode == 204 {
+		return nil
 	}
 
+	// If we *did* get content, try to decode error
 	var respErr ResponseError
-	if err := json.NewDecoder(resp.Body).Decode(&respErr); err == nil {
-		if respErr.HTTPStatus != 0 {
-			return fmt.Errorf("deletion failed for multiple enrollment languages with status %d: %v", respErr.HTTPStatus, respErr.Errors)
-		}
+	if err := json.NewDecoder(resp.Body).Decode(&respErr); err == nil && respErr.HTTPStatus != 0 {
+		return fmt.Errorf("deletion failed for multiple enrollment languages with status %d: %v", respErr.HTTPStatus, respErr.Errors)
 	}
 
 	return nil