Authentication error page, textdomain issues

.distignore

@@ -44,3 +44,4 @@ node_modules
 *.zip
 src/js
 assets
+src/php/Premium

languages/site-import-for-gbp.pot

@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-02-10T14:40:08+00:00\n"
+"POT-Creation-Date: 2024-02-12T14:46:16+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: site-import-for-gbp\n"
@@ -50,7 +50,7 @@ msgstr ""
 
 #. translators: %1$s is the Google internal image ID, %2$s is the error message
 #: src/php/BackgroundProcessing/BackgroundProcess.php:71
-#: src/php/BackgroundProcessing/BackgroundProcess.php:332
+#: src/php/BackgroundProcessing/BackgroundProcess.php:338
 msgid "Failed to import image %1$s: %2$s"
 msgstr ""
 
@@ -67,40 +67,45 @@ msgstr ""
 msgid "Did not find any posts to import"
 msgstr ""
 
+#. translators: %1$s is Google Location identifier, %2$s is the error message
+#: src/php/BackgroundProcessing/BackgroundProcess.php:214
+msgid "Failed to import post into %1$s WordPress: %2$s"
+msgstr ""
+
 #. translators: %1$d is WordPress post ID, %2$s is the error message
-#: src/php/BackgroundProcessing/BackgroundProcess.php:231
+#: src/php/BackgroundProcessing/BackgroundProcess.php:237
 msgid "Updated already imported post %1$d: %2$s"
 msgstr ""
 
 #. translators: %1$d is WordPress post ID, %2$s is the title of the imported post
-#: src/php/BackgroundProcessing/BackgroundProcess.php:234
+#: src/php/BackgroundProcessing/BackgroundProcess.php:240
 msgid "Imported post %1$d: %2$s"
 msgstr ""
 
-#: src/php/BackgroundProcessing/BackgroundProcess.php:242
+#: src/php/BackgroundProcessing/BackgroundProcess.php:248
 msgid "-- 50 post limit reached --"
 msgstr ""
 
 #. translators: %1$s is the Google internal location ID, %2$s is the error message
-#: src/php/BackgroundProcessing/BackgroundProcess.php:259
+#: src/php/BackgroundProcessing/BackgroundProcess.php:265
 msgid "Failed to load Gallery images from %1$s: %2$s"
 msgstr ""
 
-#: src/php/BackgroundProcessing/BackgroundProcess.php:284
+#: src/php/BackgroundProcessing/BackgroundProcess.php:290
 msgid "Did not find any gallery images to import"
 msgstr ""
 
-#: src/php/BackgroundProcessing/BackgroundProcess.php:301
+#: src/php/BackgroundProcessing/BackgroundProcess.php:307
 msgid "-- 100 image limit reached --"
 msgstr ""
 
 #. translators: %s is the Google internal image ID
-#: src/php/BackgroundProcessing/BackgroundProcess.php:323
+#: src/php/BackgroundProcessing/BackgroundProcess.php:329
 msgid "Skipping image %s, already imported before"
 msgstr ""
 
 #. translators: %s is Google Image ID
-#: src/php/BackgroundProcessing/BackgroundProcess.php:339
+#: src/php/BackgroundProcessing/BackgroundProcess.php:345
 msgid "Imported gallery image %s into Media library"
 msgstr ""
 
@@ -186,6 +191,11 @@ msgstr ""
 msgid "Connect to Google Business Profile"
 msgstr ""
 
+#. translators: %s is name of the location
+#: build/index.js:1
+msgid "Let's import your %s GBP listing website! Select the items you want to import below"
+msgstr ""
+
 #: build/index.js:1
 msgid "Import posts"
 msgstr ""
@@ -222,6 +232,14 @@ msgstr ""
 msgid "Import is currently in progress, and running in the background. You may stay here and wait for it to complete or leave this page. Up to you!"
 msgstr ""
 
