Merge pull request #12 from philips-software/feature/delete-organization

Add delete organization support

Author: loafoe

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## v0.15.0
+
+- [NEW] Cartel API support
+- Switch to SCIM based organization management
+- Add Organizations.DeleteOrganization()
+- Add Organizations.DeleteStatus()
+
+
 ## v0.14.0
 - [IAM] Move user find API to v2
 - [IAM] Update go-hsdp-signer

iam/organizations_service.go

@@ -1,8 +1,10 @@
 package iam
 
 import (
+	"bytes"
 	"fmt"
 	"net/http"
+	"time"
 )
 
 const (
@@ -21,6 +23,20 @@ type GetOrganizationOptions struct {
 	ExcludedAttributes *string `url:"excludedAttributes,omitempty"`
 }
 
+type OrganizationStatus struct {
+	Schemas        []string `json:"schemas"`
+	ID             string   `json:"id"`
+	Status         string   `json:"status"`
+	TotalResources int      `json:"totalResources"`
+	Meta           struct {
+		ResourceType string    `json:"resourceType"`
+		Created      time.Time `json:"created"`
+		LastModified time.Time `json:"lastModified"`
+		Location     string    `json:"location"`
+		Version      string    `json:"version"`
+	} `json:"meta"`
+}
+
 func FilterOrgEq(orgID string) *GetOrganizationOptions {
 	query := "id eq \"" + orgID + "\""
 	attributes := "id"
@@ -74,20 +90,22 @@ func (o *OrganizationsService) CreateOrganization(organization Organization) (*O
 }
 
 // DeleteOrganization deletes the organization
-// WARNING: Not implemented in current IAM releases (As of May 11th 2020)
 func (o *OrganizationsService) DeleteOrganization(org Organization) (bool, *Response, error) {
 	req, err := o.client.NewRequest(IDM, "DELETE", "authorize/scim/v2/Organizations/"+org.ID, nil, nil)
 	if err != nil {
 		return false, nil, err
 	}
 	req.Header.Set("api-version", organizationAPIVersion)
 	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("If-Method", "DELETE")
+
+	var deleteResponse bytes.Buffer
 
-	resp, err := o.client.Do(req, nil)
+	resp, err := o.client.Do(req, &deleteResponse)
 	if err != nil {
 		return false, resp, err
 	}
-	return resp.StatusCode == http.StatusNoContent, resp, nil
+	return resp.StatusCode == http.StatusAccepted, resp, nil
 }
 
 // UpdateOrganization updates the description of the organization.
@@ -151,3 +169,18 @@ func (o *OrganizationsService) GetOrganization(opt *GetOrganizationOptions, opti
 
 	return o.GetOrganizationByID(bundleResponse.Resources[0].ID)
 }
+
+// DeleteStatus returns the status of a delete operation on an organization
+func (o *OrganizationsService) DeleteStatus(id string) (*OrganizationStatus, *Response, error) {
+	req, err := o.client.NewRequest(IDM, "GET", "authorize/scim/v2/Organizations/"+id+"/deleteStatus", nil, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+	req.Header.Set("api-version", organizationAPIVersion)
+	req.Header.Set("Content-Type", "application/json")
+
+	var deleteResponse OrganizationStatus
+
+	resp, err := o.client.Do(req, &deleteResponse)
+	return &deleteResponse, resp, err
+}

iam/organizations_service_test.go

@@ -185,7 +185,11 @@ func TestUpdateAndDeleteOrganization(t *testing.T) {
 			w.WriteHeader(http.StatusOK)
 			_, _ = io.WriteString(w, string(responseBody))
 		case "DELETE":
-			w.WriteHeader(http.StatusNoContent)
+			if r.Header.Get("If-Method") != "DELETE" {
+				w.WriteHeader(http.StatusForbidden)
+				return
+			}
+			w.WriteHeader(http.StatusAccepted)
 			return
 		default:
 			w.WriteHeader(http.StatusMethodNotAllowed)
@@ -202,6 +206,9 @@ func TestUpdateAndDeleteOrganization(t *testing.T) {
 	}
 
 	updatedOrg, resp, err := client.Organizations.UpdateOrganization(*foundOrg)
+	if !assert.Nil(t, err) {
+		return
+	}
 	if !assert.NotNil(t, resp) {
 		return
 	}
@@ -275,3 +282,64 @@ func TestGetOrganization(t *testing.T) {
 	assert.Equal(t, orgName, foundOrg.Name)
 	assert.Equal(t, orgUUID, foundOrg.ID)
 }
+
+func TestDeleteStatus(t *testing.T) {
+	teardown := setup(t)
+	defer teardown()
+
+	orgUUID := "c57b2625-eda3-4b27-a8e6-86f0a0e76afc"
+
+	muxIDM.HandleFunc("/authorize/scim/v2/Organizations/"+orgUUID+"/deleteStatus", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "GET" {
+			w.WriteHeader(http.StatusMethodNotAllowed)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		_, _ = io.WriteString(w, `{
+  "schemas": [
+    "urn:ietf:params:scim:api:messages:philips:hsdp:2.0:DeleteStatus"
+  ],
+  "id": "`+orgUUID+`",
+  "status": "IN_PROGRESS",
+  "totalResources": 100,
+  "meta": {
+    "resourceType": "Organization",
+    "created": "2020-05-24T20:33:59.192Z",
+    "lastModified": "2020-05-24T20:33:59.192Z",
+    "location": "https://idm-xx.us-east.philips-healthsuite.com/authorize/scim/v2/Organizations/`+orgUUID+`",
+    "version": "W/\"f250dd84f0671c3\""
+  }
+}`)
+	})
+
+	status, resp, err := client.Organizations.DeleteStatus(orgUUID)
+	assert.Nil(t, err)
+	if !assert.NotNil(t, resp) {
+		return
+	}
+	if !assert.NotNil(t, status) {
+		return
+	}
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
+	assert.Equal(t, "IN_PROGRESS", status.Status)
+	assert.Equal(t, orgUUID, status.ID)
+}
+
+func TestFilters(t *testing.T) {
+	opts := FilterParentEq("xxx")
+	if !assert.NotNil(t, opts) {
+		return
+	}
+	assert.Equal(t, `parent.value eq "xxx"`, *opts.Filter)
+	opts = FilterOrgEq("yyy")
+	if !assert.NotNil(t, opts) {
+		return
+	}
+	assert.Equal(t, `id eq "yyy"`, *opts.Filter)
+	opts = FilterNameEq("zzz")
+	if !assert.NotNil(t, opts) {
+		return
+	}
+	assert.Equal(t, `name eq "zzz"`, *opts.Filter)
+}