user-login-hack.patch

diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 053429f4b8..44d3c5c898 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -561,8 +561,22 @@ function user_login_finalize(UserInterface $account) {
   // This is called before hook_user_login() in case one of those functions
   // fails or incorrectly does a redirect which would leave the old session
   // in place.
-  \Drupal::service('session')->migrate();
-  \Drupal::service('session')->set('uid', $account->id());
+  $skip = FALSE;
+  $moduleHandler = \Drupal::service('module_handler');
+  if ($moduleHandler->moduleExists('poets_api_login') && $moduleHandler->moduleExists('social_login')) {
+    $redirect = \Drupal::service('poets_api_login.redirect');
+    $request = \Drupal::request();
+    $cookies = $request->cookies->all();
+    $url = parse_url($cookies["referer"]);
+    if (isset($url['host']) && in_array($url['host'], $redirect->whiteList())) {
+      $skip = TRUE;
+    }
+  }
+
+  if (!$skip) {
+    \Drupal::service('session')->migrate();
+    \Drupal::service('session')->set('uid', $account->id());
+  }
   \Drupal::moduleHandler()->invokeAll('user_login', [$account]);
 }