Skip intermediate login page with single provider

[bookstack] / app / Providers / CustomFacadeProvider.php

diff --git a/app/Providers/CustomFacadeProvider.php b/app/Providers/CustomFacadeProvider.php
index b2c7acf5e303cb391347ffa3b54d5e59c1164c8c..0518af44f9bf6e4f55d4ae311a30313aa7b8f1db 100644 (file)
--- a/app/Providers/CustomFacadeProvider.php
+++ b/app/Providers/CustomFacadeProvider.php
@@ -2,18 +2,11 @@
 
 namespace BookStack\Providers;
 
-use BookStack\Activity;
-use BookStack\Services\ImageService;
-use BookStack\Services\PermissionService;
-use BookStack\Services\ViewService;
-use BookStack\Setting;
-use BookStack\View;
-use Illuminate\Contracts\Cache\Repository;
-use Illuminate\Contracts\Filesystem\Factory;
+use BookStack\Actions\ActivityLogger;
+use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Theming\ThemeService;
+use BookStack\Uploads\ImageService;
 use Illuminate\Support\ServiceProvider;
-use BookStack\Services\ActivityService;
-use BookStack\Services\SettingService;
-use Intervention\Image\ImageManager;
 
 class CustomFacadeProvider extends ServiceProvider
 {
@@ -34,33 +27,20 @@ class CustomFacadeProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->bind('activity', function() {
-            return new ActivityService(
-                $this->app->make(Activity::class),
-                $this->app->make(PermissionService::class)
-            );
+        $this->app->singleton('activity', function () {
+            return $this->app->make(ActivityLogger::class);
         });
 
-        $this->app->bind('views', function() {
-            return new ViewService(
-                $this->app->make(View::class),
-                $this->app->make(PermissionService::class)
-            );
+        $this->app->singleton('images', function () {
+            return $this->app->make(ImageService::class);
         });
 
-        $this->app->bind('setting', function() {
-            return new SettingService(
-                $this->app->make(Setting::class),
-                $this->app->make(Repository::class)
-            );
+        $this->app->singleton('permissions', function () {
+            return $this->app->make(PermissionService::class);
         });
 
-        $this->app->bind('images', function() {
-            return new ImageService(
-                $this->app->make(ImageManager::class),
-                $this->app->make(Factory::class),
-                $this->app->make(Repository::class)
-            );
+        $this->app->singleton('theme', function () {
+            return $this->app->make(ThemeService::class);
         });
     }
 }