Uml 3764 remove one login feature flag

.github/workflows/_run-behat-tests.yml

@@ -81,7 +81,6 @@ jobs:
           use_fqdn=$(cat ./terraform/environment/cluster_config.json | jq .use_fqdn | xargs)
           public_facing_view_fqdn=$(cat ./terraform/environment/cluster_config.json | jq .public_facing_view_fqdn | xargs)
           public_facing_use_fqdn=$(cat ./terraform/environment/cluster_config.json | jq .public_facing_use_fqdn | xargs)
-          ff_allow_gov_one_login=$(cat ./terraform/environment/cluster_config.json | jq .ff_allow_gov_one_login | xargs)
 
           ln -sf ../features tests/smoke/features
 
@@ -90,7 +89,6 @@ jobs:
             BEHAT_ACTOR_URL=https://$public_facing_use_fqdn \
             BEHAT_OLD_VIEWER_URL=https://$viewer_fqdn \
             BEHAT_OLD_ACTOR_URL=https://$use_fqdn \
-            BEHAT_FF_ALLOW_GOV_ONE_LOGIN=$ff_allow_gov_one_login \
             vendor/bin/behat
 
       - name: archive failed test screenshots

docker-compose.yml

@@ -103,7 +103,6 @@ services:
       # Feature flags
       DELETE_LPA_FEATURE: "true"
       ALLOW_MERIS_LPAS: "false"
-      ALLOW_GOV_ONE_LOGIN: "true"
       SUPPORT_DATASTORE_LPAS: "false"
 
       # Local only
@@ -188,7 +187,6 @@ services:
 
       # Feature flags
       ALLOW_MERIS_LPAS: "false"
-      ALLOW_GOV_ONE_LOGIN: "true"
       SUPPORT_DATASTORE_LPAS: "false"
 
       # Local only

service-api/app/features/actor-logout.feature

@@ -8,7 +8,7 @@ Feature: A user of the system is able to logout
     Given I am a user of the lpa application
     And I have been given access to use an LPA via credentials
 
-  @acceptance @ff:allow_gov_one_login:true
+  @acceptance
   Scenario: A user can logout
     Given I am currently signed in
     When I logout of the application

service-api/app/features/bootstrap/config.php

@@ -72,7 +72,5 @@
         'discovery_url'   => 'http://one-login-mock/.well-known/openid-configuration',
         'identity_issuer' => 'http://identity.one-login-mock/',
     ],
-    'feature_flags'                          => [
-        'allow_gov_one_login' => true,
-    ],
+    'feature_flags'                          => [],
 ];

service-front/app/config/autoload/features.global.php

@@ -16,11 +16,7 @@
             getenv('ALLOW_MERIS_LPAS'),
             FILTER_VALIDATE_BOOLEAN
         ) ?: false,
-        'allow_gov_one_login'          => filter_var(
-            getenv('ALLOW_GOV_ONE_LOGIN'),
-            FILTER_VALIDATE_BOOLEAN
-        ) ?: false,
-        'support_datastore_lpas'                                     => filter_var(
+        'support_datastore_lpas'       => filter_var(
             getenv('SUPPORT_DATASTORE_LPAS'),
             FILTER_VALIDATE_BOOLEAN
         ) ?: false,

service-front/app/config/routes.php

@@ -63,22 +63,10 @@
 
 $actorRoutes = function (Application $app, MiddlewareFactory $factory, ContainerInterface $container): void {
     $DELETE_LPA_FEATURE = 'delete_lpa_feature';
-    $ALLOW_GOV_ONE_LOGIN = 'allow_gov_one_login';
 
     $defaultNotFoundPage = Actor\Handler\LpaDashboardHandler::class;
 
-    $config = $container->get("config");
-    $feature_flags = $config["feature_flags"];
-
-    $app->route('/home', [
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Actor\Handler\AuthenticateOneLoginHandler::class,
-            Actor\Handler\ActorTriagePageHandler::class
-        )
-    ], ['GET', 'POST'], 'home');
+    $app->route('/home', Actor\Handler\AuthenticateOneLoginHandler::class, ['GET', 'POST'], 'home');
     $app->route('/', Actor\Handler\ActorTriagePageHandler::class, ['GET', 'POST'], 'home-trial');
     $app->get('/healthcheck', Common\Handler\HealthcheckHandler::class, 'healthcheck');
     $app->get('/stats', Actor\Handler\StatsPageHandler::class, 'actor-stats');
@@ -94,64 +82,22 @@
     $app->get('/contact-us', Common\Handler\ContactUsPageHandler::class, 'contact-us');
 
     // User creation
-    $app->route(
-        '/create-account',
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Common\Handler\GoneHandler::class,
-            Actor\Handler\CreateAccountHandler::class,
-        ),
-        ['GET', 'POST'],
-        'create-account'
-    );
-    $app->get(
-        '/create-account-success',
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Common\Handler\GoneHandler::class,
-            Actor\Handler\CreateAccountSuccessHandler::class,
-        ),
-        'create-account-success'
-    );
+    $app->route('/create-account',Common\Handler\GoneHandler::class,['GET', 'POST'],'create-account');
+
+    $app->get('/create-account-success',Common\Handler\GoneHandler::class,'create-account-success');
     $app->get(
         '/activate-account/{token}',
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            fn () => new \Laminas\Diactoros\Response\RedirectResponse('/home'),
-            Actor\Handler\ActivateAccountHandler::class,
-        ),
+        fn () => new \Laminas\Diactoros\Response\RedirectResponse('/home'),
         'activate-account'
     );
 
     // User auth
