From: Dan Brown <redacted>
Date: Sat, 21 Aug 2021 14:47:55 +0000 (+0100)
Subject: Merge pull request #2827 from BookStackApp/mfa
X-Git-Tag: v21.08~1^2~26
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/cac31b2074cc0429423ffe7b8646ca0b5b367fe6

Merge pull request #2827 from BookStackApp/mfa

MFA System
---

cac31b2074cc0429423ffe7b8646ca0b5b367fe6
diff --cc composer.lock
index a9ba1b0a4,07c27ea52..306068abb
--- a/composer.lock
+++ b/composer.lock
@@@ -92,10 -92,63 +92,63 @@@
              "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.185.2"
 +                "source": "https://github.com/aws/aws-sdk-php/tree/3.187.2"
              },
 -            "time": "2021-06-25T18:19:14+00:00"
 +            "time": "2021-08-04T18:12:21+00:00"
          },
+         {
+             "name": "bacon/bacon-qr-code",
+             "version": "2.0.4",
+             "source": {
+                 "type": "git",
+                 "url": "https://github.com/Bacon/BaconQrCode.git",
+                 "reference": "f73543ac4e1def05f1a70bcd1525c8a157a1ad09"
+             },
+             "dist": {
+                 "type": "zip",
+                 "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09",
+                 "reference": "f73543ac4e1def05f1a70bcd1525c8a157a1ad09",
+                 "shasum": ""
+             },
+             "require": {
+                 "dasprid/enum": "^1.0.3",
+                 "ext-iconv": "*",
+                 "php": "^7.1 || ^8.0"
+             },
+             "require-dev": {
+                 "phly/keep-a-changelog": "^1.4",
+                 "phpunit/phpunit": "^7 | ^8 | ^9",
+                 "squizlabs/php_codesniffer": "^3.4"
+             },
+             "suggest": {
+                 "ext-imagick": "to generate QR code images"
+             },
+             "type": "library",
+             "autoload": {
+                 "psr-4": {
+                     "BaconQrCode\\": "src/"
+                 }
+             },
+             "notification-url": "https://packagist.org/downloads/",
+             "license": [
+                 "BSD-2-Clause"
+             ],
+             "authors": [
+                 {
+                     "name": "Ben Scholzen 'DASPRiD'",
+                     "email": "mail@dasprids.de",
+                     "homepage": "https://dasprids.de/",
+                     "role": "Developer"
+                 }
+             ],
+             "description": "BaconQrCode is a QR code generator for PHP.",
+             "homepage": "https://github.com/Bacon/BaconQrCode",
+             "support": {
+                 "issues": "https://github.com/Bacon/BaconQrCode/issues",
+                 "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.4"
+             },
+             "time": "2021-06-18T13:26:35+00:00"
+         },
          {
              "name": "barryvdh/laravel-dompdf",
              "version": "v0.9.0",
@@@ -227,9 -280,56 +280,56 @@@
              },
              "time": "2020-09-07T12:33:10+00:00"
          },
+         {
+             "name": "dasprid/enum",
+             "version": "1.0.3",
+             "source": {
+                 "type": "git",
+                 "url": "https://github.com/DASPRiD/Enum.git",
+                 "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2"
+             },
+             "dist": {
+                 "type": "zip",
+                 "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2",
+                 "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2",
+                 "shasum": ""
+             },
+             "require-dev": {
+                 "phpunit/phpunit": "^7 | ^8 | ^9",
+                 "squizlabs/php_codesniffer": "^3.4"
+             },
+             "type": "library",
+             "autoload": {
+                 "psr-4": {
+                     "DASPRiD\\Enum\\": "src/"
+                 }
+             },
+             "notification-url": "https://packagist.org/downloads/",
+             "license": [
+                 "BSD-2-Clause"
+             ],
+             "authors": [
+                 {
+                     "name": "Ben Scholzen 'DASPRiD'",
+                     "email": "mail@dasprids.de",
+                     "homepage": "https://dasprids.de/",
+                     "role": "Developer"
+                 }
+             ],
+             "description": "PHP 7.1 enum implementation",
+             "keywords": [
+                 "enum",
+                 "map"
+             ],
+             "support": {
+                 "issues": "https://github.com/DASPRiD/Enum/issues",
+                 "source": "https://github.com/DASPRiD/Enum/tree/1.0.3"
+             },
+             "time": "2020-10-02T16:03:48+00:00"
+         },
          {
              "name": "doctrine/cache",
 -            "version": "2.0.3",
 +            "version": "2.1.1",
              "source": {
                  "type": "git",
                  "url": "https://github.com/doctrine/cache.git",