Centralised Settings For Multisite by mchirag2002 · Pull Request #277 · rtCamp/login-with-google

mchirag2002 · 2025-10-03T13:02:01Z

Description

This PR refactors the settings page of the plugin for the multisite installations only.
It makes the following changes:
- Creates a new settings page for Network Admins
- Moved the Client ID and Client Secret to the network level and removed them from subsites
- Added option for applying settings globally, which, if enabled, makes the site-level settings Read-Only.
- If not, then these settings like Onetap, Onetap locations, Create New Users, and Whitelisted domains need to be configured from the individual sites.

ToDo before making this release

Before releasing this feature, we need to make a minor release which adds an admin notice that informs the users about this upcoming refactoring, so that the small subset of people who use different credentials on their sites, don't upgrade or find a workaround.
Once the release version is finalised, update the @since version comments in the codebase with the release version.

Demo video for the changes implemented

https://drive.google.com/file/d/1UVpIxZGK58cSi3I7myc67eyPuBmZVzcO/view?usp=sharing

Fixes

Make the plugin multisite compatible (#119)

mi5t4n · 2025-11-03T07:56:57Z

Will take over reviewing this PR.

cc @mchirag2002 @joelabreo227

mi5t4n · 2025-11-06T07:57:04Z

@mchirag2002 Could you add screenshot or a video recording on what has changes where the new settings are ?

Copilot

Pull Request Overview

This PR adds multisite network support for the Google Login plugin, allowing network administrators to configure OAuth credentials and settings globally across all sites in a WordPress multisite installation.

Key Changes:

Adds network-level settings management for multisite installations
Implements get_client_id() and get_client_secret() methods to retrieve credentials from network settings in multisite environments
Adds an "Apply Globally" option to enforce network settings across all subsites

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 9 comments.

File	Description
src/Modules/Settings.php	Core changes implementing network settings registration, rendering, and saving functionality with UI toggle logic
src/Container.php	Updates GoogleClient instantiation to use the new getter methods instead of direct property access
readme.txt	Documents multisite configuration in the setup instructions
README.md	Adds multisite setup documentation explaining the network administrator workflow

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

src/Modules/Settings.php

Copilot · 2025-11-06T12:57:57Z

src/Modules/Settings.php

+			'client_secret'        => '',
+		];
+
+		$settings = $_POST['wp_google_login_network_settings'] ?? []; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized


While the phpcs:ignore comment indicates intentional access to unsanitized input, the array keys should be validated using wp_unslash() before processing. Consider wrapping $_POST['wp_google_login_network_settings'] with wp_unslash() to handle escaped input properly: $settings = isset( $_POST['wp_google_login_network_settings'] ) ? wp_unslash( $_POST['wp_google_login_network_settings'] ) : [];

Suggested change

$settings = $_POST['wp_google_login_network_settings'] ?? []; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized

$settings = isset( $_POST['wp_google_login_network_settings'] ) ? wp_unslash( $_POST['wp_google_login_network_settings'] ) : []; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized

mchirag2002 · 2025-11-07T07:45:02Z

@mchirag2002 Could you add screenshot or a video recording on what has changes where the new settings are ?

@mi5t4n Updated the PR description to add the requested video.

mi5t4n

All looks good, but WP member setting must be set in the Settings -> General, otherwise just checking Create New User on Network side settings will not work.

mi5t4n · 2025-11-07T11:38:11Z

src/Modules/Settings.php

-	 * Register the settings, section and fields.
+	 * Retrieves the Google OAuth Client ID, always from the network settings in multisite.
+	 *
+	 * @return string


Do add @since n.e.x.t and replace n.e.x.t with plugin version during release.

mi5t4n · 2025-11-17T08:22:01Z

@mchirag2002 Left some comments.

mi5t4n · 2025-11-17T10:15:49Z

@mchirag2002 I was able to reproduce the issue again. It looks like we need to clear all the old settings in the multisite setup and create a completely fresh configuration.

Note

Remove all the settings from all the site options by searching through google name option.

Kazam_screencast_00000.mp4

mi5t4n

We have same two text in the network settings and the membership link is not working in the network settings and in the invidividual site settings. https://prnt.sc/ao-MKoXXn_2B

mi5t4n · 2025-11-20T07:27:05Z

src/Modules/Settings.php

