Merge branch '4.x-dev' into update-guzzlehttp-dependency

CHANGELOG.md

@@ -1,6 +1,12 @@
 
 ## Changelog
 
+# 4.6.8
+- Added OAuth complete warning when configuring/authorizing GA OAuth.
+
+# 4.6.7
+- Added additional check for redirect URL
+
 # 4.6.6
 - Started using ga:adwordsCampaignID dimension instead of ga:campaignCode to import data
 

Controller.php

@@ -125,6 +125,12 @@ public function index($errorMessage = false)
         }
 
         $isClientConfigurable = StaticContainer::get('GoogleAnalyticsImporter.isClientConfigurable');
+        if ($isConnectAccountsActivated) {
+            $notification = new Notification(Piwik::translate('GoogleAnalyticsImporter_GoogleOauthCompleteWarning', ['<strong>', '</strong>']));
+            $notification->context = Notification::CONTEXT_WARNING;
+            $notification->raw = true;
+            Notification\Manager::notify('GoogleAnalyticsImporter_OauthCompletionWarning', $notification);
+        }
         return $this->renderTemplate('index', [
             'isClientConfigurable' => $isClientConfigurable,
             'isConfigured' => $authorization->hasAccessToken(),

lang/en.json

@@ -133,6 +133,7 @@
         "NoDateSuccessImportMessageLine2": "Historical reports for these properties will be imported in the background. Please be patient as this will take a few days to complete. It's now time to set up the tracking of new data (see instructions below).",
         "OauthFailedMessage": "We encountered an issue during the authorization process for importing your GA reports. To try again, please click the button below. If the problem persists, please contact our support team for assistance. They will assist you in resolving the issue and getting your historical GA data imported.",
         "ConfigureImportNotificationMessage": "Don't miss out on your valuable historical insights! %1$sImport your Google Analytics data for %2$s%3$s into your Matomo platform now.",
-        "FutureDateHelp": "The import process has been stopped because it attempted to import data for a future or present date (%1$s). The importer will automatically retry the import tomorrow to ensure that correct and complete data is imported. "
+        "FutureDateHelp": "The import process has been stopped because it attempted to import data for a future or present date (%1$s). The importer will automatically retry the import tomorrow to ensure that correct and complete data is imported. ",
+        "GoogleOauthCompleteWarning": "%1$sNote:%2$s You may receive a warning from Google when completing the OAuth process saying \"%1$sGoogle hasn’t verified this app%2$s\". In this case, you can safely continue by clicking on \"%1$sAdvanced%2$s\", and then \"%1$sGo to matomo.cloud (unsafe)%2$s\"."
     }
 }

plugin.json

@@ -1,7 +1,7 @@
 {
     "name": "GoogleAnalyticsImporter",
     "description": "Import reports from a Google Analytics account into Matomo.",
-    "version": "4.6.6",
+    "version": "4.6.8",
     "theme": false,
     "require": {
         "matomo": ">=4.10.0-b1,<5.0.0-b1"