+#: build/index.js:1
+msgid "Could not cancel import"
+msgstr ""
+
+#: build/index.js:1
+msgid "Cancelling..."
+msgstr ""
+
 #: build/index.js:1
 msgid "Cancel import"
 msgstr ""

readme.txt

@@ -5,7 +5,7 @@ Tags: google my business, google business profile, gbp, gmb, import
 Requires at least: 5.0
 Tested up to: 6.4.3
 Requires PHP: 7.2
-Stable tag: 0.1.0
+Stable tag: 0.1.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -58,6 +58,12 @@ The plugin is capped at importing your most recent 100 gallery images and 50 pos
 
 == Changelog ==
 
+= 0.1.1 =
+
+* Fix: conflict with Post to Google My Business authorization when both plugins are activated
+* Fix: Some small textdomain and string issues
+* Added: Error page for failed authentication
+
 = 0.1.0 =
 
 * Initial release

site-import-for-gbp.php

@@ -7,7 +7,8 @@
  * Author URI:      https://koenreus.com
  * Text Domain:     site-import-for-gbp
  * Domain Path:     /languages
- * Version:         0.1.0
+ * Version:         0.1.1
+ * Network:         true
  *
  * @package         Site_Import_For_Gbp
  */

src/js/Components/GoogleLocationSelector.js

