Skip to content

Commit 5e66b90

Browse files
authored
[Item] CAES-1676: Fixed invited view. (#579)
* [Item] CAES-1676: Fixed invited view. * [Item] CAES-1676: cs-fixer
1 parent dfd6584 commit 5e66b90

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/EventSubscriber/Kernel/UserMasterSubscriber.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function __construct(Security $security, TranslatorInterface $translator)
5555
public static function getSubscribedEvents()
5656
{
5757
return [
58-
KernelEvents::RESPONSE => 'onKernelResponse',
58+
KernelEvents::RESPONSE => ['onKernelResponse', 16],
5959
];
6060
}
6161

@@ -78,8 +78,19 @@ public function onKernelResponse(ResponseEvent $event)
7878

7979
if (User::FLOW_STATUS_INCOMPLETE === $user->getFlowStatus()) {
8080
if (!in_array($request->get('_route'), self::GRANTED_ROUTES)) {
81+
$response = $event->getResponse();
82+
8183
$message = $this->translator->trans('app.exception.update_user_password');
82-
$event->setResponse(new JsonResponse(['errors' => [$message], 'route' => $request->get('_route')], Response::HTTP_UNAUTHORIZED));
84+
$errorResponse = new JsonResponse(['errors' => [$message], 'route' => $request->get('_route')], Response::HTTP_UNAUTHORIZED);
85+
$errorResponse->headers->set('Access-Control-Allow-Origin', $response->headers->get('Access-Control-Allow-Origin'));
86+
if ($response->headers->has('Access-Control-Allow-Credentials')) {
87+
$errorResponse->headers->set('Access-Control-Allow-Credentials', $response->headers->get('Access-Control-Allow-Credentials'));
88+
}
89+
if ($response->headers->has('Access-Control-Expose-Headers')) {
90+
$errorResponse->headers->set('Access-Control-Expose-Headers', $response->headers->get('Access-Control-Expose-Headers'));
91+
}
92+
93+
$event->setResponse($errorResponse);
8394
}
8495
}
8596
}

src/Factory/View/Item/InviteItemViewFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public function createSingle(Item $item): InviteItemView
3333
*/
3434
public function createCollection(array $items): array
3535
{
36-
return array_map([$this, 'createSingle'], $items);
36+
return array_values(array_map([$this, 'createSingle'], $items));
3737
}
3838
}

0 commit comments

Comments
 (0)