From 127ddfdfd4527a8794dd5508aae05d98ab3cbf59 Mon Sep 17 00:00:00 2001
From: Chris Trott <908409+trotttrotttrott@users.noreply.github.com>
Date: Mon, 19 Jul 2021 17:07:39 -0600
Subject: [PATCH] GET /api/org/users

Returns all org users within the current organization. Accessible to
users with org admin role.

This is not an admin org endpoint so basic auth is not required.
---
 org_users.go      | 11 +++++++++++
 org_users_test.go | 22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/org_users.go b/org_users.go
index 5778ca4e..026e5d4a 100644
--- a/org_users.go
+++ b/org_users.go
@@ -15,6 +15,17 @@ type OrgUser struct {
 	Role   string `json:"role"`
 }
 
+// OrgUsersCurrent returns all org users within the current organization.
+// This endpoint is accessible to users with org admin role.
+func (c *Client) OrgUsersCurrent() ([]OrgUser, error) {
+	users := make([]OrgUser, 0)
+	err := c.request("GET", "/api/org/users", nil, nil, &users)
+	if err != nil {
+		return nil, err
+	}
+	return users, err
+}
+
 // OrgUsers fetches and returns the users for the org whose ID it's passed.
 func (c *Client) OrgUsers(orgID int64) ([]OrgUser, error) {
 	users := make([]OrgUser, 0)
diff --git a/org_users_test.go b/org_users_test.go
index 295cbd62..82afa8cd 100644
--- a/org_users_test.go
+++ b/org_users_test.go
@@ -13,6 +13,28 @@ const (
 	removeOrgUserJSON = `{"message":"User removed from organization"}`
 )
 
+func TestOrgUsersCurrent(t *testing.T) {
+	server, client := gapiTestTools(t, 200, getOrgUsersJSON)
+	defer server.Close()
+
+	resp, err := client.OrgUsersCurrent()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	user := OrgUser{
+		OrgID:  1,
+		UserID: 1,
+		Email:  "admin@localhost",
+		Login:  "admin",
+		Role:   "Admin",
+	}
+
+	if resp[0] != user {
+		t.Error("Not correctly parsing returned organization users.")
+	}
+}
+
 func TestOrgUsers(t *testing.T) {
 	server, client := gapiTestTools(t, 200, getOrgUsersJSON)
 	defer server.Close()