Skip to content

Commit 07bed01

Browse files
committed
Remove null params
1 parent f12ea4d commit 07bed01

2 files changed

Lines changed: 20 additions & 11 deletions

File tree

lib/UserManagement.php

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,17 @@ public function createOrganizationMembership($userId, $organizationId, $roleSlug
234234

235235
$params = [
236236
"organization_id" => $organizationId,
237-
"user_id" => $userId,
238-
"role_slug" => $roleSlug,
239-
"role_slugs" => $roleSlugs
237+
"user_id" => $userId
240238
];
241239

240+
if (!is_null($roleSlug)) {
241+
$params["role_slug"] = $roleSlug;
242+
}
243+
244+
if (!is_null($roleSlugs)) {
245+
$params["role_slugs"] = $roleSlugs;
246+
}
247+
242248
$response = Client::request(
243249
Client::METHOD_POST,
244250
$path,
@@ -313,10 +319,15 @@ public function updateOrganizationMembership($organizationMembershipId, $roleSlu
313319
{
314320
$path = "user_management/organization_memberships/{$organizationMembershipId}";
315321

316-
$params = [
317-
"role_slug" => $roleSlug,
318-
"role_slugs" => $roleSlugs
319-
];
322+
$params = [];
323+
324+
if (!is_null($roleSlug)) {
325+
$params["role_slug"] = $roleSlug;
326+
}
327+
328+
if (!is_null($roleSlugs)) {
329+
$params["role_slugs"] = $roleSlugs;
330+
}
320331

321332
$response = Client::request(
322333
Client::METHOD_PUT,

tests/WorkOS/UserManagementTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,6 @@ public function testCreateOrganizationMembership()
894894
"organization_id" => $orgId,
895895
"user_id" => $userId,
896896
"role_slug" => $roleSlug,
897-
"role_slugs" => null,
898897
];
899898

900899
$this->mockRequest(
@@ -925,7 +924,6 @@ public function testCreateOrganizationMembershipWithRoleSlugs()
925924
$params = [
926925
"organization_id" => $orgId,
927926
"user_id" => $userId,
928-
"role_slug" => null,
929927
"role_slugs" => $roleSlugs,
930928
];
931929

@@ -1104,7 +1102,7 @@ public function testUpdateOrganizationMembership()
11041102
Client::METHOD_PUT,
11051103
$path,
11061104
null,
1107-
["role_slug" => $roleSlug, "role_slugs" => null],
1105+
["role_slug" => $roleSlug],
11081106
true,
11091107
$result
11101108
);
@@ -1125,7 +1123,7 @@ public function testUpdateOrganizationMembershipWithRoleSlugs()
11251123
Client::METHOD_PUT,
11261124
$path,
11271125
null,
1128-
["role_slug" => null, "role_slugs" => $roleSlugs],
1126+
["role_slugs" => $roleSlugs],
11291127
true,
11301128
$result
11311129
);

0 commit comments

Comments
 (0)