From 6d2d7972454ec69987f3ff28128e8e52a13963de Mon Sep 17 00:00:00 2001 From: Duncan Barnes Date: Thu, 6 May 2021 22:47:31 +0100 Subject: [PATCH 1/3] Fixed #20 Corrects calls missing quotes --- pages/redirect.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/redirect.php b/pages/redirect.php index 73a3a194..c15eac11 100755 --- a/pages/redirect.php +++ b/pages/redirect.php @@ -8,9 +8,9 @@ $client = new Google_Client(); $client->setApplicationName("MantisBT Google authentication module"); -$client->setClientId(config_get(plugin_GoogleOauth_clientId)); -$client->setClientSecret(config_get(plugin_GoogleOauth_clientSecret)); -$client->setRedirectUri(config_get(plugin_GoogleOauth_redirect_uri)); +$client->setClientId(config_get( 'plugin_GoogleOauth_clientId' )); +$client->setClientSecret(config_get( 'plugin_GoogleOauth_clientSecret' )); +$client->setRedirectUri(config_get( 'plugin_GoogleOauth_redirect_uri')); $objOAuthService = new Google_Service_Oauth2($client); From 1023ecac63e8c71f4ed736d4a878602e156354af Mon Sep 17 00:00:00 2001 From: Duncan Barnes Date: Thu, 6 May 2021 23:03:16 +0100 Subject: [PATCH 2/3] Fixed #21 and fixes #19 Uses correct method of accessing plugin file and removes click event cancellation js which isn't required. Unclear from issue but believe this also fixes #16 --- GoogleOauth.php | 2 +- {pages/assets/js => files}/plugin.js | 6 +----- pages/config_update.php | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) rename {pages/assets/js => files}/plugin.js (88%) diff --git a/GoogleOauth.php b/GoogleOauth.php index 86affe59..63f4e25b 100755 --- a/GoogleOauth.php +++ b/GoogleOauth.php @@ -49,7 +49,7 @@ function resources() { return ' - + '; } } diff --git a/pages/assets/js/plugin.js b/files/plugin.js similarity index 88% rename from pages/assets/js/plugin.js rename to files/plugin.js index ae12ba31..119f17db 100755 --- a/pages/assets/js/plugin.js +++ b/files/plugin.js @@ -1,5 +1,5 @@ -$(document).ready(function() { +$(document).ready(function () { //allow admin to set password directly //include input for new password var frm = $('#login-form'); @@ -12,8 +12,4 @@ $(document).ready(function() { var urlParams = new URLSearchParams(window.location.search); var state = urlParams.get('return') || ''; $('Sign in with google').appendTo(frm); - - frm.children('#sign_with_google').on('click', function(){ - return false; - }); }); diff --git a/pages/config_update.php b/pages/config_update.php index 8544ba74..7bda764d 100755 --- a/pages/config_update.php +++ b/pages/config_update.php @@ -6,7 +6,10 @@ plugin_config_set('clientId', strip_tags(gpc_get_string('prefClientID'))); plugin_config_set('clientSecret', strip_tags(gpc_get_string('prefClientSecret'))); -plugin_config_set('redirect_uri', config_get('path')."plugins/GoogleOauth/pages/redirect.php"); + +$redirecturi = config_get('path'); +if(substr($redirecturi, -1) == '/') $redirecturi = rtrim($redirecturi,'/'); +plugin_config_set('redirect_uri', $redirecturi.plugin_page( 'redirect')); form_security_purge( 'plugin_GoogleOauth_config_update' ); print_successful_redirect( plugin_page( 'config', true ) ); From dbc20d05cdab79f5988cddf049172d5b37b16f72 Mon Sep 17 00:00:00 2001 From: Duncan Barnes Date: Fri, 7 May 2021 00:13:18 +0100 Subject: [PATCH 3/3] Sign in button now conforms with Googles OAuth requirements Provided perhaps better separation and spacing from normal login button, fits with Googles style guidelines here: https://developers.google.com/identity/branding-guidelines --- GoogleOauth.php | 25 +++++++++++++++++++++++++ files/google_signin_normal.png | Bin 0 -> 8001 bytes files/google_signin_pressed.png | Bin 0 -> 8483 bytes files/plugin.js | 9 +++++---- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 files/google_signin_normal.png create mode 100644 files/google_signin_pressed.png diff --git a/GoogleOauth.php b/GoogleOauth.php index 63f4e25b..0e38babc 100755 --- a/GoogleOauth.php +++ b/GoogleOauth.php @@ -49,6 +49,31 @@ function resources() { return ' + '; } diff --git a/files/google_signin_normal.png b/files/google_signin_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..f27bb2433042aea5fc34e19fcf90944430ec331b GIT binary patch literal 8001 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 literal 0 HcmV?d00001 diff --git a/files/google_signin_pressed.png b/files/google_signin_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..4cb85e9b554a751b1cf7a7370bcbf85180c0fde7 GIT binary patch literal 8483 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 literal 0 HcmV?d00001 diff --git a/files/plugin.js b/files/plugin.js index 119f17db..d12d6718 100755 --- a/files/plugin.js +++ b/files/plugin.js @@ -1,8 +1,6 @@ - $(document).ready(function () { //allow admin to set password directly //include input for new password - var frm = $('#login-form'); var redirectUri = $("meta[name='redirectUri']").attr('content'); var clientId = $("meta[name='clientId']").attr('content'); // (disabled) Send all the params @@ -11,5 +9,8 @@ $(document).ready(function () { // Send just the return param value var urlParams = new URLSearchParams(window.location.search); var state = urlParams.get('return') || ''; - $('Sign in with google').appendTo(frm); -}); + var html = ''; + $(html).insertAfter('#login-form'); +}); \ No newline at end of file