From: Dan Brown <redacted>
Date: Sat, 16 Oct 2021 14:50:50 +0000 (+0100)
Subject: Merge branch 'oidc'
X-Git-Tag: v21.10~1^2~21
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/263384cf99864ebdb0408fd4e478f783aa487c1a

Merge branch 'oidc'
---

263384cf99864ebdb0408fd4e478f783aa487c1a
diff --cc app/Providers/AppServiceProvider.php
index 4446c2a0a,5fce642cf..da41de651
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@@ -21,7 -21,7 +22,8 @@@ use Illuminate\Support\Facades\URL
  use Illuminate\Support\Facades\View;
  use Illuminate\Support\ServiceProvider;
  use Laravel\Socialite\Contracts\Factory as SocialiteFactory;
 +use Whoops\Handler\HandlerInterface;
+ use Psr\Http\Client\ClientInterface as HttpClientInterface;
  
  class AppServiceProvider extends ServiceProvider
  {
diff --cc composer.lock
index dee5aff4c,89e408eb9..f8a13ba8b
--- a/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,7 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
-     "content-hash": "d59a665fcd692fc0ddf12e7e4f96d4f1",
 -    "content-hash": "b82cfdfe8bb32847ba2188804858d5fd",
++    "content-hash": "fc6d8f731e3975127a9101802cc4bb3a",
      "packages": [
          {
              "name": "aws/aws-crt-php",
@@@ -58,16 -58,16 +58,16 @@@
          },
          {
              "name": "aws/aws-sdk-php",
-             "version": "3.198.5",
 -            "version": "3.197.0",
++            "version": "3.198.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/aws/aws-sdk-php.git",
-                 "reference": "ec63e1ad1b30689e530089e4c9cb18f2ef5c290b"
 -                "reference": "c5391ef7c979473b97d81329100bfa5fb018fa62"
++                "reference": "821b8db50dd39be8ec94f286050a500b5f8a0142"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ec63e1ad1b30689e530089e4c9cb18f2ef5c290b",
-                 "reference": "ec63e1ad1b30689e530089e4c9cb18f2ef5c290b",
 -                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c5391ef7c979473b97d81329100bfa5fb018fa62",
 -                "reference": "c5391ef7c979473b97d81329100bfa5fb018fa62",
++                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/821b8db50dd39be8ec94f286050a500b5f8a0142",
++                "reference": "821b8db50dd39be8ec94f286050a500b5f8a0142",
                  "shasum": ""
              },
              "require": {
@@@ -143,9 -143,9 +143,9 @@@
              "support": {
                  "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                  "issues": "https://github.com/aws/aws-sdk-php/issues",
-                 "source": "https://github.com/aws/aws-sdk-php/tree/3.198.5"
 -                "source": "https://github.com/aws/aws-sdk-php/tree/3.197.0"
++                "source": "https://github.com/aws/aws-sdk-php/tree/3.198.6"
              },
-             "time": "2021-10-14T18:15:37+00:00"
 -            "time": "2021-10-05T18:14:34+00:00"
++            "time": "2021-10-15T18:38:53+00:00"
          },
          {
              "name": "bacon/bacon-qr-code",
@@@ -9289,6 -9711,6 +9470,7 @@@
                      "type": "github"
                  }
              ],
++            "abandoned": true,
              "time": "2020-09-28T06:45:17+00:00"
          },
          {