Skip to content

Commit 039fefd

Browse files
authored
feat!: Fix broken SCIMService.ProvisionAndInviteSCIMUser method (#3239)
Fixes: #3238. BREAKING CHANGE: `SCIMService.ProvisionAndInviteSCIMUser` now returns a response.
1 parent da7d014 commit 039fefd

File tree

2 files changed

+26
-11
lines changed

2 files changed

+26
-11
lines changed

github/scim.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,21 @@ func (s *SCIMService) ListSCIMProvisionedIdentities(ctx context.Context, org str
110110
// GitHub API docs: https://docs.github.com/enterprise-cloud@latest/rest/scim/scim#provision-and-invite-a-scim-user
111111
//
112112
//meta:operation POST /scim/v2/organizations/{org}/Users
113-
func (s *SCIMService) ProvisionAndInviteSCIMUser(ctx context.Context, org string, opts *SCIMUserAttributes) (*Response, error) {
113+
func (s *SCIMService) ProvisionAndInviteSCIMUser(ctx context.Context, org string, opts *SCIMUserAttributes) (*SCIMUserAttributes, *Response, error) {
114114
u := fmt.Sprintf("scim/v2/organizations/%v/Users", org)
115-
u, err := addOptions(u, opts)
115+
116+
req, err := s.client.NewRequest("POST", u, opts)
116117
if err != nil {
117-
return nil, err
118+
return nil, nil, err
118119
}
119120

120-
req, err := s.client.NewRequest("POST", u, nil)
121+
user := new(SCIMUserAttributes)
122+
resp, err := s.client.Do(ctx, req, user)
121123
if err != nil {
122-
return nil, err
124+
return nil, resp, err
123125
}
124126

125-
return s.client.Do(ctx, req, nil)
127+
return user, resp, nil
126128
}
127129

128130
// GetSCIMProvisioningInfoForUser returns SCIM provisioning information for a user.

github/scim_test.go

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ func TestSCIMService_ProvisionAndInviteSCIMUser(t *testing.T) {
127127

128128
mux.HandleFunc("/scim/v2/organizations/o/Users", func(w http.ResponseWriter, r *http.Request) {
129129
testMethod(t, r, "POST")
130-
w.WriteHeader(http.StatusOK)
130+
w.WriteHeader(http.StatusCreated)
131+
fmt.Fprint(w, `{"id":"1234567890","userName":"userName"}`)
131132
})
132133

133134
ctx := context.Background()
@@ -143,19 +144,31 @@ func TestSCIMService_ProvisionAndInviteSCIMUser(t *testing.T) {
143144
},
144145
},
145146
}
146-
_, err := client.SCIM.ProvisionAndInviteSCIMUser(ctx, "o", opts)
147+
user, _, err := client.SCIM.ProvisionAndInviteSCIMUser(ctx, "o", opts)
147148
if err != nil {
148-
t.Errorf("SCIM.ListSCIMProvisionedIdentities returned error: %v", err)
149+
t.Errorf("SCIM.ProvisionAndInviteSCIMUser returned error: %v", err)
150+
}
151+
152+
want := &SCIMUserAttributes{
153+
ID: String("1234567890"),
154+
UserName: "userName",
155+
}
156+
if !cmp.Equal(user, want) {
157+
t.Errorf("SCIM.ProvisionAndInviteSCIMUser returned %+v, want %+v", user, want)
149158
}
150159

151160
const methodName = "ProvisionAndInviteSCIMUser"
152161
testBadOptions(t, methodName, func() (err error) {
153-
_, err = client.SCIM.ProvisionAndInviteSCIMUser(ctx, "\n", opts)
162+
_, _, err = client.SCIM.ProvisionAndInviteSCIMUser(ctx, "\n", opts)
154163
return err
155164
})
156165

157166
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
158-
return client.SCIM.ProvisionAndInviteSCIMUser(ctx, "o", opts)
167+
got, resp, err := client.SCIM.ProvisionAndInviteSCIMUser(ctx, "o", opts)
168+
if got != nil {
169+
t.Errorf("testNewRequestAndDoFailure %v = %#v, want nil", methodName, got)
170+
}
171+
return resp, err
159172
})
160173
}
161174

0 commit comments

Comments
 (0)