Merge pull request #1692 from xwp/fix/two-factor-connector

Fix Two Factor connector issue

Author: bartoszgadomski

composer.json

@@ -34,7 +34,7 @@
     "wpackagist-plugin/classic-editor": "1.6.4",
     "wpackagist-plugin/easy-digital-downloads": "3.3.1",
     "wpackagist-plugin/jetpack": "13.6",
-    "wpackagist-plugin/two-factor": "0.9.1",
+    "wpackagist-plugin/two-factor": "0.11.0",
     "wpackagist-plugin/user-switching": "1.8.0",
     "wpackagist-plugin/wordpress-seo": "23.6",
     "wpackagist-plugin/wp-crontrol": "1.17.0",

composer.lock

@@ -291,20 +291,25 @@ public function callback_added_user_meta( $meta_id, $user_id, $meta_key, $meta_v
 	 * Callback to watch for 2FA authenticated actions.
 	 *
 	 * @param \WP_User $user     Authenticated user.
-	 * @param object   $provider The 2FA Provider used.
+	 * @param ?object  $provider The 2FA Provider used, null if unknown (this might happen if using older Two Factor plugin version).
 	 */
-	public function callback_two_factor_user_authenticated( $user, $provider ) {
+	public function callback_two_factor_user_authenticated( $user, $provider = null ) {
 
 		/* Translators: %s is the Two Factor provider. */
 		$message = __(
 			'Authenticated via %s',
 			'stream'
 		);
 
+		// Get the provider key.
+		$provider_key = null === $provider
+			? __( 'unknown Two Factor method', 'stream' )
+			: $provider->get_key();
+
 		$this->log(
 			$message,
 			array(
-				'provider' => $provider->get_key(),
+				'provider' => $provider_key,
 			),
 			$user->ID,
 			'auth',