fix: compatibility with private facade (#25)

* fix: compatibility with private facade * Apply fixes from StyleCI * bump * min version --------- Co-authored-by: StyleCI Bot <[email protected]>
imorland · Feb 4, 2024 · d4e11f8 · d4e11f8
1 parent c064109
commit d4e11f8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -92,6 +92,7 @@
         "flarum/testing": "^1.8.0",
         "fof/oauth": "*",
         "flarum/phpstan": "^1.8",
-        "blomstra/gdpr": "@beta"
+        "blomstra/gdpr": "@beta",
+        "sycho/flarum-private-facade": "^0.1.16"
     }
 }
diff --git a/extend.php b/extend.php
@@ -102,10 +102,16 @@
             (new Extend\Routes('forum'))
                 ->get('/twofactor/oauth/verify', 'twoFactor.oauth', Api\Controller\TwoFactorOAuthController::class)
                 ->post('/twofactor/oauth/verify', 'twoFactor.oauth.verify', Api\Controller\TwoFactorOAuthVerifyController::class),
+
+            (new Extend\Conditional())
+                ->whenExtensionEnabled('sycho-private-facade', fn () => [
+                    (new \SychO\PrivateFacade\Extend\FacadeExclusions())
+                        ->addBackendRouteExclusion('twoFactor.oauth')
+                        ->addBackendRouteExclusion('twoFactor.oauth.verify')
+                ]),
         ])
         ->whenExtensionEnabled('blomstra-gdpr', fn () => [
             (new UserData())
                 ->addType(Data\TwoFactorData::class),
         ]),
-
 ];
diff --git a/js/src/forum/extendLogInModal.js b/js/src/forum/extendLogInModal.js
@@ -62,7 +62,7 @@ export default function extendLogInModal() {
 
   override(LogInModal.prototype, 'footer', function (original) {
     if (this.twoFactorRequired) {
-      return null;
+      return <div />;
     }
 
     return original();