From 68b84d1f652aae4644c2dde96d9bb99e358294e8 Mon Sep 17 00:00:00 2001
From: davide.cucurnia@vola.it <davide.cucurnia@vola.it>
Date: Wed, 07 Feb 2024 10:18:30 +0100
Subject: [PATCH] struttura di base versione model based
---
app/Http/Controllers/FakeResponder/FakeResponder.php | 40 +++++++++-------------------------------
1 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/app/Http/Controllers/FakeResponder/FakeResponder.php b/app/Http/Controllers/FakeResponder/FakeResponder.php
index 3e5ee23..ec88acb 100644
--- a/app/Http/Controllers/FakeResponder/FakeResponder.php
+++ b/app/Http/Controllers/FakeResponder/FakeResponder.php
@@ -31,17 +31,12 @@
{
$this->logReceivedRequest($request);
- $picassoRequest = (str_starts_with('/picasso/', $request->getRequestUri()));
-
- if (!$picassoRequest && isset($_COOKIE[$this->cookieFakeSSOName])) {
- $profile = intval(str_replace("xno:", "", $_COOKIE[$this->cookieFakeSSOName]));
- } else if ($picassoRequest && isset($_COOKIE[$this->cookieFakePicassoName])) {
- $profile = intval(str_replace("xno:", "", $_COOKIE[$this->cookieFakePicassoName]));
- }
+ $picassoRequest = (str_starts_with($request->getRequestUri(), '/picasso/',));
+ $profile = Utils::getRequestedUser($request);
if (isset($profile)) {
$responseContent = $this->VolaFakeSSO->getModelBasedResponses($request, $profile, $picassoRequest);
- $this->logProcessedRequest($request, $responseContent, "SSO Legacy");
+ $this->logProcessedRequest($request, $responseContent, (($picassoRequest) ? "SSO v2 Legacy" : "SSO v2 Picasso"));
$responseContent = $this->compressIfRequested($request, $responseContent);
return response($responseContent, 200, $this->headers);
} else {
@@ -53,35 +48,18 @@
public function manageLegacyRequest(Request $request)
{
$this->logReceivedRequest($request);
- if (isset($_COOKIE[$this->cookieFakeSSOName])) {
- $profile = intval(str_replace("xno:", "", $_COOKIE[$this->cookieFakeSSOName]));
- $responseContent = $this->VolaFakeSSO->getResponses($request, $profile);
- $this->logProcessedRequest($request, $responseContent, "SSO Legacy");
+ $picassoRequest = (str_starts_with($request->getRequestUri(), '/picasso/',));
+ $profile = Utils::getRequestedUser($request);
+
+ if (isset($profile)) {
+ $responseContent = $this->VolaFakeSSO->getResponses($request, $profile, $picassoRequest);
+ $this->logProcessedRequest($request, $responseContent, (($picassoRequest) ? "SSO Legacy" : "SSO Picasso"));
$responseContent = $this->compressIfRequested($request, $responseContent);
-
return response($responseContent, 200, $this->headers);
-
} else {
$this->logRejectedRequest($request);
return response('No cookie, no logged', 400, $this->headers);
- }
- }
-
- public function managePicassoRequest(genericPicasso $request)
- {
- $this->logReceivedRequest($request);
- if (isset($_COOKIE[$this->cookieFakePicassoName])) {
- $profile = intval(str_replace("xno:", "", $_COOKIE[$this->cookieFakePicassoName]));
- $responseContent = $this->VolaFakeSSO->getResponses($request, $profile, true);
-
- $this->logProcessedRequest($request, $responseContent, "Picasso");
- $responseContent = $this->compressIfRequested($request, $responseContent);
-
- return response($responseContent, 200, $this->headers);
- } else {
- $this->logRejectedRequest($request);
- return response('No cookie no logged', 400, $this->headers);
}
}
--
Gitblit v1.8.0