Skip to content

Commit c0417b0

Browse files
authored
feat: handle ArrayData records
1 parent 8b2deb7 commit c0417b0

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

src/Controllers/AuthController.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Level51\JWTUtils\JWTUtilsException;
77
use SilverStripe\Security\Member;
88
use SilverStripe\Security\Security;
9+
use SilverStripe\View\ArrayData;
910

1011
class AuthController extends ApiController
1112
{
@@ -27,7 +28,17 @@ public function token() {
2728
$member = Member::get()->byID($payload['member']['id']);
2829

2930
if ($member) {
30-
$payload['member'] = array_merge($payload['member'], $member->toApi());
31+
$api = [];
32+
33+
if ($member->hasMethod('toApi')) {
34+
$api = $member->toApi() ?? [];
35+
36+
if ($api instanceof ArrayData) {
37+
$api = $api->toMap();
38+
}
39+
}
40+
41+
$payload['member'] = array_merge($payload['member'], $api);
3142
}
3243

3344
return $this->returnArray($payload);

0 commit comments

Comments
 (0)