Add a mechanism to remind users to rotate personal auth tokens

plugins/UsersManager/Emails/AuthTokenNotificationEmail.php

@@ -13,6 +13,7 @@
 use Piwik\Mail;
 use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\TokenNotifications\TokenNotification;
+use Piwik\SettingsPiwik;
 use Piwik\Url;
 use Piwik\View;
 
@@ -59,9 +60,9 @@ private function getRotationPeriodPretty(): string
 
     protected function getManageAuthTokensLink(): string
     {
-        return Url::getCurrentUrlWithoutQueryString()
-            . '?module=UsersManager'
-            . '&action=userSecurity'
+        return SettingsPiwik::getPiwikUrl()
+            . 'index.php?'
+            . Url::getQueryStringFromParameters(['module' => 'UsersManager', 'action' => 'userSecurity'])
             . '#authtokens';
     }
     protected function getDefaultSubject(): string

plugins/UsersManager/TokenNotificationProvider.php

@@ -44,11 +44,13 @@ public function getTokenNotificationsForDispatch(): array
         }
 
         $db = Db::get();
-        $sql = "SELECT * FROM " . Common::prefixTable('user_token_auth')
+        $sql = "SELECT * FROM " . Common::prefixTable('user_token_auth') . " AS uta"
+            . " JOIN " . Common::prefixTable('user') . " AS u ON uta.login = u.login"
             . " WHERE (date_expired is null or date_expired > ?)"
             . " AND (date_created <= ?)"
             . " AND ts_rotation_notified is null"
-            . " AND system_token = 0";
+            . " AND system_token = 0"
+            . " AND u.email != '[email protected]' AND u.invited_by IS NULL";
 
         $tokensToNotify = $db->fetchAll($sql, [
             $this->today,
@@ -75,6 +77,6 @@ public function getTokenNotificationsForDispatch(): array
 
     public function setTokenNotificationDispatched(string $tokenId): void
     {
-        $this->userModel->setRotationNotificationWasSentForToken($tokenId, $this->today);
+        $this->userModel->setRotationNotificationWasSentForToken($tokenId, Date::factory('now')->getDatetime());
     }
 }