openinfra/openstackid-resources
Code Issues Proposed changes

Merge "Fixed issue with feedback timestamp Fixed issue with auth middleware"

Browse Source
This commit is contained in:
Jenkins 2017-05-08 17:37:39 +00:00 committed by Gerrit Code Review
commit 4534ce5ea4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Middleware/UserAuthEndpoint.php
View File

@ -46,10 +46,11 @@ final class UserAuthEndpoint
public function handle($request, Closure $next, $required_groups) public function handle($request, Closure $next, $required_groups)
{ {
$user_id = $this->context->getCurrentUserId(); $member_id = $this->context->getCurrentUserExternalId();
if (is_null($user_id)) return $next($request); 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)){ if (is_null($member)){
$http_response = Response::json(['error' => 'member not found'], 403); $http_response = Response::json(['error' => 'member not found'], 403);
return $http_response; return $http_response;
@ -61,7 +62,7 @@ final class UserAuthEndpoint
foreach ($required_groups as $required_group) { foreach ($required_groups as $required_group) {
foreach ($groups as $member_group){ foreach ($groups as $member_group){
if ($required_group == $member_group->getCode()) { if (strtolower($required_group) == strtolower($member_group->getCode())) {
return $next($request); return $next($request);
} }
} }

9
app/ModelSerializers/SummitEventFeedbackSerializer.php
View File

@ -23,10 +23,10 @@ final class SummitEventFeedbackSerializer extends SilverStripeSerializer
{ {
protected static $array_mappings = array protected static $array_mappings = array
( (
'Rate' => 'rate:json_int', 'Rate' => 'rate:json_int',
'Note' => 'note:json_string', 'Note' => 'note:json_string',
'Created' => 'created_date:datetime_epoch', 'CreatedUTC' => 'created_date:datetime_epoch',
'EventId' => 'event_id:json_int', 'EventId' => 'event_id:json_int',
); );
/** /**
@ -45,7 +45,6 @@ final class SummitEventFeedbackSerializer extends SilverStripeSerializer
if (is_null($member)) return $values; if (is_null($member)) return $values;
$values['owner_id'] = intval($member->getId()); $values['owner_id'] = intval($member->getId());
if (!empty($expand)) { if (!empty($expand)) {
foreach (explode(',', $expand) as $relation) { foreach (explode(',', $expand) as $relation) {
switch (trim($relation)) { switch (trim($relation)) {