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 1df14a076f9e667d58c1ef079626f947ee5ce7f9..0518af44f9bf6e4f55d4ae311a30313aa7b8f1db 100644 (file)
--- a/app/Providers/CustomFacadeProvider.php
+++ b/app/Providers/CustomFacadeProvider.php
@@ -2,11 +2,11 @@
 
 namespace BookStack\Providers;
 
-use BookStack\Services\ImageService;
-use BookStack\Services\ViewService;
+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;
 
 class CustomFacadeProvider extends ServiceProvider
 {
@@ -27,26 +27,20 @@ class CustomFacadeProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->bind('activity', function() {
-            return new ActivityService($this->app->make('BookStack\Activity'));
+        $this->app->singleton('activity', function () {
+            return $this->app->make(ActivityLogger::class);
         });
 
-        $this->app->bind('views', function() {
-            return new ViewService($this->app->make('BookStack\View'));
+        $this->app->singleton('images', function () {
+            return $this->app->make(ImageService::class);
         });
 
-        $this->app->bind('setting', function() {
-            return new SettingService(
-                $this->app->make('BookStack\Setting'),
-                $this->app->make('Illuminate\Contracts\Cache\Repository')
-            );
+        $this->app->singleton('permissions', function () {
+            return $this->app->make(PermissionService::class);
         });
-        $this->app->bind('images', function() {
-            return new ImageService(
-                $this->app->make('Intervention\Image\ImageManager'),
-                $this->app->make('Illuminate\Contracts\Filesystem\Factory'),
-                $this->app->make('Illuminate\Contracts\Cache\Repository')
-            );
+
+        $this->app->singleton('theme', function () {
+            return $this->app->make(ThemeService::class);
         });
     }
 }