Merge pull request #184 from rtCamp/fix/login-issue-with-expired-cookie

Fix: Login issue - Need to click login with google button twice

Author: SH4LIN

.github/ci/main.sh

@@ -34,7 +34,6 @@ function create_and_configure_site () {
     ls
     wp plugin activate login-with-google --allow-root
     wp user create automation [email protected] --role=administrator --user_pass=automation --allow-root
-    wp theme activate twentytwentyone --allow-root
 }
 
 

.github/workflows/e2e-test.yml

@@ -1,18 +1,18 @@
-# e2e test for Login with google plugin. 
+# e2e test for Login with google plugin.
 
 name: CI for Login with google plugin test
 
 # Controls when the workflow will run
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
-#   push:
-#     branches: 
-#       - develop
-#       - master
-#   pull_request:
-#     branches: 
-#       - develop
-#       - master
+  # push:
+  #   branches:
+  #     - develop
+  #     - master
+  # pull_request:
+  #   branches:
+  #     - develop
+  #     - master
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -22,7 +22,7 @@ jobs:
     # The type of runner that the job will run on
     name: Run Login with google plugin test Cases
     runs-on: ubuntu-latest
-    env: 
+    env:
       GMAIL_UNAME: ${{ secrets.GMAIL_UNAME }}
       GMAIL_PASS: ${{ secrets.GMAIL_PASS }}
       TESRESULT_TOKEN: ${{ secrets.TESRESULT_TOKEN }}

.github/workflows/phpcs_on_pull_request.yml

@@ -1,4 +1,5 @@
-on: pull_request
+on: 
+  workflow_dispatch:
 name: Inspections
 jobs:
   runPHPCSInspection:

login-with-google.php

@@ -112,6 +112,14 @@ function container(): Container {
 function plugin(): Plugin {
 	static $plugin;
 
+	$reauth = filter_input( INPUT_GET, 'reauth', FILTER_SANITIZE_STRING );
+	if ( null !== $reauth ) {
+		if ( ! empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
+			wp_safe_redirect( wp_login_url() );
+			exit;
+		}
+	}
+
 	if ( null !== $plugin ) {
 		return $plugin;
 	}