Skip intermediate login page with single provider

[bookstack] / app / Providers / AppServiceProvider.php

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index fa10d4874ca25178211a82888633fc8e4a781268..3c1212e3274d5b23a42da1f8d9df26a1630bcdc8 100644 (file)
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,18 +1,30 @@
-<?php namespace BookStack\Providers;
+<?php

 
 

-use Blade;
-use BookStack\Entities\Book;
-use BookStack\Entities\Bookshelf;
+namespace BookStack\Providers;
+
+use BookStack\Auth\Access\LoginService;
+use BookStack\Auth\Access\SocialAuthService;

 use BookStack\Entities\BreadcrumbsViewComposer;
 use BookStack\Entities\BreadcrumbsViewComposer;

-use BookStack\Entities\Chapter;
-use BookStack\Entities\Page;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Exceptions\WhoopsBookStackPrettyHandler;

 use BookStack\Settings\Setting;
 use BookStack\Settings\SettingService;
 use BookStack\Settings\Setting;
 use BookStack\Settings\SettingService;

+use BookStack\Util\CspService;
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Cache\Repository;

 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\Relations\Relation;

+use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\URL;

 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;

-use Schema;
-use Validator;
+use Laravel\Socialite\Contracts\Factory as SocialiteFactory;
+use Psr\Http\Client\ClientInterface as HttpClientInterface;
+use Whoops\Handler\HandlerInterface;

 
 class AppServiceProvider extends ServiceProvider
 {
 
 class AppServiceProvider extends ServiceProvider
 {


@@ -23,16 +35,13 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
      */
     public function boot()
     {

-        // Custom validation methods
-        Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) {
-            $validImageExtensions = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'tiff', 'webp'];
-            return in_array(strtolower($value->getClientOriginalExtension()), $validImageExtensions);
-        });
-
-        Validator::extend('no_double_extension', function ($attribute, $value, $parameters, $validator) {
-            $uploadName = $value->getClientOriginalName();
-            return substr_count($uploadName, '.') < 2;
-        });
+        // Set root URL
+        $appUrl = config('app.url');
+        if ($appUrl) {
+            $isHttps = (strpos($appUrl, 'https://') === 0);
+            URL::forceRootUrl($appUrl);
+            URL::forceScheme($isHttps ? 'https' : 'http');
+        }

 
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
 
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {


@@ -42,16 +51,19 @@ class AppServiceProvider extends ServiceProvider
         // Allow longer string lengths after upgrade to utf8mb4
         Schema::defaultStringLength(191);
 
         // Allow longer string lengths after upgrade to utf8mb4
         Schema::defaultStringLength(191);
 

-        // Set morph-map due to namespace changes
-        Relation::morphMap([
-            'BookStack\\Bookshelf' => Bookshelf::class,
-            'BookStack\\Book' => Book::class,
-            'BookStack\\Chapter' => Chapter::class,
-            'BookStack\\Page' => Page::class,
+        // Set morph-map for our relations to friendlier aliases
+        Relation::enforceMorphMap([
+            'bookshelf' => Bookshelf::class,
+            'book'      => Book::class,
+            'chapter'   => Chapter::class,
+            'page'      => Page::class,

         ]);
 
         // View Composers
         ]);
 
         // View Composers

-        View::composer('partials.breadcrumbs', BreadcrumbsViewComposer::class);
+        View::composer('entities.breadcrumbs', BreadcrumbsViewComposer::class);
+
+        // Set paginator to use bootstrap-style pagination
+        Paginator::useBootstrap();

     }
 
     /**
     }
 
     /**


@@ -61,8 +73,26 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register()
     {
      */
     public function register()
     {

+        $this->app->bind(HandlerInterface::class, function ($app) {
+            return $app->make(WhoopsBookStackPrettyHandler::class);
+        });
+

         $this->app->singleton(SettingService::class, function ($app) {
         $this->app->singleton(SettingService::class, function ($app) {

-            return new SettingService($app->make(Setting::class), $app->make('Illuminate\Contracts\Cache\Repository'));
+            return new SettingService($app->make(Setting::class), $app->make(Repository::class));
+        });
+
+        $this->app->singleton(SocialAuthService::class, function ($app) {
+            return new SocialAuthService($app->make(SocialiteFactory::class), $app->make(LoginService::class));
+        });
+
+        $this->app->singleton(CspService::class, function ($app) {
+            return new CspService();
+        });
+
+        $this->app->bind(HttpClientInterface::class, function ($app) {
+            return new Client([
+                'timeout' => 3,
+            ]);

         });
     }
 }
         });
     }
 }