From b65424d157f5b2d50a12aea349b097cb82141fdc Mon Sep 17 00:00:00 2001
From: Mishkat Najam <mishkat.najam@digital.justice.gov.uk>
Date: Fri, 3 Nov 2023 13:17:08 +0000
Subject: [PATCH] Rename api calls

---
 service-api/app/config/routes.php                         | 8 ++++----
 .../app/features/context/Acceptance/AccountContext.php    | 6 +++---
 service-api/app/features/one-login.feature                | 2 +-
 .../src/Common/src/Service/OneLogin/OneLoginService.php   | 2 +-
 .../CommonTest/Service/OneLogin/OneLoginServiceTest.php   | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/service-api/app/config/routes.php b/service-api/app/config/routes.php
index e405b1ba2d..96f4a9ad66 100644
--- a/service-api/app/config/routes.php
+++ b/service-api/app/config/routes.php
@@ -19,6 +19,8 @@
 use App\Handler\LpasResourceHandler;
 use App\Handler\LpasResourceImagesCollectionHandler;
 use App\Handler\NotifyHandler;
+use App\Handler\OneLoginAuthenticationCallbackHandler;
+use App\Handler\OneLoginAuthenticationRequestHandler;
 use App\Handler\RequestChangeEmailHandler;
 use App\Handler\RequestCleanseHandler;
 use App\Handler\RequestPasswordResetHandler;
@@ -29,8 +31,6 @@
 use Mezzio\Application;
 use Mezzio\MiddlewareFactory;
 use Psr\Container\ContainerInterface;
-use App\Handler\OneLoginAuthenticationRequestHandler;
-use App\Handler\OneLoginAuthenticationCallbackHandler;
 
 /**
  * Setup routes with a single request method:
@@ -136,8 +136,8 @@
 
     $app->patch('/v1/auth', AuthHandler::class, 'user.auth');
 
-    $app->get('/v1/auth-one-login', OneLoginAuthenticationRequestHandler::class, 'user.auth-one-login');
-    $app->get('/v1/auth-one-login-process', OneLoginAuthenticationCallbackHandler::class, 'user.auth-process');
+    $app->get('/v1/auth/start', OneLoginAuthenticationRequestHandler::class, 'user.auth-start');
+    $app->get('/v1/auth/callback', OneLoginAuthenticationCallbackHandler::class, 'user.auth-callback');
 
     $app->post('/v1/email-user/{emailTemplate}', NotifyHandler::class, 'lpa.user.notify');
 };
diff --git a/service-api/app/features/context/Acceptance/AccountContext.php b/service-api/app/features/context/Acceptance/AccountContext.php
index 2c28e466a7..abaadadf76 100644
--- a/service-api/app/features/context/Acceptance/AccountContext.php
+++ b/service-api/app/features/context/Acceptance/AccountContext.php
@@ -1314,13 +1314,13 @@ public function iClickTheOneLoginButton(): void
      */
     public function iAmRedirectedToTheRedirectPage(): void
     {
-        $this->apiGet('/v1/auth-one-login-process', []);
+        $this->apiGet('/v1/auth/callback', []);
 
         $this->ui->assertSession()->statusCodeEquals(StatusCodeInterface::STATUS_OK);
 
         $response = $this->getResponseAsJson();
 
-        Assert::assertEquals('one-login-user', $response['Id']);
-        Assert::assertEquals('one-login-user@email.com', $response['Email']);
+        Assert::assertEquals('bf9e7e77-f283-49c6-a79c-65d5d309ef77', $response['Id']);
+        Assert::assertEquals('opg-use-an-lpa+test-user@digital.justice.gov.uk', $response['Email']);
     }
 }
diff --git a/service-api/app/features/one-login.feature b/service-api/app/features/one-login.feature
index 5e810d67c3..4e203e163f 100644
--- a/service-api/app/features/one-login.feature
+++ b/service-api/app/features/one-login.feature
@@ -5,4 +5,4 @@ Feature: Authorise One Login
   Scenario: I initiate authentication via one login
     Given I am on the temporary one login page
     When I click the one login button
-    Then I am redirected to the redirect page
\ No newline at end of file
+    Then I am redirected to the redirect page
diff --git a/service-front/app/src/Common/src/Service/OneLogin/OneLoginService.php b/service-front/app/src/Common/src/Service/OneLogin/OneLoginService.php
index 9af86873f6..9b3ffe7e5c 100644
--- a/service-front/app/src/Common/src/Service/OneLogin/OneLoginService.php
+++ b/service-front/app/src/Common/src/Service/OneLogin/OneLoginService.php
@@ -14,7 +14,7 @@ public function __construct(private ApiClient $apiClient)
 
     public function authenticate(string $uiLocale, string $redirectUrl): ?array
     {
-        return $this->apiClient->httpGet('/v1/auth-one-login', [
+        return $this->apiClient->httpGet('/v1/auth/start', [
             'ui_locale'    => $uiLocale,
             'redirect_url' => $redirectUrl,
         ]);
diff --git a/service-front/app/test/CommonTest/Service/OneLogin/OneLoginServiceTest.php b/service-front/app/test/CommonTest/Service/OneLogin/OneLoginServiceTest.php
index 61b86343f9..a94570b58d 100644
--- a/service-front/app/test/CommonTest/Service/OneLogin/OneLoginServiceTest.php
+++ b/service-front/app/test/CommonTest/Service/OneLogin/OneLoginServiceTest.php
@@ -32,9 +32,9 @@ public function can_get_authentication_request_uri(): void
 
         $apiClientProphecy
             ->httpGet(
-                '/v1/auth-one-login',
+                '/v1/auth/start',
                 [
-                    'ui_locale' => 'en',
+                    'ui_locale'    => 'en',
                     'redirect_url' => $redirect,
                 ]
             )->willReturn(['state' => $state, 'nonce' => $nonce, 'url' => $uri]);