GH-139 : Remember functionality for login with google

assets/build/js/login.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '57f26158d9cbe8f4');
+<?php return array('dependencies' => array(), 'version' => '4d9d3a64de60ef78');

assets/src/js/login.js

@@ -13,6 +13,8 @@ const wpGoogleLogin = {
 	 */
 	init() {
 		document.addEventListener( 'DOMContentLoaded', this.onContentLoaded );
+		const rememberMeCheckbox = document.getElementById( 'remember-google-login' );
+		rememberMeCheckbox.addEventListener( 'change', this.rememberMe );
 	},
 
 	/**
@@ -43,8 +45,46 @@ const wpGoogleLogin = {
 		this.googleLoginButton.classList.remove( 'hidden' );
 		// HTML is cloned from existing HTML node.
 		this.form.append( this.googleLoginButton );
+	},
+
+	/**
+	 * Callback function to detect change in state of remember me checkbox.
+	 * 
+	 * Update request parameters based on user selection
+	 *
+	 * @return void
+	 */
+	rememberMe() {
+
+		const loginWithGoogle = document.getElementsByClassName( 'wp_google_login__button' )[0];
+
+		if( this.checked === true ) {
+			window.remember = true;
+			var params = loginWithGoogle.getAttribute( 'href' );
+			var state  = params.substring( params.indexOf( '&state=' ) + 7, params.indexOf( '&scope' ) );
+
+			/* Decodes state value */
+			var decodeState = JSON.parse( atob( state ) );
+
+			/* Add remember parameter to state */
+			decodeState['remember'] = true;
+			var newState = btoa( JSON.stringify( decodeState ) );
+			window.orignalParams = params;
+			params = params.replace( state, newState );
+
+			/* Replace hyperlink to new state variable */
+			loginWithGoogle.setAttribute( 'href', params );
+
+		}
+
+		if( this.checked === false && window.remember === true ) {
+			/* Resets href attribute to orignal state if checked and unchecked again */
+			loginWithGoogle.setAttribute( 'href', window.orignalParams );
+		}
 	}
 
+
+
 };
 
 wpGoogleLogin.init();

assets/src/scss/login.scss

@@ -80,6 +80,10 @@ $white_color: #FFFFFF;
 		vertical-align: middle;
 		margin-right: 10px;
 	}
+
+	&__remember-container {
+		margin-top: 15px;
+	}
 }
 
 .wp-block-google-login-login-button {

src/Modules/Block.php

@@ -155,7 +155,7 @@ public function render_login_button( $attributes ): string {
 		 * @since 1.2.3
 		 */
 		$force_display = $attributes['forceDisplay'] ?? false;
-		if (  $force_display || ! is_user_logged_in() || apply_filters( 'rtcamp.google_login_button_display', false ) ) {
+		if ( $force_display || ! is_user_logged_in() || apply_filters( 'rtcamp.google_login_button_display', false ) ) {
 			$markup = $this->markup(
 				[
 					'login_url'           => $this->client->authorization_url(),

src/Modules/Login.php

@@ -136,6 +136,10 @@ public function authenticate( $user = null ) {
 			return $user;
 		}
 
+		if ( ! empty( $decoded_state['remember'] ) && true === $decoded_state['remember'] ) {
+			add_action( 'wp_login', [ $this, 'remember_me' ], 9, 2 );
+		}
+
 		try {
 			$this->gh_client->set_access_token( $code );
 			$user = $this->gh_client->user();
@@ -230,4 +234,14 @@ public function login_redirect(): void {
 			exit;
 		}
 	}
+
+	/**
+	 * Sets cookie to remember user
+	 *
+	 * @param String  $user_login user login.
+	 * @param WP_User $user WP User Object.
+	 */
+	public function remember_me( string $user_login, WP_User $user ) {
+		$this->authenticator->set_auth_cookies( $user, true );
+	}
 }

src/Utils/Authenticator.php

@@ -134,13 +134,14 @@ public function register( stdClass $user ): ?WP_User {
 	 * Set auth cookies for WordPress login.
 	 *
 	 * @param WP_User $user WP User object.
+	 * @param bool    $remember to remember user or not.
 	 *
 	 * @return void
 	 */
-	public function set_auth_cookies( WP_User $user ) {
+	public function set_auth_cookies( WP_User $user, bool $remember = false ) {
 		wp_clear_auth_cookie();
 		wp_set_current_user( $user->ID, $user->user_login );
-		wp_set_auth_cookie( $user->ID );
+		wp_set_auth_cookie( $user->ID, $remember );
 	}
 
 	/**

templates/google-login-button.php

@@ -34,4 +34,8 @@
 			<?php echo esc_html( $button_text ); ?>
 		</a>
 	</div>
+	<div class="wp_google_login__remember-container">
+		<input type="checkbox" id="remember-google-login"/>
+		<label for="remember-google-login"><?php esc_html_e( 'Remember Me ( Login with Google )', 'login-with-google' ); ?></label>
+	</div>
 </div>

tests/php/Unit/Utils/AuthenticatorTest.php

@@ -392,7 +392,8 @@ public function testSetAuthCookies() {
 		$this->wpMockFunction(
 			'wp_set_auth_cookie',
 			[
-				100
+				100,
+				false,
 			],
 			1
 		);