Version 3.0.4.1 - fix crash when no Two Factor Authentication

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.0.4.1 - 2020.12.24
+### Fixed
+- Snitch should again work without Two Factor Authentication
+
 ## 3.0.4 - 2020.12.23
 ### Fixed
 - Fixed problem with Snitch interfering with Two Factor Authentication

composer.json

@@ -2,7 +2,7 @@
     "name": "marionnewlevant/snitch",
     "description": "Report when two people might be editing the same element (eg entry, category, or global) or field",
     "type": "craft-plugin",
-    "version": "3.0.4",
+    "version": "3.0.4.1",
     "keywords": [
         "craft",
         "cms",

src/Snitch.php

@@ -19,8 +19,6 @@
 use craft\base\Plugin;
 use yii\base\Event;
 
-use born05\twofactorauthentication\Plugin as TwoFactorAuth;
-
 
 /**
  * Craft plugins are very much like little applications in and of themselves. We’ve made
@@ -101,9 +99,9 @@ public function init()
             Event::on(Plugins::class, Plugins::EVENT_AFTER_LOAD_PLUGINS, function () {
                 $user = Craft::$app->getUser();
                 // TwoFactorAuth - either not there, or not turned on for this user, or we have passed that hurdle
-                if (!TwoFactorAuth::$plugin
-                    || !TwoFactorAuth::$plugin->verify->isEnabled($user->getIdentity())
-                    || TwoFactorAuth::$plugin->verify->isVerified($user->getIdentity())
+                if (!Craft::$app->plugins->isPluginInstalled('two-factor-authentication')
+                    || !\born05\twofactorauthentication\Plugin::$plugin->verify->isEnabled($user->getIdentity())
+                    || \born05\twofactorauthentication\Plugin::$plugin->verify->isVerified($user->getIdentity())
                 )
                 {
                     // Register our asset bundle