diff --git a/app/Http/Middleware/UserAuthEndpoint.php b/app/Http/Middleware/UserAuthEndpoint.php index 364e563f..acf11fae 100644 --- a/app/Http/Middleware/UserAuthEndpoint.php +++ b/app/Http/Middleware/UserAuthEndpoint.php @@ -46,10 +46,11 @@ final class UserAuthEndpoint public function handle($request, Closure $next, $required_groups) { - $user_id = $this->context->getCurrentUserId(); - if (is_null($user_id)) return $next($request); + $member_id = $this->context->getCurrentUserExternalId(); + if (is_null($member_id)) return $next($request); + + $member = $this->member_repository->getById($member_id); - $member = $this->member_repository->getById($user_id); if (is_null($member)){ $http_response = Response::json(['error' => 'member not found'], 403); return $http_response; @@ -61,7 +62,7 @@ final class UserAuthEndpoint foreach ($required_groups as $required_group) { foreach ($groups as $member_group){ - if ($required_group == $member_group->getCode()) { + if (strtolower($required_group) == strtolower($member_group->getCode())) { return $next($request); } } diff --git a/app/ModelSerializers/SummitEventFeedbackSerializer.php b/app/ModelSerializers/SummitEventFeedbackSerializer.php index f92e0a92..c42f4ba7 100644 --- a/app/ModelSerializers/SummitEventFeedbackSerializer.php +++ b/app/ModelSerializers/SummitEventFeedbackSerializer.php @@ -23,10 +23,10 @@ final class SummitEventFeedbackSerializer extends SilverStripeSerializer { protected static $array_mappings = array ( - 'Rate' => 'rate:json_int', - 'Note' => 'note:json_string', - 'Created' => 'created_date:datetime_epoch', - 'EventId' => 'event_id:json_int', + 'Rate' => 'rate:json_int', + 'Note' => 'note:json_string', + 'CreatedUTC' => 'created_date:datetime_epoch', + 'EventId' => 'event_id:json_int', ); /** @@ -45,7 +45,6 @@ final class SummitEventFeedbackSerializer extends SilverStripeSerializer if (is_null($member)) return $values; $values['owner_id'] = intval($member->getId()); - if (!empty($expand)) { foreach (explode(',', $expand) as $relation) { switch (trim($relation)) {