@@ -69,7 +69,7 @@ export default function GoogleLocationSelector({ isGoogleConfigured, startWizard
 						onChange={ ( newGroup ) => getGroup( newGroup ) }
 						__nextHasNoMarginBottom
 					/>
-					<Button isSmall={true} variant="secondary" onClick={()=> getGroup(group, pageToken, true) } icon={() => <Icon icon='update' />}>{__("Refresh locations", "product-sync-for-gbp")}</Button>
+					<Button isSmall={true} variant="secondary" onClick={()=> getGroup(group, pageToken, true) } icon={() => <Icon icon='update' />}>{__("Refresh locations", "site-import-for-gbp")}</Button>
 				</div>
 				<LocationList hasResolved={hasResolved} locations={locations} startWizard={startWizard} />
 				<Pagination hasResolved={hasResolved} locations={locations} getGroup={getGroup} currentGroup={group} />
@@ -98,8 +98,8 @@ function Pagination({hasResolved, locations, getGroup, currentGroup}){
 	}
 	return (
 		<div className="sifg-selector-controls-bottom">
-			{prevPages.length > 1 && <Button variant="secondary" isSmall={true} onClick={() => switchPage(true) }>{__('Previous page', 'product-sync-for-gbp')}</Button>}
-			{locations.nextPageToken && <Button variant="secondary" isSmall={true} onClick={ () => switchPage(false) }>{__('Next page', 'product-sync-for-gbp')}</Button>}
+			{prevPages.length > 1 && <Button variant="secondary" isSmall={true} onClick={() => switchPage(true) }>{__('Previous page', 'site-import-for-gbp')}</Button>}
+			{locations.nextPageToken && <Button variant="secondary" isSmall={true} onClick={ () => switchPage(false) }>{__('Next page', 'site-import-for-gbp')}</Button>}
 		</div>
 	);
 }

src/js/Components/Wizard.js

@@ -172,7 +172,7 @@ export default function Wizard(){
 	}else if(wizardStep === 'start'){
 		return (
 			<Fragment>
-				<p>{sprintf(__('Let\'s import your %s GBP listing website! Select the items you want to import below', 'product-sync-for-gbp'), wizardLocation.title)}</p>
+				<p>{/* translators: %s is name of the location */ sprintf(__("Let's import your %s GBP listing website! Select the items you want to import below", 'site-import-for-gbp'), wizardLocation.title)}</p>
 				<ToggleControl
 					label={__('Import posts', 'site-import-for-gbp')}
 					help={__('Will import your Google Business Profile posts with associated images', 'site-import-for-gbp')}

src/php/API/ProxyAuthenticationAPI.php

@@ -69,10 +69,12 @@ protected function do_request($url, $args, $method = 'POST'){
 	/**
 	 * @throws Exception
 	 */
-	public function get_authentication_url($return_url, $nonce){
+	public function get_authentication_url($return_url, $nonce, $success_hook, $failure_hook){
 		return $this->do_request( self::AUTH_API_URL . 'getlink', [
 			'request_key'   => $nonce,
 			'post_url'      => $return_url,
+			'success_hook'    => $success_hook,
+			'failure_hook'       => $failure_hook,
 		]);
 	}
 

src/php/Plugin.php

@@ -7,7 +7,7 @@
 class Plugin {
 	const DOMAIN = 'site-import-for-gbp';
 
-	const VERSION = '0.1.0';
+	const VERSION = '0.1.1';
 
 	const DASHICON = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgoKPHN2ZwogICB3aWR0aD0iMjAiCiAgIGhlaWdodD0iMjAiCiAgIHZpZXdCb3g9IjAgMCAxMDUuMDE2ODUgOTIuNDgyMjE2IgogICB2ZXJzaW9uPSIxLjEiCiAgIGlkPSJzdmczMzUiCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPGRlZnMKICAgICBpZD0iZGVmczMzMiI+CiAgICA8Y2xpcFBhdGgKICAgICAgIGNsaXBQYXRoVW5pdHM9InVzZXJTcGFjZU9uVXNlIgogICAgICAgaWQ9ImNsaXBQYXRoMTAyMzciPgogICAgICA8cmVjdAogICAgICAgICBzdHlsZT0iZmlsbDojMDAwMDAwO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDoxLjU4MzM7c3Ryb2tlLWxpbmVqb2luOnJvdW5kO3N0cm9rZS1taXRlcmxpbWl0OjYuMztzdHJva2UtZGFzaGFycmF5OjEuNTgzMywgMS41ODMzIgogICAgICAgICBpZD0icmVjdDEwMjM5IgogICAgICAgICB3aWR0aD0iMjYyLjQxMDQiCiAgICAgICAgIGhlaWdodD0iMjYyLjQxMDQiCiAgICAgICAgIHg9Ii0yNy42NDI2OTMiCiAgICAgICAgIHk9Ii0yNy40ODU0NzQiIC8+CiAgICA8L2NsaXBQYXRoPgogIDwvZGVmcz4KICA8ZwogICAgIGlkPSJsYXllcjEiCiAgICAgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTU4LjczOTA0OSwtMTA2LjIwOTAyKSI+CiAgICA8ZwogICAgICAgaWQ9ImcxMjQ0OSIKICAgICAgIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE4Ljk0OTk4LDE0LjU3NDM0OSkiCiAgICAgICBzdHlsZT0iZmlsbDojMDAwMDAwIj4KICAgICAgPGcKICAgICAgICAgaWQ9IkxheWVyJTIwMSIKICAgICAgICAgdHJhbnNmb3JtPSJtYXRyaXgoMC41MTEzNDE1NiwwLDAsMC41MTEzNDE1NiwzOS4zNDE3ODQsODQuODM5ODI4KSIKICAgICAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMCIKICAgICAgICAgY2xpcC1wYXRoPSJ1cmwoI2NsaXBQYXRoMTAyMzcpIj4KCQk8cGF0aAogICBpZD0icGF0aDY0ODQiCiAgIHN0eWxlPSJmaWxsOiMwMDAwMDAiCiAgIGQ9Im0gMjMuODc1MDksMTMuMjg4MjY5IGMgLTEuNzQ5OTk3LDAgLTQuNzQ5NTg1LDEuMjUwNzQzIC02LjI0OTU4MiwzLjUwMDczNSAtMC43NDk5OTcsMC43NDk5OTkgLTEuMjUwNzQ4LDEuNzQ5ODU5IC0xLjUwMDc0OCwyLjc0OTg1NiAtMi40OTk5OTIsOC43NDk5NzQgLTQuNzUwNDY3LDE4LjAwMDM2IC03LjAwMDQ2MDcsMjcuMDAwMzMzIC0wLjc0OTk5NzYsMi4yNDk5OTQgLTEuNDk5OTg4Nyw1LjI1MDMzNiAtMS45OTk5ODcyLDcuNzUwMzMgLTAuOTk5OTk3LDMuOTk5OTg4IC0xLjk5OTA5ODYsOC40OTkxNzQgLTMuMjQ5MDk1LDEyLjQ5OTE2MiAtMC45OTk5OTcsMy45OTk5ODggLTMuMDAwNDg2MTQsMTEuMDAwMzA3IC0zLjAwMDQ4NjE0LDExLjc1MDMwNCAwLDcuOTMwMTc2IDQuNDI3NTMzNTQsMTQuNjU0NjUzIDEwLjY2NDkxNDA0LDE4LjUxMDI0MSAzLjU5Mzc5MSwyLjIyMDg5NCA3Ljc5MDEyOSwzLjQ4OTYyIDEyLjA4NDgxNCwzLjQ4OTYyIDkuOTk5OTcsMCAyMC43NTA3NDYsLTYuNDk5Nzg1IDIyLjc1MDc0LC0yMC43NDk3NDIgdiAtMS40NDYxNzYgLTEuMjg3NTExIC0yLjAxNjE1NyBsIDcuOTk5OTQ5LC02MS43NTA5OTUgeiBtIDM4Ljk5OTI0NSwwLjA1NTU4IC04LjI0ODU1Nyw2Mi45OTkwOTMgdiAwLjcxMjQ3NiAzLjI4NzQ5OCBjIDAsMC40OTk5OTggMC43NDg3MjgsNC41MDEyMjggMS40OTg3MjcsNi41MDEyMjIgNC43NDk5ODUsMTAuMjQ5OTcgMTMuMjUwMzkzLDEzLjc0ODI3MiAyMS4wMDAzNzEsMTMuNzQ4MjcyIDkuNDk5OTcxLDAgMTkuNzQ5NDg2LC02LjI0ODY1NiAyMi4yNDk0NzksLTE5LjQ5ODYxNCBWIDc3LjA1NTQyMSAxMy4zNDM4NTIgWiBtIDQ1LjEyNjU0NSwwIHYgNjMuNzExNTY5IDIuMjg2OTk5IGMgMCwwLjQ5OTk5OCAwLjI0ODg2LDMuNTAwNDc5IDAuNzQ4ODYsNS4wMDA0NzQgMy40OTk5OSwxMS43NDk5NjYgMTMuMjQ5MjYsMTYuMjQ5NTE5IDIxLjc0OTIzLDE2LjI0OTUxOSAxMC43NDk5NywwIDIxLjc1MTEyLC03Ljk5ODg5MyAyMi41MDExMiwtMjEuOTk4ODUxIEwgMTUyLjgwMSw3Ny4wNTU0MjEgMTQ0LjQ5OTg5LDEzLjM0Mzg1MiBaIG0gNDUuMjQ4ODMsMC4wMzAzMiB2IDEuNTAwNzQ4IGMgMCwwLjQ5OTk5OCAzLjQ5OTQ2LDI1Ljc1MDA0NiA0Ljk5OTQ2LDM4LjUwMDAwNyAwLjk5OTk4LDcuMjQ5OTc5IDIuMjUxNSwxNC45OTk3NTMgMy4wMDE1LDIyLjc0OTcyOSAwLjA0NjksMC4zMDUgMC4wODg0LDAuNjE3NTY3IDAuMTI0MywwLjkzMDc2NyAwLjM0NTIsMy4wMjMzOTEgMC4yNjYxNyw2LjM5OTczOCAxLjYyNTA1LDkuNTcwNDI5IDQuNSwxMC4yNDk5NyAxMy4wMDA3OCwxMy45OTg5MDEgMjAuNzUwNzUsMTMuOTk4OTAxIDQuMzQzMzgsMCA4LjY4Nzk4LC0xLjMwNDg1NSAxMi4zODM5NiwtMy42NTQzNDggNS44NzcwOSwtMy43MzYwODkgMTAuMTE1MTQsLTEwLjExNDkxNyAxMC4xMTUxNCwtMTguMDk1ODkzIDAsLTMuNzQ5OTg4IC0xMi40OTkyOCwtNDguMjQ5NTQzIC0xMy43NDkyOCwtNTQuNzQ5NTI0IC0wLjc1LC0zLjk5OTk4OCAtMy4yNTA0NywtMTAuNzUwODE2IC05LjAwMDQ1LC0xMC43NTA4MTYgeiBNIDEwMy41MjA4Nyw5My4wOTQ3MzMgQyA5Ny42NjE5ODEsMTAzLjcwMTcgODcuMjY3OTI2LDEwOC44NDI5OSA3Ni44NzUyNTcsMTA4Ljg0Mjk5IGMgLTExLjI3NjU2NywwIC0yMS4xOTI3ODEsLTYuMzQ2MzggLTI2LjQ2OTc2NiwtMTUuNTI3OTQ1IC02LjAwNTU4MiwxMC43OTU4NjUgLTE3LjAwMDM1OSwxNS40NzQzODUgLTI2Ljc4MTAzMiwxNS40NzQzODUgLTQuMDczOTg3LDAgLTguMTgzOTI2LC0wLjY4NDIzIC0xMi4wODQ4MTQsLTIuMjc5OTMgbCAwLjAwMyw3NC4xMTI3MiBjIDAsNy40NDAzNyA2LjA4NjU2OSwxMy41Mjc5NiAxMy41MjY5NDgsMTMuNTI3OTYgSCAxODIuNjAzNzQgYyA3LjQ0MDg3LDAgMTMuNTI4OTcsLTYuMDg3NTkgMTMuNTI4OTcsLTEzLjUyNzk2IGwgMC4wMDMsLTc0LjQwMTc1IGMgLTMuODQyNTgsMS43MTM2OCAtOC4wNTI2OCwyLjY1NDg2IC0xMi4zODU5OCwyLjY1NDg2IC05LjI1MDI3LDAgLTE5LjkyNjk2LC00LjI3NzU4IC0yNi41MTUyNCwtMTUuNTg1NTUxIC01LjMzMjY5LDkuNDU5NTcxIC0xNS42NzQ1NywxNS41NTMyMTEgLTI2LjczNDU0LDE1LjU1MzIxMSAtOS4xNjk1NywwIC0yMC44NjAwNCwtNC40MTM5OSAtMjYuOTc5MTEsLTE1Ljc0ODI1NyB6IG0gNDguNzMxMzcsMjcuMjk0NDE3IGMgMjguMzI0NiwwIDQyLjUwNDk3LDM0LjI0MzQgMjIuNDc4ODksNTQuMjY5NDkgLTIwLjAyNjA5LDIwLjAyNjA4IC01NC4yNjk0OSw1Ljg0NTcxIC01NC4yNjk0OSwtMjIuNDc4ODkgMCwtMTcuNTU3NiAxNC4yMzMsLTMxLjc5MDYgMzEuNzkwNiwtMzEuNzkwNiB6IG0gLTAuMTA2MTEsMTQuMzcyODMgYyAtMC45MDk1OCwtMC4wMDggLTEuODI0MzIsMC41ODA0OCAtMS44OTU5LDEuNzcwNTggbCAtMC4wNDE0LDEzLjUyMDg4IC0zLjg3NTY3LC0zLjgzOTI5IGMgLTEuNzg3NzksLTEuNjI2MTcgLTQuMjkwMDgsMC45MzU5MiAtMi42MjI1MiwyLjY4NTE4IGwgNy4wMzY4NCw2Ljk0ODkyIGMgMC43MzI2MiwwLjcxOTIgMS45MDYwNywwLjcxOTIgMi42Mzg2OSwwIGwgNy4xNDA5MywtNy4wNTIgYyAxLjc5Njk0LC0xLjc1NTcgLTAuODQ3NzIsLTQuNDQ3MDIgLTIuNjM0NjQsLTIuNjgxMTQgaCAtMC4wMTAxIGwgLTMuOTExMDQsMy44NjU1NyAwLjA0MTQsLTEzLjQxNjggYyAtMC4wNTE4LC0xLjE5MTEyIC0wLjk1NzAxLC0xLjc5NDM5IC0xLjg2NjU4LC0xLjgwMTkgeiBtIDEzLjE5ODUsMTkuMzAwNTMgYyAtMC45NzQ0MSwtMC4wMDkgLTEuOTU1MTksMC42NDA4IC0xLjg5OTk0LDEuOTYxNTggdiA1LjM5MTU4IGggLTIyLjQwNTExIHYgLTUuMzU1MTkgYyAtMC4wOTk5LC0yLjM4Mjk3IC0zLjYxNTc4LC0yLjQxNjk4IC0zLjc2MTQ3LC0wLjAzNjQgdiA3LjM1ODIyIGggMC4wMjUzIGMgMC4wNDQsMC45OTg5IDAuODYzNzIsMS43ODcwMSAxLjg2MzU2LDEuNzk0ODMgaCAyNi4xNzY2OSBjIDAuOTk4NzgsLTAuMDEgMS44MTYsLTAuNzk3MDggMS44NjI1NCwtMS43OTQ4MyB2IC03LjMyMTgzIGMgMC4wODA3LC0xLjMxOTQ3IC0wLjg4NzEyLC0xLjk4ODYgLTEuODYxNTMsLTEuOTk3OTcgeiIgLz4KCgk8L2c+CiAgICA8L2c+CiAgPC9nPgo8L3N2Zz4K';
 

src/php/Premium/Admin/ImportPage.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Koen12344\SiteImportForGbp\Premium\Admin;
+
+class ImportPage {
+
+}

src/php/Subscribers/AuthenticationAdminPostSubscriber.php

@@ -29,7 +29,8 @@ public function __construct(ProxyAuthenticationAPI $auth_api, GoogleUserManager
 	public static function get_subscribed_hooks(): array {
 		return [
 			'admin_post_sifg_auth_redirect'         => 'auth_redirect',
-			'admin_post_pgmb_google_authorized'     => 'fetch_tokens',
+			'admin_post_sifg_auth_success'     => 'fetch_tokens',
+			'admin_post_sifg_auth_failed'           => 'auth_failed',
 		];
 	}
 
@@ -46,7 +47,7 @@ public function auth_redirect(){
 		}
 
 		try{
-			$response = $this->auth_api->get_authentication_url(esc_url(admin_url('admin-post.php')), wp_create_nonce('sifg_auth_redirect'));
+			$response = $this->auth_api->get_authentication_url(esc_url(admin_url('admin-post.php')), wp_create_nonce('sifg_auth_redirect'), 'sifg_auth_success', 'sifg_auth_failed');
 		}catch(\Exception $e){
 			//translators: %s is error message
 			wp_die(sprintf(__('Could not generate authentication URL: %s', 'site-import-for-gbp'), $e->getMessage()),'', $this->wp_die_args());
@@ -88,4 +89,22 @@ public function fetch_tokens(){
 		exit;
 	}
 
+	/**
+	 * When the auth request fails, for example when the user presses the cancel button on the Google dialog
+	 */
+	public function auth_failed(){
+		if(!wp_verify_nonce(sanitize_key($_REQUEST['state']), 'sifg_auth_redirect')){ wp_die(__('Invalid nonce', 'site-import-for-gbp'),'', $this->wp_die_args()); }
+
+		$reason = '';
+
+		if(!empty($_REQUEST['error'])){
+			switch($_REQUEST['error']){
+				case 'access_denied':
+					$reason = __('The request was cancelled', 'site-import-for-gbp');
+			}
+		}
+
+		wp_die(sprintf(__('The authorization failed: %s', 'site-import-for-gbp'), $reason),'', $this->wp_die_args());
+	}
+
 }