+	public function apply_globally_field( $args = [] ): void {
+		$network_options = get_site_option( 'wp_google_login_network_settings', [] );
+		?>
+		<input type="checkbox" name="wp_google_login_network_settings[apply_globally]" id="apply-globally" value="1" <?php checked( ! empty( $network_options['apply_globally'] ) ); ?> />


Suggested change

<input type="checkbox" name="wp_google_login_network_settings[apply_globally]" id="apply-globally" value="1" <?php checked( ! empty( $network_options['apply_globally'] ) ); ?> />

<input

type="checkbox"

name="wp_google_login_network_settings[apply_globally]"

id="apply-globally"

value="1"

<?php checked( ! empty( $network_options['apply_globally'] ) ); ?>

/>

mi5t4n · 2025-11-20T07:27:37Z

src/Modules/Settings.php

+			<label style='display:block;margin-top:6px;'><input
+					type='checkbox'
+					name='wp_google_login_network_settings[one_tap_login]'
+					id="one-tap-login" <?php checked( $checked ); ?>
+					value='1'>
+				<?php esc_html_e( 'One Tap Login', 'login-with-google' ); ?>
+			</label>


Suggested change

<label style='display:block;margin-top:6px;'><input

type='checkbox'

name='wp_google_login_network_settings[one_tap_login]'

id="one-tap-login" <?php checked( $checked ); ?>

value='1'>

<?php esc_html_e( 'One Tap Login', 'login-with-google' ); ?>

</label>

<label style='display:block;margin-top:6px;'>

<input

type='checkbox'

name='wp_google_login_network_settings[one_tap_login]'

id="one-tap-login" <?php checked( $checked ); ?>

value='1'

/>

<?php esc_html_e( 'One Tap Login', 'login-with-google' ); ?>

</label>

mi5t4n · 2025-11-20T07:28:58Z

src/Modules/Settings.php

+					if ( $readonly ) {
+						echo 'disabled';
+					}


Suggested change

if ( $readonly ) {

echo 'disabled';

}

echo ( $readonly ? 'disabled' : '' )

mi5t4n · 2025-11-20T07:29:36Z

src/Modules/Settings.php

 	 * @return void
 	 */
-	public function user_registration(): void {
+	public function user_registration( $args = [] ): void {


We need to add the version where $args parameter was introduced.

mi5t4n · 2025-11-20T07:29:50Z

src/Modules/Settings.php

+				<input type='checkbox'
+					name='wp_google_login_network_settings[registration_enabled]'
+					id="user-registration" <?php checked( $checked ); ?>
+					value='1'>


Suggested change

<input type='checkbox'

name='wp_google_login_network_settings[registration_enabled]'

id="user-registration" <?php checked( $checked ); ?>

value='1'>

<input

type='checkbox'

name='wp_google_login_network_settings[registration_enabled]'

id="user-registration" <?php checked( $checked ); ?>

value='1'

>

mi5t4n · 2025-11-20T07:30:14Z

src/Modules/Settings.php

+	 *
+	 * @return void
+	 */
+	public function save_network_settings(): void {


Add @since n.e.x.t for newly added functions.

mi5t4n · 2025-11-20T07:31:50Z

src/Modules/Settings.php

+			<h1><?php esc_html_e( 'Login with Google Network Settings', 'login-with-google' ); ?></h1>
+			<form method="post" action="edit.php?action=wp_google_login_network_settings">
+				<?php
+				wp_nonce_field( 'wp_google_login_network-options' );


Let's not use wp_google_login prefix as it indicates it's WP core specific. We have to use our own specific rtcamp_login_with_google_network-options. Apply similar thing to newly added nonce, settings, ids or input names.

@mi5t4n this convention of using wp_google_login is present across the codebase since the beginning, and although I completely agree with you to alter the prefix, I think for code consistency we can create a new task for code refactoring and tackle it over there.
Otherwise once this PR is merged, we will be having some filters/nonces with different prefix and others with different prefix.

@mchirag2002 Noted, let's do in another PR.

mi5t4n · 2025-11-20T07:35:00Z

src/Modules/Settings.php

+		add_submenu_page(
+			'settings.php',
+			__( 'Login with Google Network Settings', 'login-with-google' ),
+			__( 'Login with Google', 'login-with-google' ),


Suggested change

__( 'Login with Google', 'login-with-google' ),

_x( 'Login with Google', 'Page title', 'login-with-google' ),

mi5t4n

LGTM

mchirag2002 added 4 commits September 30, 2025 14:01

Refactored the code to have centralised network settings

bbb5d42

Bug fixes for subsite client id fetching

a20ae54

Updated Documentation

185f874

Updated the Apply Globally settings to hide remaining

d28bac8

mchirag2002 requested a review from Pathan-Amaankhan October 3, 2025 13:02

mchirag2002 added the enhancement New feature or request label Oct 3, 2025

mi5t4n self-requested a review November 3, 2025 07:27

Fixed regression bug

81c2c47

Copilot AI review requested due to automatic review settings November 6, 2025 12:55

Copilot AI reviewed Nov 6, 2025

View reviewed changes

mchirag2002 added 2 commits November 7, 2025 13:08

Bug fix for JS

e6a1a0b

Implemented Copilot feedback

6b0a49e

mi5t4n previously approved these changes Nov 7, 2025

View reviewed changes

mi5t4n self-requested a review November 7, 2025 11:53

This comment was marked as duplicate.

Sign in to view

Bug Fix for new account creation

dca90a8

mchirag2002 dismissed mi5t4n’s stale review via dca90a8 November 19, 2025 11:48

mchirag2002 added 2 commits November 19, 2025 17:21

Implemented feedback changes

735248b

Documentation Update

1c49cb8

mchirag2002 requested a review from mi5t4n November 19, 2025 11:55

mi5t4n requested changes Nov 20, 2025

View reviewed changes

Implemeted PR feedback changes

8b1530c

mchirag2002 requested a review from mi5t4n November 25, 2025 10:13

mi5t4n approved these changes Nov 25, 2025

View reviewed changes

	$settings = $_POST['wp_google_login_network_settings'] ?? []; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
	$settings = isset( $_POST['wp_google_login_network_settings'] ) ? wp_unslash( $_POST['wp_google_login_network_settings'] ) : []; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized

	__( 'Login with Google', 'login-with-google' ),
	_x( 'Login with Google', 'Page title', 'login-with-google' ),

Conversation

mchirag2002 commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

ToDo before making this release

Demo video for the changes implemented

Fixes

Uh oh!

mi5t4n commented Nov 3, 2025

Uh oh!

mi5t4n commented Nov 6, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Nov 6, 2025

Choose a reason for hiding this comment

Uh oh!

mchirag2002 commented Nov 7, 2025

Uh oh!

mi5t4n left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as duplicate.

Uh oh!

mi5t4n commented Nov 17, 2025

Uh oh!

mi5t4n commented Nov 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mi5t4n left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mi5t4n left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mchirag2002 commented Oct 3, 2025 •

edited

Loading

mi5t4n left a comment •

edited

Loading

mi5t4n commented Nov 17, 2025 •

edited

Loading