-    $app->route('/login', [
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            fn () => new \Laminas\Diactoros\Response\RedirectResponse('/home'),
-            Actor\Handler\LoginPageHandler::class
-        )
-    ], ['GET', 'POST'], 'login');
+    $app->route('/login', fn () => new \Laminas\Diactoros\Response\RedirectResponse('/home'), ['GET', 'POST'], 'login');
 
     $app->get('/session-expired', Actor\Handler\ActorSessionExpiredHandler::class, 'session-expired');
     $app->get('/session-check', Actor\Handler\ActorSessionCheckHandler::class, 'session-check');
     $app->get('/session-refresh', Common\Handler\SessionRefreshHandler::class, 'session-refresh');
-    $app->get('/home/login', [
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Actor\Handler\OneLoginCallbackHandler::class,
-            Common\Handler\GoneHandler::class
-        )
-    ], 'auth-redirect');
+    $app->get('/home/login', Actor\Handler\OneLoginCallbackHandler::class, 'auth-redirect');
 
     $app->get(
         '/logout',
@@ -163,42 +109,19 @@
     );
 
     // User management
-    $app->route(
-        '/reset-password',
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Common\Handler\GoneHandler::class,
-            Actor\Handler\PasswordResetRequestPageHandler::class
-        ),
-        ['GET', 'POST'],
-        'password-reset'
-    );
+    $app->route('/reset-password', Common\Handler\GoneHandler::class, ['GET', 'POST'], 'password-reset');
 
 
     $app->route(
         '/reset-password/{token}',
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Common\Handler\GoneHandler::class,
-            Actor\Handler\PasswordResetPageHandler::class
-        ),
+        Common\Handler\GoneHandler::class,
         ['GET', 'POST'],
         'password-reset-token'
     );
 
     $app->get(
         '/verify-new-email/{token}',
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Common\Handler\GoneHandler::class,
-            Actor\Handler\CompleteChangeEmailHandler::class
-        ),
+        Common\Handler\GoneHandler::class,
         'verify-new-email'
     );
 
@@ -217,29 +140,8 @@
         Actor\Handler\SettingsHandler::class,
     ], 'settings');
 
-    $app->route('/change-password',
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Common\Handler\GoneHandler::class,
-            Actor\Handler\ChangePasswordHandler::class
-        ),
-        ['GET','POST'],
-  'change-password'
-    );
-
-    $app->route('/change-email',
-        new ConditionalRoutingMiddleware(
-            $container,
-            $factory,
-            $ALLOW_GOV_ONE_LOGIN,
-            Common\Handler\GoneHandler::class,
-            Actor\Handler\RequestChangeEmailHandler::class
-        ),
-        ['GET','POST'],
- 'change-email'
-    );
+    $app->route('/change-password', Common\Handler\GoneHandler::class, ['GET','POST'], 'change-password');
+    $app->route('/change-email', Common\Handler\GoneHandler::class, ['GET','POST'], 'change-email');
 
     $app->get('/lpa/change-details', [
         Common\Middleware\Authentication\AuthenticationMiddleware::class,

service-front/app/features/actor-back-navigation.feature

@@ -4,23 +4,6 @@ Feature: Back navigation
   I want the back function to take me to an appropriate page for where I am in the journey
   So that I can easily navigate the service
 
-  @ui @ff:allow_gov_one_login:false
-  Scenario: Check back function on reset password page
-    Given I access the login form
-    And I have forgotten my password
-    And I am on the password reset page
-    When I click the Back link on the page
-    Then I should be taken to the <login> page
-
-  @ui @ff:allow_gov_one_login:false
-  Scenario: Check back function on change password page
-    Given I am a user of the lpa application
-    And I am currently signed in
-    And I view my user details
-    And I ask to change my password
-    When I click the Back link on the page
-    Then I should be taken to the <settings> page
-
   @ui
   Scenario: Check back function on add LPA page
     Given I am a user of the lpa application