Redirect After Login

redirect-after-login-adjustment.patch

diff --git a/redirect_after_login.module b/redirect_after_login.module
index 18b2f25..34a14f9 100644
--- a/redirect_after_login.module
+++ b/redirect_after_login.module
@@ -12,20 +12,24 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
  */
 function redirect_after_login_user_login($account) {
   $current_route = \Drupal::routeMatch()->getRouteName();
-  if (!in_array($current_route, ['user.reset', 'user.reset.login'])) {
-    // We want to redirect user on login
-    $current_user = \Drupal::currentUser();
-    $username = $current_user->getRoles();
-    $login_redirection = \Drupal::config('redirect_after_login.settings')
-      ->get('login_redirection');
-    if (isset($login_redirection[array_reverse($username)[0]])) {
-      $response = new RedirectResponse(URL::fromUserInput($login_redirection[array_reverse($username)[0]])
+  $session = \Drupal::request()->getSession()->get('usfb_address_check');
+  $address_check_inactive = $session === NULL || $session === FALSE;
+  if ($address_check_inactive) {
+    if (!in_array($current_route, ['user.reset', 'user.reset.login'])) {
+      // We want to redirect user on login
+      $current_user = \Drupal::currentUser();
+      $username = $current_user->getRoles();
+      $login_redirection = \Drupal::config('redirect_after_login.settings')
+        ->get('login_redirection');
+      if (isset($login_redirection[array_reverse($username)[0]])) {
+        $response = new RedirectResponse(URL::fromUserInput($login_redirection[array_reverse($username)[0]])
           ->toString());
-      $response->send();
-    }
-    else {
-      $homeResponse = new RedirectResponse(URL::fromUserInput('/')->toString());
-      $homeResponse->send();
+        $response->send();
+      }
+      else {
+        $homeResponse = new RedirectResponse(URL::fromUserInput('/')->toString());
+        $homeResponse->send();
+      }
     }
   }