Updated version and assets for release v21.04.3

Revert "Update german translation"

.env.example

@@ -41,4 +41,4 @@ MAIL_HOST=localhost
 MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
+MAIL_ENCRYPTION=null

.env.example.complete

@@ -42,14 +42,6 @@ APP_TIMEZONE=UTC
 # overrides can be made. Defaults to disabled.
 APP_THEME=false
 
-# Trusted proxies
-# Used to indicate trust of systems that proxy to the application so
-# certain header values (Such as "X-Forwarded-For") can be used from the
-# incoming proxy request to provide origin detail.
-# Set to an IP address, or multiple comma seperated IP addresses.
-# Can alternatively be set to "*" to trust all proxy addresses.
-APP_PROXIES=null
-
 # Database details
 # Host can contain a port (localhost:3306) or a separate DB_PORT option can be used.
 DB_HOST=localhost
@@ -58,13 +50,6 @@ DB_DATABASE=database_database
 DB_USERNAME=database_username
 DB_PASSWORD=database_user_password
 
-# MySQL specific connection options
-# Path to Certificate Authority (CA) certificate file for your MySQL instance.
-# When this option is used host name identity verification will be performed
-# which checks the hostname, used by the client, against names within the
-# certificate itself (Common Name or Subject Alternative Name).
-MYSQL_ATTR_SSL_CA="/path/to/ca.pem"
-
 # Mail system to use
 # Can be 'smtp' or 'sendmail'
 MAIL_DRIVER=smtp
@@ -107,7 +92,8 @@ MEMCACHED_SERVERS=127.0.0.1:11211:100
 REDIS_SERVERS=127.0.0.1:6379:0
 
 # Queue driver to use
-# Can be 'sync', 'database' or 'redis'
+# Queue not really currently used but may be configurable in the future.
+# Would advise not to change this for now.
 QUEUE_CONNECTION=sync
 
 # Storage system to use
@@ -140,7 +126,7 @@ STORAGE_S3_ENDPOINT=https://my-custom-s3-compatible.service.com:8001
 STORAGE_URL=false
 
 # Authentication method to use
-# Can be 'standard', 'ldap', 'saml2' or 'oidc'
+# Can be 'standard', 'ldap' or 'saml2'
 AUTH_METHOD=standard
 
 # Social authentication configuration
@@ -214,7 +200,6 @@ LDAP_TLS_INSECURE=false
 LDAP_ID_ATTRIBUTE=uid
 LDAP_EMAIL_ATTRIBUTE=mail
 LDAP_DISPLAY_NAME_ATTRIBUTE=cn
-LDAP_THUMBNAIL_ATTRIBUTE=null
 LDAP_FOLLOW_REFERRALS=true
 LDAP_DUMP_USER_DETAILS=false
 
@@ -223,7 +208,6 @@ LDAP_DUMP_USER_DETAILS=false
 LDAP_USER_TO_GROUPS=false
 LDAP_GROUP_ATTRIBUTE="memberOf"
 LDAP_REMOVE_FROM_GROUPS=false
-LDAP_DUMP_USER_GROUPS=false
 
 # SAML authentication configuration
 # Refer to https://www.bookstackapp.com/docs/admin/saml2-auth/
@@ -238,9 +222,6 @@ SAML2_IDP_x509=null
 SAML2_ONELOGIN_OVERRIDES=null
 SAML2_DUMP_USER_DETAILS=false
 SAML2_AUTOLOAD_METADATA=false
-SAML2_IDP_AUTHNCONTEXT=true
-SAML2_SP_x509=null
-SAML2_SP_x509_KEY=null
 
 # SAML group sync configuration
 # Refer to https://www.bookstackapp.com/docs/admin/saml2-auth/
@@ -248,19 +229,6 @@ SAML2_USER_TO_GROUPS=false
 SAML2_GROUP_ATTRIBUTE=group
 SAML2_REMOVE_FROM_GROUPS=false
 
-# OpenID Connect authentication configuration
-# Refer to https://www.bookstackapp.com/docs/admin/oidc-auth/
-OIDC_NAME=SSO
-OIDC_DISPLAY_NAME_CLAIMS=name
-OIDC_CLIENT_ID=null
-OIDC_CLIENT_SECRET=null
-OIDC_ISSUER=null
-OIDC_ISSUER_DISCOVER=false
-OIDC_PUBLIC_KEY=null
-OIDC_AUTH_ENDPOINT=null
-OIDC_TOKEN_ENDPOINT=null
-OIDC_DUMP_USER_DETAILS=false
-
 # Disable default third-party services such as Gravatar and Draw.IO
 # Service-specific options will override this option
 DISABLE_EXTERNAL_SERVICES=false
@@ -274,7 +242,7 @@ AVATAR_URL=
 # Enable diagrams.net integration
 # Can simply be true/false to enable/disable the integration.
 # Alternatively, It can be URL to the diagrams.net instance you want to use.
-# For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1&configure=1
+# For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1
 DRAWIO=true
 
 # Default item listing view
@@ -301,15 +269,6 @@ REVISION_LIMIT=50
 # Set to -1 for unlimited recycle bin lifetime.
 RECYCLE_BIN_LIFETIME=30
 
-# File Upload Limit
-# Maximum file size, in megabytes, that can be uploaded to the system.
-FILE_UPLOAD_SIZE_LIMIT=50
-
-# Export Page Size
-# Primarily used to determine page size of PDF exports.
-# Can be 'a4' or 'letter'.
-EXPORT_PAGE_SIZE=a4
-
 # Allow <script> tags in page content
 # Note, if set to 'true' the page editor may still escape scripts.
 ALLOW_CONTENT_SCRIPTS=false
@@ -320,25 +279,12 @@ ALLOW_CONTENT_SCRIPTS=false
 # Contents of the robots.txt file can be overridden, making this option obsolete.
 ALLOW_ROBOTS=null
 
-# Allow server-side fetches to be performed to potentially unknown
-# and user-provided locations. Primarily used in exports when loading
-# in externally referenced assets.
-# Can be 'true' or 'false'.
-ALLOW_UNTRUSTED_SERVER_FETCHING=false
-
 # A list of hosts that BookStack can be iframed within.
 # Space separated if multiple. BookStack host domain is auto-inferred.
 # For Example: ALLOWED_IFRAME_HOSTS="https://example.com https://a.example.com"
 # Setting this option will also auto-adjust cookies to be SameSite=None.
 ALLOWED_IFRAME_HOSTS=null
 
-# A list of sources/hostnames that can be loaded within iframes within BookStack.
-# Space separated if multiple. BookStack host domain is auto-inferred.
-# Can be set to a lone "*" to allow all sources for iframe content (Not advised).
-# Defaults to a set of common services.
-# Current host and source for the "DRAWIO" setting will be auto-appended to the sources configured.
-ALLOWED_IFRAME_SOURCES="https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com"
-
 # The default and maximum item-counts for listing API requests.
 API_DEFAULT_ITEM_COUNT=100
 API_MAX_ITEM_COUNT=500

.github/ISSUE_TEMPLATE/api_request.md

@@ -0,0 +1,17 @@
+---
+name: New API Endpoint or Feature
+about: Request a new endpoint or API feature be added
+labels: ":nut_and_bolt: API Request"
+---
+
+#### API Endpoint or Feature
+
+Clearly describe what you'd like to have added to the API. 
+
+#### Use-Case
+
+Explain the use-case that you're working-on that requires the above request.
+
+#### Additional Context
+
+If required, add any other context about the feature request here.

.github/ISSUE_TEMPLATE/api_request.yml

@@ -1,25 +0,0 @@
-name: New API Endpoint or API Ability
-description: Request a new endpoint or API feature be added
-labels: [":nut_and_bolt: API Request"]
-body:
-  - type: textarea
-    id: feature
-    attributes:
-      label: API Endpoint or Feature
-      description: Clearly describe what you'd like to have added to the API.
-    validations:
-      required: true
-  - type: textarea
-    id: usecase
-    attributes:
-      label: Use-Case
-      description: Explain the use-case that you're working-on that requires the above request.
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Add any other context about the feature request here.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Your Configuration (please complete the following information):**
+ - Exact BookStack Version (Found in settings):
+ - PHP Version:
+ - Hosting Method (Nginx/Apache/Docker): 
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,70 +0,0 @@
-name: Bug Report
-description: Create a report to help us improve or fix things
-labels: [":bug: Bug"]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the Bug
-      description: Provide a clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to Reproduce
-      description: Detail the steps that would replicate this issue
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected Behaviour
-      description: Provide clear and concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Screenshots or Additional Context
-      description: Provide any additional context and screenshots here to help us solve this issue
-    validations:
-      required: false
-  - type: input
-    id: browserdetails
-    attributes:
-      label: Browser Details
-      description: |
-        If this is an issue that occurs when using the BookStack interface, please provide details of the browser used which presents the reported issue.
-      placeholder: (eg. Firefox 97 (64-bit) on Windows 11)
-    validations:
-      required: false
-  - type: input
-    id: bsversion
-    attributes:
-      label: Exact BookStack Version
-      description: This can be found in the settings view of BookStack. Please provide an exact version.
-      placeholder: (eg. v21.08.5)
-    validations:
-      required: true
-  - type: input
-    id: phpversion
-    attributes:
-      label: PHP Version
-      description: Keep in mind your command-line PHP version may differ to that of your webserver. Provide that relevant to the issue.
-      placeholder: (eg. 7.4)
-    validations:
-      required: false
-  - type: textarea
-    id: hosting
-    attributes:
-      label: Hosting Environment
-      description: Describe your hosting environment as much as possible including any proxies used (If applicable).
-      placeholder: (eg. Ubuntu 20.04 VPS, installed using official installation script)
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,13 +1,9 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Discord Chat Support
+  - name: Discord chat support
     url: https://discord.gg/ztkBqR2
-    about: Realtime support & chat with the BookStack community and the team.
+    about: Realtime support / chat with the community and the team.
 
   - name: Debugging & Common Issues
     url: https://www.bookstackapp.com/docs/admin/debugging/
-    about: Find details on how to debug issues and view common issues with their resolutions.
-
-  - name: Official Support Plans
-    url: https://www.bookstackapp.com/support/
-    about: View our official support plans that offer assured support for business.
+    about: Find details on how to debug issues and view common issues with thier resolutions.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+
+---
+
+**Describe the feature you'd like**
+A clear description of the feature you'd like implemented in BookStack.
+
+**Describe the benefits this feature would bring to BookStack users**
+Explain the measurable benefits this feature would achieve.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,58 +0,0 @@
-name: Feature Request
-description: Request a new feature or idea to be added to BookStack
-labels: [":hammer: Feature Request"]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the feature you'd like
-      description: Provide a clear description of the feature you'd like implemented in BookStack
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Describe the benefits this would bring to existing BookStack users
-      description: |
-        Explain the measurable benefits this feature would achieve for existing BookStack users.
-        These benefits should details outcomes in terms of what this request solves/achieves, and should not be specific to implementation.
-        This helps us understand the core desired goal so that a variety of potential implementations could be explored.
-        This field is important. Lack if input here may lead to early issue closure.
-    validations:
-      required: true
-  - type: textarea
-    id: already_achieved
-    attributes:
-      label: Can the goal of this request already be achieved via other means?
-      description: |
-        Yes/No. If yes, please describe how the requested approach fits in with the existing method.
-    validations:
-      required: true
-  - type: checkboxes
-    id: confirm-search
-    attributes:
-      label: Have you searched for an existing open/closed issue?
-      description: |
-        To help us keep these issues under control, please ensure you have first [searched our issue list](https://github.com/BookStackApp/BookStack/issues?q=is%3Aissue) for any existing issues that cover the fundemental benefit/goal of your request.
-      options:
-        - label: I have searched for existing issues and none cover my fundemental request
-          required: true
-  - type: dropdown
-    id: existing_usage
-    attributes:
-      label: How long have you been using BookStack?
-      options:
-        - Not using yet, just scoping
-        - 0 to 6 months
-        - 6 months to 1 year
-        - 1 to 5 years
-        - Over 5 years
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/language_request.md

@@ -0,0 +1,13 @@
+---
+name: Language Request
+about: Request a new language to be added to Crowdin for you to translate
+
+---
+
+### Language To Add
+
+_Specify here the language you want to add._
+
+----
+
+_This issue template is to request a new language be added to our [Crowdin translation management project](https://crowdin.com/project/bookstack). Please don't use this template to request a new language that you are not prepared to provide translations for._   

.github/ISSUE_TEMPLATE/language_request.yml

@@ -1,31 +0,0 @@
-name: Language Request
-description: Request a new language to be added to CrowdIn for you to translate
-labels: [":earth_africa: Translations"]
-assignees:
-  - ssddanbrown
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for offering to help start a new translation for BookStack!
-  - type: input
-    id: language
-    attributes:
-      label: Language to Add
-      description: What language (and region if applicable) are you offering to help add to BookStack?
-    validations:
-      required: true
-  - type: checkboxes
-    id: confirm
-    attributes:
-      label: Confirmation of Intent
-      description: |
-        This issue template is to request a new language be added to our [Crowdin translation management project](https://crowdin.com/project/bookstack).
-        Please don't use this template to request a new language that you are not prepared to provide translations for.
-      options:
-        - label: I confirm I'm offering to help translate for this new language via CrowdIn.
-          required: true
-  - type: markdown
-    attributes:
-      value: |
-        *__Note: New languages are added at specific points of the development process so it may be a small while before the requested language is added for translation.__*

.github/ISSUE_TEMPLATE/support_request.yml

@@ -1,62 +0,0 @@
-name: Support Request
-description: Request support for a specific problem you have not been able to solve yourself
-labels: [":dog2: Support"]
-body:
-  - type: checkboxes
-    id: useddocs
-    attributes:
-      label: Attempted Debugging
-      description: |
-        I have read the [BookStack debugging](https://www.bookstackapp.com/docs/admin/debugging/) page and seeked resolution or more
-        detail for the issue.
-      options:
-        - label: I have read the debugging page
-          required: true
-  - type: checkboxes
-    id: searchissue
-    attributes:
-      label: Searched GitHub Issues
-      description: |
-        I have searched for the issue and potential resolutions within the [project's GitHub issue list](https://github.com/BookStackApp/BookStack/issues)
-      options:
-        - label: I have searched GitHub for the issue.
-          required: true
-  - type: textarea
-    id: scenario
-    attributes:
-      label: Describe the Scenario
-      description: Detail the problem that you're having or what you need support with.
-    validations:
-      required: true
-  - type: input
-    id: bsversion
-    attributes:
-      label: Exact BookStack Version
-      description: This can be found in the settings view of BookStack. Please provide an exact version.
-      placeholder: (eg. v21.08.5)
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Log Content
-      description: If the issue has produced an error, provide any [BookStack or server log](https://www.bookstackapp.com/docs/admin/debugging/) content below.
-      placeholder: Be sure to remove any confidential details in your logs
-    validations:
-      required: false
-  - type: input
-    id: phpversion
-    attributes:
-      label: PHP Version
-      description: Keep in mind your command-line PHP version may differ to that of your webserver. Provide that most relevant to the issue.
-      placeholder: (eg. 7.4)
-    validations:
-      required: false
-  - type: textarea
-    id: hosting
-    attributes:
-      label: Hosting Environment
-      description: Describe your hosting environment as much as possible including any proxies used (If applicable).
-      placeholder: (eg. Ubuntu 20.04 VPS, installed using official installation script)
-    validations:
-      required: true

.github/SECURITY.md

@@ -1,32 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Only the [latest version](https://github.com/BookStackApp/BookStack/releases) of BookStack is supported.
-We generally don't support older versions of BookStack due to maintenance effort and
-since we aim to provide a fairly stable upgrade path for new versions.
-
-## Security Notifications
-
-If you'd like to be notified of new potential security concerns you can [sign-up to the BookStack security mailing list](https://updates.bookstackapp.com/signup/bookstack-security-updates).
-
-## Reporting a Vulnerability
-
-If you've found an issue that likely has no impact to existing users (For example, in a development-only branch)
-feel free to raise it via a standard GitHub bug report issue.
-
-If the issue could have a security impact to BookStack instances, please use one of the below 
-methods to report the vulnerability:
-
-- Directly contact the lead maintainer [@ssddanbrown](https://github.com/ssddanbrown). 
-  - You will need to login to be able to see the email address on the [GitHub profile page](https://github.com/ssddanbrown).
-  - Alternatively you can send a DM via Twitter to [@ssddanbrown](https://twitter.com/ssddanbrown).
-- [Disclose via huntr.dev](https://huntr.dev/bounties/disclose)
-  - Bounties may be available to you through this platform.
-  - Be sure to use `https://github.com/BookStackApp/BookStack` as the repository URL.
-
-Please be patient while the vulnerability is being reviewed. Deploying the fix to address the vulnerability
-can often take a little time due to the amount of preparation required, to ensure the vulnerability has
-been covered, and to create the content required to adequately notify the user-base.
-
-Thank you for keeping BookStack instances safe!

.github/translators.txt

@@ -54,7 +54,6 @@ Name :: Languages
 @benediktvolke :: German
 @Baptistou :: French
 @arcoai :: Spanish
-@Jokuna :: Korean
 cipi1965 :: Italian
 Mykola Ronik (Mantikor) :: Ukrainian
 furkanoyk :: Turkish
@@ -126,7 +125,7 @@ Zenahr Barzani (Zenahr) :: German; Japanese; Dutch; German Informal
 tatsuya.info :: Japanese
 fadiapp :: Arabic
 Jakub Bouček (jakubboucek) :: Czech
-Marco (cdrfun) :: German; German Informal
+Marco (cdrfun) :: German
 10935336 :: Chinese Simplified
 孟繁阳 (FanyangMeng) :: Chinese Simplified
 Andrej Močan (andrejm) :: Slovenian
@@ -162,84 +161,3 @@ Gerwin de Keijzer (gdekeijzer) :: Dutch; German Informal; German
 kometchtech :: Japanese
 Auri (Atalonica) :: Catalan
 Francesco Franchina (ffranchina) :: Italian
-Aimrane Kds (aimrane.kds) :: Arabic
-whenwesober :: Indonesian
-Rem (remkovdhoef) :: Dutch
-syn7ax69 :: Bulgarian; Turkish; German
-Blaade :: French
-Behzad HosseinPoor (behzad.hp) :: Persian
-Ole Aldric (Swoy) :: Norwegian Bokmal
-fharis arabia (raednahdi) :: Arabic
-Alexander Predl (Harveyhase68) :: German
-Rem (Rem9000) :: Dutch
-Michał Stelmach (stelmach-web) :: Polish
-arniom :: French
-REMOVED_USER :: Turkish
-林祖年 (contagion) :: Chinese Traditional
-Siamak Guodarzi (siamakgoudarzi88) :: Persian
-Lis Maestrelo (lismtrl) :: Portuguese, Brazilian
-Nathanaël (nathanaelhoun) :: French
-A Ibnu Hibban (abd.ibnuhibban) :: Indonesian
-Frost-ZX :: Chinese Simplified
-Kuzma Simonov (ovmach) :: Russian
-Vojtěch Krystek (acantophis) :: Czech
-Michał Lipok (mLipok) :: Polish
-Nicolas Pawlak (Mikolajek) :: French; Polish; German
-Thomas Hansen (thomasdk81) :: Danish
-Hl2run :: Slovak
-Ngo Tri Hoai (trihoai) :: Vietnamese
-Atalonica :: Catalan
-慕容潭谈 (591442386) :: Chinese Simplified
-Radim Pesek (ramess18) :: Czech
-anastasiia.motylko :: Ukrainian
-Indrek Haav (IndrekHaav) :: Estonian
-na3shkw :: Japanese
-Giancarlo Di Massa (digitall-it) :: Italian
-M Nafis Al Mukhdi (mnafisalmukhdi1) :: Indonesian
-sulfo :: Danish
-Raukze :: German
-zygimantus :: Lithuanian
-marinkaberg :: Russian
-Vitaliy (gviabcua) :: Ukrainian
-mannycarreiro :: Portuguese
-Thiago Rafael Pereira de Carvalho (thiago.rafael) :: Portuguese, Brazilian
-Ken Roger Bolgnes (kenbo124) :: Norwegian Bokmal
-Nguyen Hung Phuong (hnwolf) :: Vietnamese
-Umut ERGENE (umutergene67) :: Turkish
-Tomáš Batelka (Vofy) :: Czech
-Mundo Racional (ismael.mesquita) :: Portuguese, Brazilian
-Zarik (3apuk) :: Russian
-Ali Shaatani (a.shaatani) :: Arabic
-ChacMaster :: Portuguese, Brazilian
-Saeed (saeed205) :: Persian
-Julesdevops :: French
-peter cerny (posli.to.semka) :: Slovak
-Pavel Karlin (pavelkarlin) :: Russian
-SmokingCrop :: Dutch
-Maciej Lebiest (Szwendacz) :: Polish
-DiscordDigital :: German; German Informal
-Gábor Marton (dodver) :: Hungarian
-Jasell :: Swedish
-Ghost_chu (ghostchu) :: Chinese Simplified
-Ravid Shachar (ravidshachar) :: Hebrew
-Helga Guchshenskaya (guchshenskaya) :: Russian
-daniel chou (chou0214) :: Chinese Traditional
-Manolis PATRIARCHE (m.patriarche) :: French
-Mohammed Haboubi (haboubi92) :: Arabic
-roncallyt :: Portuguese, Brazilian
-goegol :: Dutch
-msevgen :: Turkish
-Khroners :: French
-MASOUD HOSSEINY (masoudme) :: Persian
-Thomerson Roncally (roncallyt) :: Portuguese, Brazilian
-metaarch :: Bulgarian
-Xabi (xabikip) :: Basque
-pedromcsousa :: Portuguese
-Nir Louk (looknear) :: Hebrew
-Alex (qianmengnet) :: Chinese Simplified
-stothew :: German
-sgenc :: Turkish
-Shukrullo (vodiylik) :: Uzbek
-William W. (Nevnt) :: Chinese Traditional
-eamaro :: Portuguese
-Ypsilon-dev :: Arabic

.github/workflows/phpstan.yml

@@ -1,36 +0,0 @@
-name: phpstan
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php: ['7.4']
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php }}
-        extensions: gd, mbstring, json, curl, xml, mysql, ldap
-
-    - name: Get Composer Cache Directory
-      id: composer-cache
-      run: |
-        echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-    - name: Cache composer packages
-      uses: actions/cache@v1
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ matrix.php }}
-
-    - name: Install composer dependencies
-      run: composer install --prefer-dist --no-interaction --ansi
-
-    - name: Run PHPStan
-      run: php${{ matrix.php }} ./vendor/bin/phpstan analyse --memory-limit=2G

.github/workflows/phpunit.yml

@@ -1,19 +1,28 @@
 name: phpunit
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - release
+      - gh_actions_update
+  pull_request:
+    branches:
+      - '*'
+      - '*/*'
+      - '!l10n_master'
 
 jobs:
   build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1']
+        php: ['7.3', '7.4', '8.0']
     steps:
     - uses: actions/checkout@v1
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
       with:
         php-version: ${{ matrix.php }}
         extensions: gd, mbstring, json, curl, xml, mysql, ldap
@@ -31,7 +40,7 @@ jobs:
 
     - name: Start Database
       run: |
-        sudo systemctl start mysql
+        sudo /etc/init.d/mysql start
 
     - name: Setup Database
       run: |
@@ -40,7 +49,7 @@ jobs:
         mysql -uroot -proot -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';"
         mysql -uroot -proot -e 'FLUSH PRIVILEGES;'
 
-    - name: Install composer dependencies
+    - name: Install composer dependencies & Test
       run: composer install --prefer-dist --no-interaction --ansi
 
     - name: Migrate and seed the database

.github/workflows/test-migrations.yml

@@ -1,19 +1,28 @@
 name: test-migrations
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - release
+      - gh_actions_update
+  pull_request:
+    branches:
+      - '*'
+      - '*/*'
+      - '!l10n_master'
 
 jobs:
   build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1']
+        php: ['7.3', '7.4', '8.0']
     steps:
       - uses: actions/checkout@v1
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
         with:
           php-version: ${{ matrix.php }}
           extensions: gd, mbstring, json, curl, xml, mysql, ldap
@@ -31,7 +40,7 @@ jobs:
 
       - name: Start MySQL
         run: |
-          sudo systemctl start mysql
+          sudo /etc/init.d/mysql start
 
       - name: Create database & user
         run: |

.gitignore

@@ -5,10 +5,10 @@ Homestead.yaml
 .idea
 npm-debug.log
 yarn-error.log
-/public/dist
+/public/dist/*.map
 /public/plugins
-/public/css
-/public/js
+/public/css/*.map
+/public/js/*.map
 /public/bower
 /public/build/
 /storage/images
@@ -23,5 +23,4 @@ nbproject
 .settings/
 webpack-stats.json
 .phpunit.result.cache
-.DS_Store
-phpstan.neon
+.DS_Store

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-present, Dan Brown and the BookStack Project contributors
+Copyright (c) 2020 Dan Brown and the BookStack Project contributors
 https://github.com/BookStackApp/BookStack/graphs/contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

app/Actions/Activity.php

@@ -11,15 +11,16 @@ use Illuminate\Support\Str;
 
 /**
  * @property string $type
- * @property User   $user
+ * @property User $user
  * @property Entity $entity
  * @property string $detail
  * @property string $entity_type
- * @property int    $entity_id
- * @property int    $user_id
+ * @property int $entity_id
+ * @property int $user_id
  */
 class Activity extends Model
 {
+
     /**
      * Get the entity for this activity.
      */
@@ -28,7 +29,6 @@ class Activity extends Model
         if ($this->entity_type === '') {
             $this->entity_type = null;
         }
-
         return $this->morphTo('entity');
     }
 
@@ -54,14 +54,14 @@ class Activity extends Model
     public function isForEntity(): bool
     {
         return Str::startsWith($this->type, [
-            'page_', 'chapter_', 'book_', 'bookshelf_',
+            'page_', 'chapter_', 'book_', 'bookshelf_'
         ]);
     }
 
     /**
      * Checks if another Activity matches the general information of another.
      */
-    public function isSimilarTo(self $activityB): bool
+    public function isSimilarTo(Activity $activityB): bool
     {
         return [$this->type, $this->entity_type, $this->entity_id] === [$activityB->type, $activityB->entity_type, $activityB->entity_id];
     }

app/Actions/ActivityLogger.php

@@ -1,115 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Entities\Models\Entity;
-use BookStack\Interfaces\Loggable;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Log;
-
-class ActivityLogger
-{
-    protected $permissionService;
-
-    public function __construct(PermissionService $permissionService)
-    {
-        $this->permissionService = $permissionService;
-    }
-
-    /**
-     * Add a generic activity event to the database.
-     *
-     * @param string|Loggable $detail
-     */
-    public function add(string $type, $detail = '')
-    {
-        $detailToStore = ($detail instanceof Loggable) ? $detail->logDescriptor() : $detail;
-
-        $activity = $this->newActivityForUser($type);
-        $activity->detail = $detailToStore;
-
-        if ($detail instanceof Entity) {
-            $activity->entity_id = $detail->id;
-            $activity->entity_type = $detail->getMorphClass();
-        }
-
-        $activity->save();
-        $this->setNotification($type);
-        $this->dispatchWebhooks($type, $detail);
-    }
-
-    /**
-     * Get a new activity instance for the current user.
-     */
-    protected function newActivityForUser(string $type): Activity
-    {
-        $ip = request()->ip() ?? '';
-
-        return (new Activity())->forceFill([
-            'type'     => strtolower($type),
-            'user_id'  => user()->id,
-            'ip'       => config('app.env') === 'demo' ? '127.0.0.1' : $ip,
-        ]);
-    }
-
-    /**
-     * Removes the entity attachment from each of its activities
-     * and instead uses the 'extra' field with the entities name.
-     * Used when an entity is deleted.
-     */
-    public function removeEntity(Entity $entity)
-    {
-        $entity->activity()->update([
-            'detail'       => $entity->name,
-            'entity_id'    => null,
-            'entity_type'  => null,
-        ]);
-    }
-
-    /**
-     * Flashes a notification message to the session if an appropriate message is available.
-     */
-    protected function setNotification(string $type): void
-    {
-        $notificationTextKey = 'activities.' . $type . '_notification';
-        if (trans()->has($notificationTextKey)) {
-            $message = trans($notificationTextKey);
-            session()->flash('success', $message);
-        }
-    }
-
-    /**
-     * @param string|Loggable $detail
-     */
-    protected function dispatchWebhooks(string $type, $detail): void
-    {
-        $webhooks = Webhook::query()
-            ->whereHas('trackedEvents', function (Builder $query) use ($type) {
-                $query->where('event', '=', $type)
-                    ->orWhere('event', '=', 'all');
-            })
-            ->where('active', '=', true)
-            ->get();
-
-        foreach ($webhooks as $webhook) {
-            dispatch(new DispatchWebhookJob($webhook, $type, $detail));
-        }
-    }
-
-    /**
-     * Log out a failed login attempt, Providing the given username
-     * as part of the message if the '%u' string is used.
-     */
-    public function logFailedLogin(string $username)
-    {
-        $message = config('logging.failed_login.message');
-        if (!$message) {
-            return;
-        }
-
-        $message = str_replace('%u', $username, $message);
-        $channel = config('logging.failed_login.channel');
-        Log::channel($channel)->warning($message);
-    }
-}

app/Actions/ActivityQueries.php

@@ -1,112 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\Relation;
-
-class ActivityQueries
-{
-    protected $permissionService;
-
-    public function __construct(PermissionService $permissionService)
-    {
-        $this->permissionService = $permissionService;
-    }
-
-    /**
-     * Gets the latest activity.
-     */
-    public function latest(int $count = 20, int $page = 0): array
-    {
-        $activityList = $this->permissionService
-            ->filterRestrictedEntityRelations(Activity::query(), 'activities', 'entity_id', 'entity_type')
-            ->orderBy('created_at', 'desc')
-            ->with(['user', 'entity'])
-            ->skip($count * $page)
-            ->take($count)
-            ->get();
-
-        return $this->filterSimilar($activityList);
-    }
-
-    /**
-     * Gets the latest activity for an entity, Filtering out similar
-     * items to prevent a message activity list.
-     */
-    public function entityActivity(Entity $entity, int $count = 20, int $page = 1): array
-    {
-        /** @var array<string, int[]> $queryIds */
-        $queryIds = [$entity->getMorphClass() => [$entity->id]];
-
-        if ($entity instanceof Book) {
-            $queryIds[(new Chapter())->getMorphClass()] = $entity->chapters()->scopes('visible')->pluck('id');
-        }
-        if ($entity instanceof Book || $entity instanceof Chapter) {
-            $queryIds[(new Page())->getMorphClass()] = $entity->pages()->scopes('visible')->pluck('id');
-        }
-
-        $query = Activity::query();
-        $query->where(function (Builder $query) use ($queryIds) {
-            foreach ($queryIds as $morphClass => $idArr) {
-                $query->orWhere(function (Builder $innerQuery) use ($morphClass, $idArr) {
-                    $innerQuery->where('entity_type', '=', $morphClass)
-                        ->whereIn('entity_id', $idArr);
-                });
-            }
-        });
-
-        $activity = $query->orderBy('created_at', 'desc')
-            ->with(['entity' => function (Relation $query) {
-                $query->withTrashed();
-            }, 'user.avatar'])
-            ->skip($count * ($page - 1))
-            ->take($count)
-            ->get();
-
-        return $this->filterSimilar($activity);
-    }
-
-    /**
-     * Get the latest activity for a user, Filtering out similar items.
-     */
-    public function userActivity(User $user, int $count = 20, int $page = 0): array
-    {
-        $activityList = $this->permissionService
-            ->filterRestrictedEntityRelations(Activity::query(), 'activities', 'entity_id', 'entity_type')
-            ->orderBy('created_at', 'desc')
-            ->where('user_id', '=', $user->id)
-            ->skip($count * $page)
-            ->take($count)
-            ->get();
-
-        return $this->filterSimilar($activityList);
-    }
-
-    /**
-     * Filters out similar activity.
-     *
-     * @param Activity[] $activities
-     */
-    protected function filterSimilar(iterable $activities): array
-    {
-        $newActivity = [];
-        $previousItem = null;
-
-        foreach ($activities as $activityItem) {
-            if (!$previousItem || !$activityItem->isSimilarTo($previousItem)) {
-                $newActivity[] = $activityItem;
-            }
-
-            $previousItem = $activityItem;
-        }
-
-        return $newActivity;
-    }
-}

app/Actions/ActivityService.php

@@ -0,0 +1,192 @@
+<?php namespace BookStack\Actions;
+
+use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Auth\User;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
+use BookStack\Interfaces\Loggable;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Support\Facades\Log;
+
+class ActivityService
+{
+    protected $activity;
+    protected $permissionService;
+
+    public function __construct(Activity $activity, PermissionService $permissionService)
+    {
+        $this->activity = $activity;
+        $this->permissionService = $permissionService;
+    }
+
+    /**
+     * Add activity data to database for an entity.
+     */
+    public function addForEntity(Entity $entity, string $type)
+    {
+        $activity = $this->newActivityForUser($type);
+        $entity->activity()->save($activity);
+        $this->setNotification($type);
+    }
+
+    /**
+     * Add a generic activity event to the database.
+     * @param string|Loggable $detail
+     */
+    public function add(string $type, $detail = '')
+    {
+        if ($detail instanceof Loggable) {
+            $detail = $detail->logDescriptor();
+        }
+
+        $activity = $this->newActivityForUser($type);
+        $activity->detail = $detail;
+        $activity->save();
+        $this->setNotification($type);
+    }
+
+    /**
+     * Get a new activity instance for the current user.
+     */
+    protected function newActivityForUser(string $type): Activity
+    {
+        return $this->activity->newInstance()->forceFill([
+            'type'     => strtolower($type),
+            'user_id' => user()->id,
+        ]);
+    }
+
+    /**
+     * Removes the entity attachment from each of its activities
+     * and instead uses the 'extra' field with the entities name.
+     * Used when an entity is deleted.
+     */
+    public function removeEntity(Entity $entity)
+    {
+        $entity->activity()->update([
+            'detail'       => $entity->name,
+            'entity_id'   => null,
+            'entity_type' => null,
+        ]);
+    }
+
+    /**
+     * Gets the latest activity.
+     */
+    public function latest(int $count = 20, int $page = 0): array
+    {
+        $activityList = $this->permissionService
+            ->filterRestrictedEntityRelations($this->activity->newQuery(), 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')
+            ->with(['user', 'entity'])
+            ->skip($count * $page)
+            ->take($count)
+            ->get();
+
+        return $this->filterSimilar($activityList);
+    }
+
+    /**
+     * Gets the latest activity for an entity, Filtering out similar
+     * items to prevent a message activity list.
+     */
+    public function entityActivity(Entity $entity, int $count = 20, int $page = 1): array
+    {
+        /** @var [string => int[]] $queryIds */
+        $queryIds = [$entity->getMorphClass() => [$entity->id]];
+
+        if ($entity->isA('book')) {
+            $queryIds[(new Chapter)->getMorphClass()] = $entity->chapters()->visible()->pluck('id');
+        }
+        if ($entity->isA('book') || $entity->isA('chapter')) {
+            $queryIds[(new Page)->getMorphClass()] = $entity->pages()->visible()->pluck('id');
+        }
+
+        $query = $this->activity->newQuery();
+        $query->where(function (Builder $query) use ($queryIds) {
+            foreach ($queryIds as $morphClass => $idArr) {
+                $query->orWhere(function (Builder $innerQuery) use ($morphClass, $idArr) {
+                    $innerQuery->where('entity_type', '=', $morphClass)
+                        ->whereIn('entity_id', $idArr);
+                });
+            }
+        });
+
+        $activity = $query->orderBy('created_at', 'desc')
+            ->with(['entity' => function (Relation $query) {
+                $query->withTrashed();
+            }, 'user.avatar'])
+            ->skip($count * ($page - 1))
+            ->take($count)
+            ->get();
+
+        return $this->filterSimilar($activity);
+    }
+
+    /**
+     * Get latest activity for a user, Filtering out similar items.
+     */
+    public function userActivity(User $user, int $count = 20, int $page = 0): array
+    {
+        $activityList = $this->permissionService
+            ->filterRestrictedEntityRelations($this->activity->newQuery(), 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')
+            ->where('user_id', '=', $user->id)
+            ->skip($count * $page)
+            ->take($count)
+            ->get();
+
+        return $this->filterSimilar($activityList);
+    }
+
+    /**
+     * Filters out similar activity.
+     * @param Activity[] $activities
+     * @return array
+     */
+    protected function filterSimilar(iterable $activities): array
+    {
+        $newActivity = [];
+        $previousItem = null;
+
+        foreach ($activities as $activityItem) {
+            if (!$previousItem || !$activityItem->isSimilarTo($previousItem)) {
+                $newActivity[] = $activityItem;
+            }
+
+            $previousItem = $activityItem;
+        }
+
+        return $newActivity;
+    }
+
+    /**
+     * Flashes a notification message to the session if an appropriate message is available.
+     */
+    protected function setNotification(string $type)
+    {
+        $notificationTextKey = 'activities.' . $type . '_notification';
+        if (trans()->has($notificationTextKey)) {
+            $message = trans($notificationTextKey);
+            session()->flash('success', $message);
+        }
+    }
+
+    /**
+     * Log out a failed login attempt, Providing the given username
+     * as part of the message if the '%u' string is used.
+     */
+    public function logFailedLogin(string $username)
+    {
+        $message = config('logging.failed_login.message');
+        if (!$message) {
+            return;
+        }
+
+        $message = str_replace("%u", $username, $message);
+        $channel = config('logging.failed_login.channel');
+        Log::channel($channel)->warning($message);
+    }
+}

app/Actions/ActivityType.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Actions;
+<?php namespace BookStack\Actions;
 
 class ActivityType
 {
@@ -50,19 +48,4 @@ class ActivityType
     const AUTH_PASSWORD_RESET_UPDATE = 'auth_password_reset_update';
     const AUTH_LOGIN = 'auth_login';
     const AUTH_REGISTER = 'auth_register';
-
-    const MFA_SETUP_METHOD = 'mfa_setup_method';
-    const MFA_REMOVE_METHOD = 'mfa_remove_method';
-
-    const WEBHOOK_CREATE = 'webhook_create';
-    const WEBHOOK_UPDATE = 'webhook_update';
-    const WEBHOOK_DELETE = 'webhook_delete';
-
-    /**
-     * Get all the possible values.
-     */
-    public static function all(): array
-    {
-        return (new \ReflectionClass(static::class))->getConstants();
-    }
 }

app/Actions/Comment.php

@@ -1,29 +1,24 @@
-<?php
-
-namespace BookStack\Actions;
+<?php namespace BookStack\Actions;
 
 use BookStack\Model;
 use BookStack\Traits\HasCreatorAndUpdater;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
- * @property int      $id
- * @property string   $text
- * @property string   $html
- * @property int|null $parent_id
- * @property int      $local_id
+ * @property string text
+ * @property string html
+ * @property int|null parent_id
+ * @property int local_id
  */
 class Comment extends Model
 {
-    use HasFactory;
     use HasCreatorAndUpdater;
 
     protected $fillable = ['text', 'parent_id'];
     protected $appends = ['created', 'updated'];
 
     /**
-     * Get the entity that this comment belongs to.
+     * Get the entity that this comment belongs to
      */
     public function entity(): MorphTo
     {
@@ -40,7 +35,6 @@ class Comment extends Model
 
     /**
      * Get created date as a relative diff.
-     *
      * @return mixed
      */
     public function getCreatedAttribute()
@@ -50,7 +44,6 @@ class Comment extends Model
 
     /**
      * Get updated date as a relative diff.
-     *
      * @return mixed
      */
     public function getUpdatedAttribute()

app/Actions/CommentRepo.php

@@ -1,21 +1,21 @@
-<?php
-
-namespace BookStack\Actions;
+<?php namespace BookStack\Actions;
 
 use BookStack\Entities\Models\Entity;
-use BookStack\Facades\Activity as ActivityService;
 use League\CommonMark\CommonMarkConverter;
+use BookStack\Facades\Activity as ActivityService;
 
 /**
- * Class CommentRepo.
+ * Class CommentRepo
  */
 class CommentRepo
 {
+
     /**
-     * @var Comment
+     * @var Comment $comment
      */
     protected $comment;
 
+
     public function __construct(Comment $comment)
     {
         $this->comment = $comment;
@@ -45,8 +45,7 @@ class CommentRepo
         $comment->parent_id = $parent_id;
 
         $entity->comments()->save($comment);
-        ActivityService::add(ActivityType::COMMENTED_ON, $entity);
-
+        ActivityService::addForEntity($entity, ActivityType::COMMENTED_ON);
         return $comment;
     }
 
@@ -59,26 +58,25 @@ class CommentRepo
         $comment->text = $text;
         $comment->html = $this->commentToHtml($text);
         $comment->save();
-
         return $comment;
     }
 
     /**
      * Delete a comment from the system.
      */
-    public function delete(Comment $comment): void
+    public function delete(Comment $comment)
     {
         $comment->delete();
     }
 
     /**
-     * Convert the given comment Markdown to HTML.
+     * Convert the given comment markdown text to HTML.
      */
     public function commentToHtml(string $commentText): string
     {
         $converter = new CommonMarkConverter([
-            'html_input'         => 'strip',
-            'max_nesting_level'  => 10,
+            'html_input' => 'strip',
+            'max_nesting_level' => 10,
             'allow_unsafe_links' => false,
         ]);
 
@@ -90,9 +88,7 @@ class CommentRepo
      */
     protected function getNextLocalId(Entity $entity): int
     {
-        /** @var Comment $comment */
-        $comment = $entity->comments(false)->orderBy('local_id', 'desc')->first();
-
-        return ($comment->local_id ?? 0) + 1;
+        $comments = $entity->comments(false)->orderBy('local_id', 'desc')->first();
+        return ($comments->local_id ?? 0) + 1;
     }
 }

app/Actions/DispatchWebhookJob.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Auth\User;
-use BookStack\Facades\Theme;
-use BookStack\Interfaces\Loggable;
-use BookStack\Theming\ThemeEvents;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class DispatchWebhookJob implements ShouldQueue
-{
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    protected Webhook $webhook;
-    protected string $event;
-    protected User $initiator;
-    protected int $initiatedTime;
-
-    /**
-     * @var string|Loggable
-     */
-    protected $detail;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(Webhook $webhook, string $event, $detail)
-    {
-        $this->webhook = $webhook;
-        $this->event = $event;
-        $this->detail = $detail;
-        $this->initiator = user();
-        $this->initiatedTime = time();
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $themeResponse = Theme::dispatch(ThemeEvents::WEBHOOK_CALL_BEFORE, $this->event, $this->webhook, $this->detail, $this->initiator, $this->initiatedTime);
-        $webhookData = $themeResponse ?? WebhookFormatter::getDefault($this->event, $this->webhook, $this->detail, $this->initiator, $this->initiatedTime)->format();
-        $lastError = null;
-
-        try {
-            $response = Http::asJson()
-                ->withOptions(['allow_redirects' => ['strict' => true]])
-                ->timeout($this->webhook->timeout)
-                ->post($this->webhook->endpoint, $webhookData);
-        } catch (\Exception $exception) {
-            $lastError = $exception->getMessage();
-            Log::error("Webhook call to endpoint {$this->webhook->endpoint} failed with error \"{$lastError}\"");
-        }
-
-        if (isset($response) && $response->failed()) {
-            $lastError = "Response status from endpoint was {$response->status()}";
-            Log::error("Webhook call to endpoint {$this->webhook->endpoint} failed with status {$response->status()}");
-        }
-
-        $this->webhook->last_called_at = now();
-        if ($lastError) {
-            $this->webhook->last_errored_at = now();
-            $this->webhook->last_error = $lastError;
-        }
-
-        $this->webhook->save();
-    }
-}

app/Actions/Favourite.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Model;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
-
-class Favourite extends Model
-{
-    protected $fillable = ['user_id'];
-
-    /**
-     * Get the related model that can be favourited.
-     */
-    public function favouritable(): MorphTo
-    {
-        return $this->morphTo();
-    }
-}

app/Actions/Tag.php

@@ -1,45 +1,18 @@
-<?php
-
-namespace BookStack\Actions;
+<?php namespace BookStack\Actions;
 
 use BookStack\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 
-/**
- * @property int    $id
- * @property string $name
- * @property string $value
- * @property int    $order
- */
 class Tag extends Model
 {
-    use HasFactory;
-
     protected $fillable = ['name', 'value', 'order'];
     protected $hidden = ['id', 'entity_id', 'entity_type', 'created_at', 'updated_at'];
 
     /**
-     * Get the entity that this tag belongs to.
+     * Get the entity that this tag belongs to
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    public function entity(): MorphTo
+    public function entity()
     {
         return $this->morphTo('entity');
     }
-
-    /**
-     * Get a full URL to start a tag name search for this tag name.
-     */
-    public function nameUrl(): string
-    {
-        return url('/search?term=%5B' . urlencode($this->name) . '%5D');
-    }
-
-    /**
-     * Get a full URL to start a tag name and value search for this tag's values.
-     */
-    public function valueUrl(): string
-    {
-        return url('/search?term=%5B' . urlencode($this->name) . '%3D' . urlencode($this->value) . '%5D');
-    }
 }

app/Actions/TagRepo.php

@@ -1,57 +1,23 @@
-<?php
-
-namespace BookStack\Actions;
+<?php namespace BookStack\Actions;
 
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Entities\Models\Entity;
-use Illuminate\Database\Eloquent\Builder;
+use DB;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 
 class TagRepo
 {
+
     protected $tag;
     protected $permissionService;
 
-    public function __construct(PermissionService $ps)
-    {
-        $this->permissionService = $ps;
-    }
-
     /**
-     * Start a query against all tags in the system.
+     * TagRepo constructor.
      */
-    public function queryWithTotals(string $searchTerm, string $nameFilter): Builder
+    public function __construct(Tag $tag, PermissionService $ps)
     {
-        $query = Tag::query()
-            ->select([
-                'name',
-                ($searchTerm || $nameFilter) ? 'value' : DB::raw('COUNT(distinct value) as `values`'),
-                DB::raw('COUNT(id) as usages'),
-                DB::raw('SUM(IF(entity_type = \'page\', 1, 0)) as page_count'),
-                DB::raw('SUM(IF(entity_type = \'chapter\', 1, 0)) as chapter_count'),
-                DB::raw('SUM(IF(entity_type = \'book\', 1, 0)) as book_count'),
-                DB::raw('SUM(IF(entity_type = \'bookshelf\', 1, 0)) as shelf_count'),
-            ])
-            ->orderBy($nameFilter ? 'value' : 'name');
-
-        if ($nameFilter) {
-            $query->where('name', '=', $nameFilter);
-            $query->groupBy('value');
-        } elseif ($searchTerm) {
-            $query->groupBy('name', 'value');
-        } else {
-            $query->groupBy('name');
-        }
-
-        if ($searchTerm) {
-            $query->where(function (Builder $query) use ($searchTerm) {
-                $query->where('name', 'like', '%' . $searchTerm . '%')
-                    ->orWhere('value', 'like', '%' . $searchTerm . '%');
-            });
-        }
-
-        return $this->permissionService->filterRestrictedEntityRelations($query, 'tags', 'entity_id', 'entity_type');
+        $this->tag = $tag;
+        $this->permissionService = $ps;
     }
 
     /**
@@ -60,7 +26,7 @@ class TagRepo
      */
     public function getNameSuggestions(?string $searchTerm): Collection
     {
-        $query = Tag::query()
+        $query = $this->tag->newQuery()
             ->select('*', DB::raw('count(*) as count'))
             ->groupBy('name');
 
@@ -71,7 +37,6 @@ class TagRepo
         }
 
         $query = $this->permissionService->filterRestrictedEntityRelations($query, 'tags', 'entity_id', 'entity_type');
-
         return $query->get(['name'])->pluck('name');
     }
 
@@ -82,7 +47,7 @@ class TagRepo
      */
     public function getValueSuggestions(?string $searchTerm, ?string $tagName): Collection
     {
-        $query = Tag::query()
+        $query = $this->tag->newQuery()
             ->select('*', DB::raw('count(*) as count'))
             ->groupBy('value');
 
@@ -97,12 +62,11 @@ class TagRepo
         }
 
         $query = $this->permissionService->filterRestrictedEntityRelations($query, 'tags', 'entity_id', 'entity_type');
-
         return $query->get(['value'])->pluck('value');
     }
 
     /**
-     * Save an array of tags to an entity.
+     * Save an array of tags to an entity
      */
     public function saveTagsToEntity(Entity $entity, array $tags = []): iterable
     {
@@ -123,9 +87,8 @@ class TagRepo
      */
     protected function newInstanceFromInput(array $input): Tag
     {
-        return new Tag([
-            'name'  => trim($input['name']),
-            'value' => trim($input['value'] ?? ''),
-        ]);
+        $name = trim($input['name']);
+        $value = isset($input['value']) ? trim($input['value']) : '';
+        return $this->tag->newInstance(['name' => $name, 'value' => $value]);
     }
 }

app/Actions/View.php

@@ -1,58 +1,18 @@
-<?php
+<?php namespace BookStack\Actions;
 
-namespace BookStack\Actions;
-
-use BookStack\Interfaces\Viewable;
 use BookStack\Model;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 
-/**
- * Class View
- * Views are stored per-item per-person within the database.
- * They can be used to find popular items or recently viewed items
- * at a per-person level. They do not record every view instance as an
- * activity. Only the latest and original view times could be recognised.
- *
- * @property int $views
- * @property int $user_id
- */
 class View extends Model
 {
+
     protected $fillable = ['user_id', 'views'];
 
     /**
      * Get all owning viewable models.
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    public function viewable(): MorphTo
+    public function viewable()
     {
         return $this->morphTo();
     }
-
-    /**
-     * Increment the current user's view count for the given viewable model.
-     */
-    public static function incrementFor(Viewable $viewable): int
-    {
-        $user = user();
-        if (is_null($user) || $user->isDefault()) {
-            return 0;
-        }
-
-        /** @var View $view */
-        $view = $viewable->views()->firstOrNew([
-            'user_id' => $user->id,
-        ], ['views' => 0]);
-
-        $view->forceFill(['views' => $view->views + 1])->save();
-
-        return $view->views;
-    }
-
-    /**
-     * Clear all views from the system.
-     */
-    public static function clearAll()
-    {
-        static::query()->truncate();
-    }
 }

app/Actions/ViewService.php

@@ -0,0 +1,117 @@
+<?php namespace BookStack\Actions;
+
+use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\EntityProvider;
+use DB;
+use Illuminate\Support\Collection;
+
+class ViewService
+{
+    protected $view;
+    protected $permissionService;
+    protected $entityProvider;
+
+    /**
+     * ViewService constructor.
+     * @param View $view
+     * @param PermissionService $permissionService
+     * @param EntityProvider $entityProvider
+     */
+    public function __construct(View $view, PermissionService $permissionService, EntityProvider $entityProvider)
+    {
+        $this->view = $view;
+        $this->permissionService = $permissionService;
+        $this->entityProvider = $entityProvider;
+    }
+
+    /**
+     * Add a view to the given entity.
+     * @param \BookStack\Entities\Models\Entity $entity
+     * @return int
+     */
+    public function add(Entity $entity)
+    {
+        $user = user();
+        if ($user === null || $user->isDefault()) {
+            return 0;
+        }
+        $view = $entity->views()->where('user_id', '=', $user->id)->first();
+        // Add view if model exists
+        if ($view) {
+            $view->increment('views');
+            return $view->views;
+        }
+
+        // Otherwise create new view count
+        $entity->views()->save($this->view->newInstance([
+            'user_id' => $user->id,
+            'views' => 1
+        ]));
+
+        return 1;
+    }
+
+    /**
+     * Get the entities with the most views.
+     * @param int $count
+     * @param int $page
+     * @param string|array $filterModels
+     * @param string $action - used for permission checking
+     * @return Collection
+     */
+    public function getPopular(int $count = 10, int $page = 0, array $filterModels = null, string $action = 'view')
+    {
+        $skipCount = $count * $page;
+        $query = $this->permissionService
+            ->filterRestrictedEntityRelations($this->view->newQuery(), 'views', 'viewable_id', 'viewable_type', $action)
+            ->select('*', 'viewable_id', 'viewable_type', DB::raw('SUM(views) as view_count'))
+            ->groupBy('viewable_id', 'viewable_type')
+            ->orderBy('view_count', 'desc');
+
+        if ($filterModels) {
+            $query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels));
+        }
+
+        return $query->with('viewable')
+            ->skip($skipCount)
+            ->take($count)
+            ->get()
+            ->pluck('viewable')
+            ->filter();
+    }
+
+    /**
+     * Get all recently viewed entities for the current user.
+     */
+    public function getUserRecentlyViewed(int $count = 10, int $page = 1)
+    {
+        $user = user();
+        if ($user === null || $user->isDefault()) {
+            return collect();
+        }
+
+        $all = collect();
+        /** @var Entity $instance */
+        foreach ($this->entityProvider->all() as $name => $instance) {
+            $items = $instance::visible()->withLastView()
+                ->having('last_viewed_at', '>', 0)
+                ->orderBy('last_viewed_at', 'desc')
+                ->skip($count * ($page - 1))
+                ->take($count)
+                ->get();
+            $all = $all->concat($items);
+        }
+
+        return $all->sortByDesc('last_viewed_at')->slice(0, $count);
+    }
+
+    /**
+     * Reset all view counts by deleting all views.
+     */
+    public function resetAll()
+    {
+        $this->view->truncate();
+    }
+}

app/Actions/Webhook.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Interfaces\Loggable;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-/**
- * @property int        $id
- * @property string     $name
- * @property string     $endpoint
- * @property Collection $trackedEvents
- * @property bool       $active
- * @property int        $timeout
- * @property string     $last_error
- * @property Carbon     $last_called_at
- * @property Carbon     $last_errored_at
- */
-class Webhook extends Model implements Loggable
-{
-    protected $fillable = ['name', 'endpoint', 'timeout'];
-
-    use HasFactory;
-
-    protected $casts = [
-        'last_called_at'  => 'datetime',
-        'last_errored_at' => 'datetime',
-    ];
-
-    /**
-     * Define the tracked event relation a webhook.
-     */
-    public function trackedEvents(): HasMany
-    {
-        return $this->hasMany(WebhookTrackedEvent::class);
-    }
-
-    /**
-     * Update the tracked events for a webhook from the given list of event types.
-     */
-    public function updateTrackedEvents(array $events): void
-    {
-        $this->trackedEvents()->delete();
-
-        $eventsToStore = array_intersect($events, array_values(ActivityType::all()));
-        if (in_array('all', $events)) {
-            $eventsToStore = ['all'];
-        }
-
-        $trackedEvents = [];
-        foreach ($eventsToStore as $event) {
-            $trackedEvents[] = new WebhookTrackedEvent(['event' => $event]);
-        }
-
-        $this->trackedEvents()->saveMany($trackedEvents);
-    }
-
-    /**
-     * Check if this webhook tracks the given event.
-     */
-    public function tracksEvent(string $event): bool
-    {
-        return $this->trackedEvents->pluck('event')->contains($event);
-    }
-
-    /**
-     * Get a URL for this webhook within the settings interface.
-     */
-    public function getUrl(string $path = ''): string
-    {
-        return url('/settings/webhooks/' . $this->id . '/' . ltrim($path, '/'));
-    }
-
-    /**
-     * Get the string descriptor for this item.
-     */
-    public function logDescriptor(): string
-    {
-        return "({$this->id}) {$this->name}";
-    }
-}

app/Actions/WebhookFormatter.php

@@ -1,124 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use BookStack\Interfaces\Loggable;
-use BookStack\Model;
-use Illuminate\Support\Carbon;
-
-class WebhookFormatter
-{
-    protected Webhook $webhook;
-    protected string $event;
-    protected User $initiator;
-    protected int $initiatedTime;
-
-    /**
-     * @var string|Loggable
-     */
-    protected $detail;
-
-    /**
-     * @var array{condition: callable(string, Model):bool, format: callable(Model):void}[]
-     */
-    protected $modelFormatters = [];
-
-    public function __construct(string $event, Webhook $webhook, $detail, User $initiator, int $initiatedTime)
-    {
-        $this->webhook = $webhook;
-        $this->event = $event;
-        $this->initiator = $initiator;
-        $this->initiatedTime = $initiatedTime;
-        $this->detail = is_object($detail) ? clone $detail : $detail;
-    }
-
-    public function format(): array
-    {
-        $data = [
-            'event'                    => $this->event,
-            'text'                     => $this->formatText(),
-            'triggered_at'             => Carbon::createFromTimestampUTC($this->initiatedTime)->toISOString(),
-            'triggered_by'             => $this->initiator->attributesToArray(),
-            'triggered_by_profile_url' => $this->initiator->getProfileUrl(),
-            'webhook_id'               => $this->webhook->id,
-            'webhook_name'             => $this->webhook->name,
-        ];
-
-        if (method_exists($this->detail, 'getUrl')) {
-            $data['url'] = $this->detail->getUrl();
-        }
-
-        if ($this->detail instanceof Model) {
-            $data['related_item'] = $this->formatModel();
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param callable(string, Model):bool $condition
-     * @param callable(Model):void         $format
-     */
-    public function addModelFormatter(callable $condition, callable $format): void
-    {
-        $this->modelFormatters[] = [
-            'condition' => $condition,
-            'format'    => $format,
-        ];
-    }
-
-    public function addDefaultModelFormatters(): void
-    {
-        // Load entity owner, creator, updater details
-        $this->addModelFormatter(
-            fn ($event, $model) => ($model instanceof Entity),
-            fn ($model) => $model->load(['ownedBy', 'createdBy', 'updatedBy'])
-        );
-
-        // Load revision detail for page update and create events
-        $this->addModelFormatter(
-            fn ($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
-            fn ($model) => $model->load('currentRevision')
-        );
-    }
-
-    protected function formatModel(): array
-    {
-        /** @var Model $model */
-        $model = $this->detail;
-        $model->unsetRelations();
-
-        foreach ($this->modelFormatters as $formatter) {
-            if ($formatter['condition']($this->event, $model)) {
-                $formatter['format']($model);
-            }
-        }
-
-        return $model->toArray();
-    }
-
-    protected function formatText(): string
-    {
-        $textParts = [
-            $this->initiator->name,
-            trans('activities.' . $this->event),
-        ];
-
-        if ($this->detail instanceof Entity) {
-            $textParts[] = '"' . $this->detail->name . '"';
-        }
-
-        return implode(' ', $textParts);
-    }
-
-    public static function getDefault(string $event, Webhook $webhook, $detail, User $initiator, int $initiatedTime): self
-    {
-        $instance = new self($event, $webhook, $detail, $initiator, $initiatedTime);
-        $instance->addDefaultModelFormatters();
-
-        return $instance;
-    }
-}

app/Actions/WebhookTrackedEvent.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property int    $id
- * @property int    $webhook_id
- * @property string $event
- */
-class WebhookTrackedEvent extends Model
-{
-    protected $fillable = ['event'];
-
-    use HasFactory;
-}

app/Api/ApiDocsGenerator.php

@@ -1,21 +1,18 @@
-<?php
-
-namespace BookStack\Api;
+<?php namespace BookStack\Api;
 
 use BookStack\Http\Controllers\Api\ApiController;
-use Exception;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
-use Illuminate\Validation\Rules\Password;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionMethod;
 
 class ApiDocsGenerator
 {
+
     protected $reflectionClasses = [];
     protected $controllerClasses = [];
 
@@ -30,10 +27,9 @@ class ApiDocsGenerator
         if (Cache::has($cacheKey) && config('app.env') === 'production') {
             $docs = Cache::get($cacheKey);
         } else {
-            $docs = (new ApiDocsGenerator())->generate();
+            $docs = (new static())->generate();
             Cache::put($cacheKey, $docs, 60 * 24);
         }
-
         return $docs;
     }
 
@@ -46,7 +42,6 @@ class ApiDocsGenerator
         $apiRoutes = $this->loadDetailsFromControllers($apiRoutes);
         $apiRoutes = $this->loadDetailsFromFiles($apiRoutes);
         $apiRoutes = $apiRoutes->groupBy('base_model');
-
         return $apiRoutes;
     }
 
@@ -57,18 +52,11 @@ class ApiDocsGenerator
     {
         return $routes->map(function (array $route) {
             $exampleTypes = ['request', 'response'];
-            $fileTypes = ['json', 'http'];
             foreach ($exampleTypes as $exampleType) {
-                foreach ($fileTypes as $fileType) {
-                    $exampleFile = base_path("dev/api/{$exampleType}s/{$route['name']}." . $fileType);
-                    if (file_exists($exampleFile)) {
-                        $route["example_{$exampleType}"] = file_get_contents($exampleFile);
-                        continue 2;
-                    }
-                }
-                $route["example_{$exampleType}"] = null;
+                $exampleFile = base_path("dev/api/{$exampleType}s/{$route['name']}.json");
+                $exampleContent = file_exists($exampleFile) ? file_get_contents($exampleFile) : null;
+                $route["example_{$exampleType}"] = $exampleContent;
             }
-
             return $route;
         });
     }
@@ -83,14 +71,12 @@ class ApiDocsGenerator
             $comment = $method->getDocComment();
             $route['description'] = $comment ? $this->parseDescriptionFromMethodComment($comment) : null;
             $route['body_params'] = $this->getBodyParamsFromClass($route['controller'], $route['controller_method']);
-
             return $route;
         });
     }
 
     /**
      * Load body params and their rules by inspecting the given class and method name.
-     *
      * @throws BindingResolutionException
      */
     protected function getBodyParamsFromClass(string $className, string $methodName): ?array
@@ -102,51 +88,25 @@ class ApiDocsGenerator
             $this->controllerClasses[$className] = $class;
         }
 
-        $rules = collect($class->getValidationRules()[$methodName] ?? [])->map(function ($validations) {
-            return array_map(function ($validation) {
-                return $this->getValidationAsString($validation);
-            }, $validations);
-        })->toArray();
-
-        return empty($rules) ? null : $rules;
-    }
-
-    /**
-     * Convert the given validation message to a readable string.
-     */
-    protected function getValidationAsString($validation): string
-    {
-        if (is_string($validation)) {
-            return $validation;
+        $rules = $class->getValdationRules()[$methodName] ?? [];
+        foreach ($rules as $param => $ruleString) {
+            $rules[$param] = explode('|', $ruleString);
         }
-
-        if (is_object($validation) && method_exists($validation, '__toString')) {
-            return strval($validation);
-        }
-
-        if ($validation instanceof Password) {
-            return 'min:8';
-        }
-
-        $class = get_class($validation);
-
-        throw new Exception("Cannot provide string representation of rule for class: {$class}");
+        return count($rules) > 0 ? $rules : null;
     }
 
     /**
      * Parse out the description text from a class method comment.
      */
-    protected function parseDescriptionFromMethodComment(string $comment): string
+    protected function parseDescriptionFromMethodComment(string $comment)
     {
         $matches = [];
         preg_match_all('/^\s*?\*\s((?![@\s]).*?)$/m', $comment, $matches);
-
         return implode(' ', $matches[1] ?? []);
     }
 
     /**
      * Get a reflection method from the given class name and method name.
-     *
      * @throws ReflectionException
      */
     protected function getReflectionMethod(string $className, string $methodName): ReflectionMethod
@@ -171,15 +131,14 @@ class ApiDocsGenerator
             [$controller, $controllerMethod] = explode('@', $route->action['uses']);
             $baseModelName = explode('.', explode('/', $route->uri)[1])[0];
             $shortName = $baseModelName . '-' . $controllerMethod;
-
             return [
-                'name'                    => $shortName,
-                'uri'                     => $route->uri,
-                'method'                  => $route->methods[0],
-                'controller'              => $controller,
-                'controller_method'       => $controllerMethod,
+                'name' => $shortName,
+                'uri' => $route->uri,
+                'method' => $route->methods[0],
+                'controller' => $controller,
+                'controller_method' => $controllerMethod,
                 'controller_method_kebab' => Str::kebab($controllerMethod),
-                'base_model'              => $baseModelName,
+                'base_model' => $baseModelName,
             ];
         });
     }

app/Api/ApiToken.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Api;
+<?php namespace BookStack\Api;
 
 use BookStack\Auth\User;
 use BookStack\Interfaces\Loggable;
@@ -9,20 +7,19 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
 
 /**
- * Class ApiToken.
- *
- * @property int    $id
+ * Class ApiToken
+ * @property int $id
  * @property string $token_id
  * @property string $secret
  * @property string $name
  * @property Carbon $expires_at
- * @property User   $user
+ * @property User $user
  */
 class ApiToken extends Model implements Loggable
 {
     protected $fillable = ['name', 'expires_at'];
     protected $casts = [
-        'expires_at' => 'date:Y-m-d',
+        'expires_at' => 'date:Y-m-d'
     ];
 
     /**
@@ -43,7 +40,7 @@ class ApiToken extends Model implements Loggable
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function logDescriptor(): string
     {

app/Api/ApiTokenGuard.php

@@ -2,7 +2,6 @@
 
 namespace BookStack\Api;
 
-use BookStack\Auth\Access\LoginService;
 use BookStack\Exceptions\ApiAuthException;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable;
@@ -13,6 +12,7 @@ use Symfony\Component\HttpFoundation\Request;
 
 class ApiTokenGuard implements Guard
 {
+
     use GuardHelpers;
 
     /**
@@ -20,14 +20,9 @@ class ApiTokenGuard implements Guard
      */
     protected $request;
 
-    /**
-     * @var LoginService
-     */
-    protected $loginService;
 
     /**
      * The last auth exception thrown in this request.
-     *
      * @var ApiAuthException
      */
     protected $lastAuthException;
@@ -35,14 +30,13 @@ class ApiTokenGuard implements Guard
     /**
      * ApiTokenGuard constructor.
      */
-    public function __construct(Request $request, LoginService $loginService)
+    public function __construct(Request $request)
     {
         $this->request = $request;
-        $this->loginService = $loginService;
     }
-
+    
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function user()
     {
@@ -53,7 +47,6 @@ class ApiTokenGuard implements Guard
         }
 
         $user = null;
-
         try {
             $user = $this->getAuthorisedUserFromRequest();
         } catch (ApiAuthException $exception) {
@@ -61,20 +54,19 @@ class ApiTokenGuard implements Guard
         }
 
         $this->user = $user;
-
         return $user;
     }
 
     /**
      * Determine if current user is authenticated. If not, throw an exception.
      *
-     * @throws ApiAuthException
-     *
      * @return \Illuminate\Contracts\Auth\Authenticatable
+     *
+     * @throws ApiAuthException
      */
     public function authenticate()
     {
-        if (!is_null($user = $this->user())) {
+        if (! is_null($user = $this->user())) {
             return $user;
         }
 
@@ -87,7 +79,6 @@ class ApiTokenGuard implements Guard
 
     /**
      * Check the API token in the request and fetch a valid authorised user.
-     *
      * @throws ApiAuthException
      */
     protected function getAuthorisedUserFromRequest(): Authenticatable
@@ -102,16 +93,11 @@ class ApiTokenGuard implements Guard
 
         $this->validateToken($token, $secret);
 
-        if ($this->loginService->awaitingEmailConfirmation($token->user)) {
-            throw new ApiAuthException(trans('errors.email_confirmation_awaiting'));
-        }
-
         return $token->user;
     }
 
     /**
      * Validate the format of the token header value string.
-     *
      * @throws ApiAuthException
      */
     protected function validateTokenHeaderValue(string $authToken): void
@@ -128,7 +114,6 @@ class ApiTokenGuard implements Guard
     /**
      * Validate the given secret against the given token and ensure the token
      * currently has access to the instance API.
-     *
      * @throws ApiAuthException
      */
     protected function validateToken(?ApiToken $token, string $secret): void
@@ -152,7 +137,7 @@ class ApiTokenGuard implements Guard
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function validate(array $credentials = [])
     {

app/Api/ListingResponseBuilder.php

@@ -1,24 +1,16 @@
-<?php
+<?php namespace BookStack\Api;
 
-namespace BookStack\Api;
-
-use BookStack\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class ListingResponseBuilder
 {
+
     protected $query;
     protected $request;
     protected $fields;
 
-    /**
-     * @var array<callable>
-     */
-    protected $resultModifiers = [];
-
     protected $filterOperators = [
         'eq'   => '=',
         'ne'   => '!=',
@@ -26,12 +18,11 @@ class ListingResponseBuilder
         'lt'   => '<',
         'gte'  => '>=',
         'lte'  => '<=',
-        'like' => 'like',
+        'like' => 'like'
     ];
 
     /**
      * ListingResponseBuilder constructor.
-     * The given fields will be forced visible within the model results.
      */
     public function __construct(Builder $query, Request $request, array $fields)
     {
@@ -43,41 +34,26 @@ class ListingResponseBuilder
     /**
      * Get the response from this builder.
      */
-    public function toResponse(): JsonResponse
+    public function toResponse()
     {
         $filteredQuery = $this->filterQuery($this->query);
 
         $total = $filteredQuery->count();
-        $data = $this->fetchData($filteredQuery)->each(function ($model) {
-            foreach ($this->resultModifiers as $modifier) {
-                $modifier($model);
-            }
-        });
+        $data = $this->fetchData($filteredQuery);
 
         return response()->json([
-            'data'  => $data,
+            'data' => $data,
             'total' => $total,
         ]);
     }
 
     /**
-     * Add a callback to modify each element of the results.
-     *
-     * @param (callable(Model)) $modifier
-     */
-    public function modifyResults($modifier): void
-    {
-        $this->resultModifiers[] = $modifier;
-    }
-
-    /**
-     * Fetch the data to return within the response.
+     * Fetch the data to return in the response.
      */
     protected function fetchData(Builder $query): Collection
     {
         $query = $this->countAndOffsetQuery($query);
         $query = $this->sortQuery($query);
-
         return $query->get($this->fields);
     }
 
@@ -119,7 +95,6 @@ class ListingResponseBuilder
         }
 
         $queryOperator = $this->filterOperators[$filterOperator];
-
         return [$field, $queryOperator, $value];
     }
 

app/Application.php

@@ -4,11 +4,11 @@ namespace BookStack;
 
 class Application extends \Illuminate\Foundation\Application
 {
+
     /**
      * Get the path to the application configuration files.
      *
-     * @param string $path Optionally, a path to append to the config path
-     *
+     * @param  string  $path Optionally, a path to append to the config path
      * @return string
      */
     public function configPath($path = '')
@@ -18,6 +18,6 @@ class Application extends \Illuminate\Foundation\Application
             . 'app'
             . DIRECTORY_SEPARATOR
             . 'Config'
-            . ($path ? DIRECTORY_SEPARATOR . $path : $path);
+            . ($path ? DIRECTORY_SEPARATOR.$path : $path);
     }
 }

app/Auth/Access/EmailConfirmationService.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
 use BookStack\Auth\User;
 use BookStack\Exceptions\ConfirmationEmailException;
@@ -14,7 +12,7 @@ class EmailConfirmationService extends UserTokenService
     /**
      * Create new confirmation for a user,
      * Also removes any existing old ones.
-     *
+     * @param User $user
      * @throws ConfirmationEmailException
      */
     public function sendConfirmation(User $user)
@@ -31,8 +29,9 @@ class EmailConfirmationService extends UserTokenService
 
     /**
      * Check if confirmation is required in this instance.
+     * @return bool
      */
-    public function confirmationRequired(): bool
+    public function confirmationRequired() : bool
     {
         return setting('registration-confirmation')
             || setting('registration-restrict');

app/Auth/Access/ExternalAuthService.php

@@ -1,12 +1,12 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
 use BookStack\Auth\Role;
 use BookStack\Auth\User;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 
-class GroupSyncService
+class ExternalAuthService
 {
     /**
      * Check a role against an array of group names to see if it matches.
@@ -19,7 +19,6 @@ class GroupSyncService
         }
 
         $roleName = str_replace(' ', '-', trim(strtolower($role->display_name)));
-
         return in_array($roleName, $groupNames);
     }
 
@@ -58,15 +57,15 @@ class GroupSyncService
     }
 
     /**
-     * Sync the groups to the user roles for the current user.
+     * Sync the groups to the user roles for the current user
      */
-    public function syncUserWithFoundGroups(User $user, array $userGroups, bool $detachExisting): void
+    public function syncWithGroups(User $user, array $userGroups): void
     {
         // Get the ids for the roles from the names
         $groupsAsRoles = $this->matchGroupsToSystemsRoles($userGroups);
 
         // Sync groups
-        if ($detachExisting) {
+        if ($this->config['remove_from_groups']) {
             $user->roles()->sync($groupsAsRoles);
             $user->attachDefaultRole();
         } else {

app/Auth/Access/ExternalBaseUserProvider.php

@@ -4,10 +4,10 @@ namespace BookStack\Auth\Access;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
-use Illuminate\Database\Eloquent\Model;
 
 class ExternalBaseUserProvider implements UserProvider
 {
+
     /**
      * The user model.
      *
@@ -17,6 +17,7 @@ class ExternalBaseUserProvider implements UserProvider
 
     /**
      * LdapUserProvider constructor.
+     * @param             $model
      */
     public function __construct(string $model)
     {
@@ -26,21 +27,19 @@ class ExternalBaseUserProvider implements UserProvider
     /**
      * Create a new instance of the model.
      *
-     * @return Model
+     * @return \Illuminate\Database\Eloquent\Model
      */
     public function createModel()
     {
         $class = '\\' . ltrim($this->model, '\\');
-
-        return new $class();
+        return new $class;
     }
 
     /**
      * Retrieve a user by their unique identifier.
      *
-     * @param mixed $identifier
-     *
-     * @return Authenticatable|null
+     * @param  mixed $identifier
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveById($identifier)
     {
@@ -50,22 +49,21 @@ class ExternalBaseUserProvider implements UserProvider
     /**
      * Retrieve a user by their unique identifier and "remember me" token.
      *
-     * @param mixed  $identifier
-     * @param string $token
-     *
-     * @return Authenticatable|null
+     * @param  mixed  $identifier
+     * @param  string $token
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveByToken($identifier, $token)
     {
         return null;
     }
 
+
     /**
      * Update the "remember me" token for the given user in storage.
      *
-     * @param Authenticatable $user
-     * @param string          $token
-     *
+     * @param  \Illuminate\Contracts\Auth\Authenticatable $user
+     * @param  string                                     $token
      * @return void
      */
     public function updateRememberToken(Authenticatable $user, $token)
@@ -76,15 +74,13 @@ class ExternalBaseUserProvider implements UserProvider
     /**
      * Retrieve a user by the given credentials.
      *
-     * @param array $credentials
-     *
-     * @return Authenticatable|null
+     * @param  array $credentials
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveByCredentials(array $credentials)
     {
         // Search current user base by looking up a uid
         $model = $this->createModel();
-
         return $model->newQuery()
             ->where('external_auth_id', $credentials['external_auth_id'])
             ->first();
@@ -93,9 +89,8 @@ class ExternalBaseUserProvider implements UserProvider
     /**
      * Validate a user against the given credentials.
      *
-     * @param Authenticatable $user
-     * @param array           $credentials
-     *
+     * @param  \Illuminate\Contracts\Auth\Authenticatable $user
+     * @param  array                                      $credentials
      * @return bool
      */
     public function validateCredentials(Authenticatable $user, array $credentials)

app/Auth/Access/Guards/ExternalBaseSessionGuard.php

@@ -84,7 +84,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
         // If we've already retrieved the user for the current request we can just
         // return it back immediately. We do not want to fetch the user data on
         // every call to this method because that would be tremendously slow.
-        if (!is_null($this->user)) {
+        if (! is_null($this->user)) {
             return $this->user;
         }
 
@@ -92,7 +92,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
         // First we will try to load the user using the
         // identifier in the session if one exists.
-        if (!is_null($id)) {
+        if (! is_null($id)) {
             $this->user = $this->provider->retrieveById($id);
         }
 
@@ -118,8 +118,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Log a user into the application without sessions or cookies.
      *
-     * @param array $credentials
-     *
+     * @param  array  $credentials
      * @return bool
      */
     public function once(array $credentials = [])
@@ -136,13 +135,12 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Log the given user ID into the application without sessions or cookies.
      *
-     * @param mixed $id
-     *
+     * @param  mixed  $id
      * @return \Illuminate\Contracts\Auth\Authenticatable|false
      */
     public function onceUsingId($id)
     {
-        if (!is_null($user = $this->provider->retrieveById($id))) {
+        if (! is_null($user = $this->provider->retrieveById($id))) {
             $this->setUser($user);
 
             return $user;
@@ -154,8 +152,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Validate a user's credentials.
      *
-     * @param array $credentials
-     *
+     * @param  array  $credentials
      * @return bool
      */
     public function validate(array $credentials = [])
@@ -163,12 +160,12 @@ class ExternalBaseSessionGuard implements StatefulGuard
         return false;
     }
 
+
     /**
      * Attempt to authenticate a user using the given credentials.
      *
-     * @param array $credentials
-     * @param bool  $remember
-     *
+     * @param  array  $credentials
+     * @param  bool  $remember
      * @return bool
      */
     public function attempt(array $credentials = [], $remember = false)
@@ -179,24 +176,26 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Log the given user ID into the application.
      *
-     * @param mixed $id
-     * @param bool  $remember
-     *
+     * @param  mixed  $id
+     * @param  bool  $remember
      * @return \Illuminate\Contracts\Auth\Authenticatable|false
      */
     public function loginUsingId($id, $remember = false)
     {
-        // Always return false as to disable this method,
-        // Logins should route through LoginService.
+        if (! is_null($user = $this->provider->retrieveById($id))) {
+            $this->login($user, $remember);
+
+            return $user;
+        }
+
         return false;
     }
 
     /**
      * Log a user into the application.
      *
-     * @param \Illuminate\Contracts\Auth\Authenticatable $user
-     * @param bool                                       $remember
-     *
+     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param  bool  $remember
      * @return void
      */
     public function login(AuthenticatableContract $user, $remember = false)
@@ -209,8 +208,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Update the session with the given ID.
      *
-     * @param string $id
-     *
+     * @param  string  $id
      * @return void
      */
     protected function updateSession($id)
@@ -264,7 +262,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
      */
     public function getName()
     {
-        return 'login_' . $this->name . '_' . sha1(static::class);
+        return 'login_'.$this->name.'_'.sha1(static::class);
     }
 
     /**
@@ -290,8 +288,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Set the current user.
      *
-     * @param \Illuminate\Contracts\Auth\Authenticatable $user
-     *
+     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return $this
      */
     public function setUser(AuthenticatableContract $user)

app/Auth/Access/Guards/LdapSessionGuard.php

@@ -5,10 +5,9 @@ namespace BookStack\Auth\Access\Guards;
 use BookStack\Auth\Access\LdapService;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\User;
-use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\LdapException;
-use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
+use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\UserRegistrationException;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Session\Session;
@@ -16,7 +15,8 @@ use Illuminate\Support\Str;
 
 class LdapSessionGuard extends ExternalBaseSessionGuard
 {
-    protected LdapService $ldapService;
+
+    protected $ldapService;
 
     /**
      * LdapSessionGuard constructor.
@@ -36,10 +36,8 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
      * Validate a user's credentials.
      *
      * @param array $credentials
-     *
-     * @throws LdapException
-     *
      * @return bool
+     * @throws LdapException
      */
     public function validate(array $credentials = [])
     {
@@ -47,7 +45,7 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
 
         if (isset($userDetails['uid'])) {
             $this->lastAttempted = $this->provider->retrieveByCredentials([
-                'external_auth_id' => $userDetails['uid'],
+                'external_auth_id' => $userDetails['uid']
             ]);
         }
 
@@ -58,13 +56,10 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
      * Attempt to authenticate a user using the given credentials.
      *
      * @param array $credentials
-     * @param bool  $remember
-     *
-     * @throws LdapException*@throws \BookStack\Exceptions\JsonDebugException
-     * @throws LoginAttemptException
-     * @throws JsonDebugException
-     *
+     * @param bool $remember
      * @return bool
+     * @throws LoginAttemptException
+     * @throws LdapException
      */
     public function attempt(array $credentials = [], $remember = false)
     {
@@ -74,7 +69,7 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
         $user = null;
         if (isset($userDetails['uid'])) {
             $this->lastAttempted = $user = $this->provider->retrieveByCredentials([
-                'external_auth_id' => $userDetails['uid'],
+                'external_auth_id' => $userDetails['uid']
             ]);
         }
 
@@ -86,7 +81,7 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
             try {
                 $user = $this->createNewFromLdapAndCreds($userDetails, $credentials);
             } catch (UserRegistrationException $exception) {
-                throw new LoginAttemptException($exception->getMessage());
+                throw new LoginAttemptException($exception->message);
             }
         }
 
@@ -95,19 +90,12 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
             $this->ldapService->syncGroups($user, $username);
         }
 
-        // Attach avatar if non-existent
-        if (!$user->avatar()->exists()) {
-            $this->ldapService->saveAndAttachAvatar($user, $userDetails);
-        }
-
         $this->login($user, $remember);
-
         return true;
     }
 
     /**
-     * Create a new user from the given ldap credentials and login credentials.
-     *
+     * Create a new user from the given ldap credentials and login credentials
      * @throws LoginAttemptEmailNeededException
      * @throws LoginAttemptException
      * @throws UserRegistrationException
@@ -121,15 +109,12 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
         }
 
         $details = [
-            'name'             => $ldapUserDetails['name'],
-            'email'            => $ldapUserDetails['email'] ?: $credentials['email'],
+            'name' => $ldapUserDetails['name'],
+            'email' => $ldapUserDetails['email'] ?: $credentials['email'],
             'external_auth_id' => $ldapUserDetails['uid'],
-            'password'         => Str::random(32),
+            'password' => Str::random(32),
         ];
 
-        $user = $this->registrationService->registerUser($details, null, false);
-        $this->ldapService->saveAndAttachAvatar($user, $ldapUserDetails);
-
-        return $user;
+        return $this->registrationService->registerUser($details, null, false);
     }
 }

app/Auth/Access/Guards/Saml2SessionGuard.php

@@ -3,20 +3,19 @@
 namespace BookStack\Auth\Access\Guards;
 
 /**
- * Saml2 Session Guard.
+ * Saml2 Session Guard
  *
  * The saml2 login process is async in nature meaning it does not fit very well
  * into the default laravel 'Guard' auth flow. Instead most of the logic is done
  * via the Saml2 controller & Saml2Service. This class provides a safer, thin
  * version of SessionGuard.
  */
-class AsyncExternalBaseSessionGuard extends ExternalBaseSessionGuard
+class Saml2SessionGuard extends ExternalBaseSessionGuard
 {
     /**
      * Validate a user's credentials.
      *
      * @param array $credentials
-     *
      * @return bool
      */
     public function validate(array $credentials = [])
@@ -28,8 +27,7 @@ class AsyncExternalBaseSessionGuard extends ExternalBaseSessionGuard
      * Attempt to authenticate a user using the given credentials.
      *
      * @param array $credentials
-     * @param bool  $remember
-     *
+     * @param bool $remember
      * @return bool
      */
     public function attempt(array $credentials = [], $remember = false)

app/Auth/Access/Ldap.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
 /**
  * Class Ldap
@@ -9,23 +7,26 @@ namespace BookStack\Auth\Access;
  */
 class Ldap
 {
+
     /**
-     * Connect to an LDAP server.
-     *
+     * Connect to a LDAP server.
+     * @param string $hostName
+     * @param int    $port
      * @return resource
      */
-    public function connect(string $hostName, int $port)
+    public function connect($hostName, $port)
     {
         return ldap_connect($hostName, $port);
     }
 
     /**
      * Set the value of a LDAP option for the given connection.
-     *
      * @param resource $ldapConnection
-     * @param mixed    $value
+     * @param int $option
+     * @param mixed $value
+     * @return bool
      */
-    public function setOption($ldapConnection, int $option, $value): bool
+    public function setOption($ldapConnection, $option, $value)
     {
         return ldap_set_option($ldapConnection, $option, $value);
     }
@@ -40,22 +41,21 @@ class Ldap
 
     /**
      * Set the version number for the given ldap connection.
-     *
-     * @param resource $ldapConnection
+     * @param $ldapConnection
+     * @param $version
+     * @return bool
      */
-    public function setVersion($ldapConnection, int $version): bool
+    public function setVersion($ldapConnection, $version)
     {
         return $this->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $version);
     }
 
     /**
      * Search LDAP tree using the provided filter.
-     *
      * @param resource   $ldapConnection
      * @param string     $baseDn
      * @param string     $filter
      * @param array|null $attributes
-     *
      * @return resource
      */
     public function search($ldapConnection, $baseDn, $filter, array $attributes = null)
@@ -65,10 +65,8 @@ class Ldap
 
     /**
      * Get entries from an ldap search result.
-     *
      * @param resource $ldapConnection
      * @param resource $ldapSearchResult
-     *
      * @return array
      */
     public function getEntries($ldapConnection, $ldapSearchResult)
@@ -78,28 +76,23 @@ class Ldap
 
     /**
      * Search and get entries immediately.
-     *
      * @param resource   $ldapConnection
      * @param string     $baseDn
      * @param string     $filter
      * @param array|null $attributes
-     *
      * @return resource
      */
     public function searchAndGetEntries($ldapConnection, $baseDn, $filter, array $attributes = null)
     {
         $search = $this->search($ldapConnection, $baseDn, $filter, $attributes);
-
         return $this->getEntries($ldapConnection, $search);
     }
 
     /**
      * Bind to LDAP directory.
-     *
      * @param resource $ldapConnection
      * @param string   $bindRdn
      * @param string   $bindPassword
-     *
      * @return bool
      */
     public function bind($ldapConnection, $bindRdn = null, $bindPassword = null)
@@ -109,10 +102,8 @@ class Ldap
 
     /**
      * Explode a LDAP dn string into an array of components.
-     *
      * @param string $dn
-     * @param int    $withAttrib
-     *
+     * @param int $withAttrib
      * @return array
      */
     public function explodeDn(string $dn, int $withAttrib)
@@ -122,14 +113,12 @@ class Ldap
 
     /**
      * Escape a string for use in an LDAP filter.
-     *
      * @param string $value
      * @param string $ignore
-     * @param int    $flags
-     *
+     * @param int $flags
      * @return string
      */
-    public function escape(string $value, string $ignore = '', int $flags = 0)
+    public function escape(string $value, string $ignore = "", int $flags = 0)
     {
         return ldap_escape($value, $ignore, $flags);
     }

app/Auth/Access/LdapService.php

@@ -1,55 +1,43 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
 use BookStack\Auth\User;
 use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\LdapException;
-use BookStack\Uploads\UserAvatars;
 use ErrorException;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class LdapService
  * Handles any app-specific LDAP tasks.
  */
-class LdapService
+class LdapService extends ExternalAuthService
 {
-    protected Ldap $ldap;
-    protected GroupSyncService $groupSyncService;
-    protected UserAvatars $userAvatars;
 
-    /**
-     * @var resource
-     */
+    protected $ldap;
     protected $ldapConnection;
-
-    protected array $config;
-    protected bool $enabled;
+    protected $config;
+    protected $enabled;
 
     /**
      * LdapService constructor.
      */
-    public function __construct(Ldap $ldap, UserAvatars $userAvatars, GroupSyncService $groupSyncService)
+    public function __construct(Ldap $ldap)
     {
         $this->ldap = $ldap;
-        $this->userAvatars = $userAvatars;
-        $this->groupSyncService = $groupSyncService;
         $this->config = config('services.ldap');
         $this->enabled = config('auth.method') === 'ldap';
     }
 
     /**
      * Check if groups should be synced.
+     * @return bool
      */
-    public function shouldSyncGroups(): bool
+    public function shouldSyncGroups()
     {
         return $this->enabled && $this->config['user_to_groups'] !== false;
     }
 
     /**
      * Search for attributes for a specific user on the ldap.
-     *
      * @throws LdapException
      */
     private function getUserWithAttributes(string $userName, array $attributes): ?array
@@ -81,7 +69,6 @@ class LdapService
     /**
      * Get the details of a user from LDAP using the given username.
      * User found via configurable user filter.
-     *
      * @throws LdapException
      */
     public function getUserDetails(string $userName): ?array
@@ -89,28 +76,24 @@ class LdapService
         $idAttr = $this->config['id_attribute'];
         $emailAttr = $this->config['email_attribute'];
         $displayNameAttr = $this->config['display_name_attribute'];
-        $thumbnailAttr = $this->config['thumbnail_attribute'];
 
-        $user = $this->getUserWithAttributes($userName, array_filter([
-            'cn', 'dn', $idAttr, $emailAttr, $displayNameAttr, $thumbnailAttr,
-        ]));
+        $user = $this->getUserWithAttributes($userName, ['cn', 'dn', $idAttr, $emailAttr, $displayNameAttr]);
 
-        if (is_null($user)) {
+        if ($user === null) {
             return null;
         }
 
         $userCn = $this->getUserResponseProperty($user, 'cn', null);
         $formatted = [
-            'uid'   => $this->getUserResponseProperty($user, $idAttr, $user['dn']),
-            'name'  => $this->getUserResponseProperty($user, $displayNameAttr, $userCn),
-            'dn'    => $user['dn'],
+            'uid' => $this->getUserResponseProperty($user, $idAttr, $user['dn']),
+            'name' => $this->getUserResponseProperty($user, $displayNameAttr, $userCn),
+            'dn' => $user['dn'],
             'email' => $this->getUserResponseProperty($user, $emailAttr, null),
-            'avatar'=> $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
         ];
 
         if ($this->config['dump_user_details']) {
             throw new JsonDebugException([
-                'details_from_ldap'        => $user,
+                'details_from_ldap' => $user,
                 'details_bookstack_parsed' => $formatted,
             ]);
         }
@@ -146,7 +129,6 @@ class LdapService
 
     /**
      * Check if the given credentials are valid for the given user.
-     *
      * @throws LdapException
      */
     public function validateUserCredentials(?array $ldapUserDetails, string $password): bool
@@ -156,7 +138,6 @@ class LdapService
         }
 
         $ldapConnection = $this->getConnection();
-
         try {
             $ldapBind = $this->ldap->bind($ldapConnection, $ldapUserDetails['dn'], $password);
         } catch (ErrorException $e) {
@@ -169,9 +150,7 @@ class LdapService
     /**
      * Bind the system user to the LDAP connection using the given credentials
      * otherwise anonymous access is attempted.
-     *
-     * @param resource $connection
-     *
+     * @param $connection
      * @throws LdapException
      */
     protected function bindSystemUser($connection)
@@ -194,10 +173,8 @@ class LdapService
     /**
      * Get the connection to the LDAP server.
      * Creates a new connection if one does not exist.
-     *
-     * @throws LdapException
-     *
      * @return resource
+     * @throws LdapException
      */
     protected function getConnection()
     {
@@ -237,7 +214,6 @@ class LdapService
         }
 
         $this->ldapConnection = $ldapConnection;
-
         return $this->ldapConnection;
     }
 
@@ -257,7 +233,6 @@ class LdapService
         // Otherwise, extract the port out
         $hostName = $serverNameParts[0];
         $ldapPort = (count($serverNameParts) > 1) ? intval($serverNameParts[1]) : 389;
-
         return ['host' => $hostName, 'port' => $ldapPort];
     }
 
@@ -271,15 +246,12 @@ class LdapService
             $newKey = '${' . $key . '}';
             $newAttrs[$newKey] = $this->ldap->escape($attrText);
         }
-
         return strtr($filterString, $newAttrs);
     }
 
     /**
      * Get the groups a user is a part of on ldap.
-     *
      * @throws LdapException
-     * @throws JsonDebugException
      */
     public function getUserGroups(string $userName): array
     {
@@ -291,22 +263,12 @@ class LdapService
         }
 
         $userGroups = $this->groupFilter($user);
-        $allGroups = $this->getGroupsRecursive($userGroups, []);
-
-        if ($this->config['dump_user_groups']) {
-            throw new JsonDebugException([
-                'details_from_ldap'             => $user,
-                'parsed_direct_user_groups'     => $userGroups,
-                'parsed_recursive_user_groups'  => $allGroups,
-            ]);
-        }
-
-        return $allGroups;
+        $userGroups = $this->getGroupsRecursive($userGroups, []);
+        return $userGroups;
     }
 
     /**
      * Get the parent groups of an array of groups.
-     *
      * @throws LdapException
      */
     private function getGroupsRecursive(array $groupsArray, array $checked): array
@@ -333,7 +295,6 @@ class LdapService
 
     /**
      * Get the parent groups of a single group.
-     *
      * @throws LdapException
      */
     private function getGroupGroups(string $groupName): array
@@ -367,7 +328,7 @@ class LdapService
         $count = 0;
 
         if (isset($userGroupSearchResponse[$groupsAttr]['count'])) {
-            $count = (int) $userGroupSearchResponse[$groupsAttr]['count'];
+            $count = (int)$userGroupSearchResponse[$groupsAttr]['count'];
         }
 
         for ($i = 0; $i < $count; $i++) {
@@ -382,31 +343,11 @@ class LdapService
 
     /**
      * Sync the LDAP groups to the user roles for the current user.
-     *
      * @throws LdapException
-     * @throws JsonDebugException
      */
     public function syncGroups(User $user, string $username)
     {
         $userLdapGroups = $this->getUserGroups($username);
-        $this->groupSyncService->syncUserWithFoundGroups($user, $userLdapGroups, $this->config['remove_from_groups']);
-    }
-
-    /**
-     * Save and attach an avatar image, if found in the ldap details, and attach
-     * to the given user model.
-     */
-    public function saveAndAttachAvatar(User $user, array $ldapUserDetails): void
-    {
-        if (is_null(config('services.ldap.thumbnail_attribute')) || is_null($ldapUserDetails['avatar'])) {
-            return;
-        }
-
-        try {
-            $imageData = $ldapUserDetails['avatar'];
-            $this->userAvatars->assignToUserFromExistingData($user, $imageData, 'jpg');
-        } catch (\Exception $exception) {
-            Log::info("Failed to use avatar image from LDAP data for user id {$user->id}");
-        }
+        $this->syncWithGroups($user, $userLdapGroups);
     }
 }

app/Auth/Access/LoginService.php

@@ -1,164 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access;
-
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\Mfa\MfaSession;
-use BookStack\Auth\User;
-use BookStack\Exceptions\StoppedAuthenticationException;
-use BookStack\Facades\Activity;
-use BookStack\Facades\Theme;
-use BookStack\Theming\ThemeEvents;
-use Exception;
-
-class LoginService
-{
-    protected const LAST_LOGIN_ATTEMPTED_SESSION_KEY = 'auth-login-last-attempted';
-
-    protected $mfaSession;
-    protected $emailConfirmationService;
-
-    public function __construct(MfaSession $mfaSession, EmailConfirmationService $emailConfirmationService)
-    {
-        $this->mfaSession = $mfaSession;
-        $this->emailConfirmationService = $emailConfirmationService;
-    }
-
-    /**
-     * Log the given user into the system.
-     * Will start a login of the given user but will prevent if there's
-     * a reason to (MFA or Unconfirmed Email).
-     * Returns a boolean to indicate the current login result.
-     *
-     * @throws StoppedAuthenticationException
-     */
-    public function login(User $user, string $method, bool $remember = false): void
-    {
-        if ($this->awaitingEmailConfirmation($user) || $this->needsMfaVerification($user)) {
-            $this->setLastLoginAttemptedForUser($user, $method, $remember);
-
-            throw new StoppedAuthenticationException($user, $this);
-        }
-
-        $this->clearLastLoginAttempted();
-        auth()->login($user, $remember);
-        Activity::add(ActivityType::AUTH_LOGIN, "{$method}; {$user->logDescriptor()}");
-        Theme::dispatch(ThemeEvents::AUTH_LOGIN, $method, $user);
-
-        // Authenticate on all session guards if a likely admin
-        if ($user->can('users-manage') && $user->can('user-roles-manage')) {
-            $guards = ['standard', 'ldap', 'saml2', 'oidc'];
-            foreach ($guards as $guard) {
-                auth($guard)->login($user);
-            }
-        }
-    }
-
-    /**
-     * Reattempt a system login after a previous stopped attempt.
-     *
-     * @throws Exception
-     */
-    public function reattemptLoginFor(User $user)
-    {
-        if ($user->id !== ($this->getLastLoginAttemptUser()->id ?? null)) {
-            throw new Exception('Login reattempt user does align with current session state');
-        }
-
-        $lastLoginDetails = $this->getLastLoginAttemptDetails();
-        $this->login($user, $lastLoginDetails['method'], $lastLoginDetails['remember'] ?? false);
-    }
-
-    /**
-     * Get the last user that was attempted to be logged in.
-     * Only exists if the last login attempt had correct credentials
-     * but had been prevented by a secondary factor.
-     */
-    public function getLastLoginAttemptUser(): ?User
-    {
-        $id = $this->getLastLoginAttemptDetails()['user_id'];
-
-        return User::query()->where('id', '=', $id)->first();
-    }
-
-    /**
-     * Get the details of the last login attempt.
-     * Checks upon a ttl of about 1 hour since that last attempted login.
-     *
-     * @return array{user_id: ?string, method: ?string, remember: bool}
-     */
-    protected function getLastLoginAttemptDetails(): array
-    {
-        $value = session()->get(self::LAST_LOGIN_ATTEMPTED_SESSION_KEY);
-        if (!$value) {
-            return ['user_id' => null, 'method' => null];
-        }
-
-        [$id, $method, $remember, $time] = explode(':', $value);
-        $hourAgo = time() - (60 * 60);
-        if ($time < $hourAgo) {
-            $this->clearLastLoginAttempted();
-
-            return ['user_id' => null, 'method' => null];
-        }
-
-        return ['user_id' => $id, 'method' => $method, 'remember' => boolval($remember)];
-    }
-
-    /**
-     * Set the last login attempted user.
-     * Must be only used when credentials are correct and a login could be
-     * achieved but a secondary factor has stopped the login.
-     */
-    protected function setLastLoginAttemptedForUser(User $user, string $method, bool $remember)
-    {
-        session()->put(
-            self::LAST_LOGIN_ATTEMPTED_SESSION_KEY,
-            implode(':', [$user->id, $method, $remember, time()])
-        );
-    }
-
-    /**
-     * Clear the last login attempted session value.
-     */
-    protected function clearLastLoginAttempted(): void
-    {
-        session()->remove(self::LAST_LOGIN_ATTEMPTED_SESSION_KEY);
-    }
-
-    /**
-     * Check if MFA verification is needed.
-     */
-    public function needsMfaVerification(User $user): bool
-    {
-        return !$this->mfaSession->isVerifiedForUser($user) && $this->mfaSession->isRequiredForUser($user);
-    }
-
-    /**
-     * Check if the given user is awaiting email confirmation.
-     */
-    public function awaitingEmailConfirmation(User $user): bool
-    {
-        return $this->emailConfirmationService->confirmationRequired() && !$user->email_confirmed;
-    }
-
-    /**
-     * Attempt the login of a user using the given credentials.
-     * Meant to mirror Laravel's default guard 'attempt' method
-     * but in a manner that always routes through our login system.
-     * May interrupt the flow if extra authentication requirements are imposed.
-     *
-     * @throws StoppedAuthenticationException
-     */
-    public function attempt(array $credentials, string $method, bool $remember = false): bool
-    {
-        $result = auth()->attempt($credentials, $remember);
-        if ($result) {
-            $user = auth()->user();
-            auth()->logout();
-            $this->login($user, $method, $remember);
-        }
-
-        return $result;
-    }
-}

app/Auth/Access/Mfa/BackupCodeService.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Mfa;
-
-use Illuminate\Support\Str;
-
-class BackupCodeService
-{
-    /**
-     * Generate a new set of 16 backup codes.
-     */
-    public function generateNewSet(): array
-    {
-        $codes = [];
-        while (count($codes) < 16) {
-            $code = Str::random(5) . '-' . Str::random(5);
-            if (!in_array($code, $codes)) {
-                $codes[] = strtolower($code);
-            }
-        }
-
-        return $codes;
-    }
-
-    /**
-     * Check if the given code matches one of the available options.
-     */
-    public function inputCodeExistsInSet(string $code, string $codeSet): bool
-    {
-        $cleanCode = $this->cleanInputCode($code);
-        $codes = json_decode($codeSet);
-
-        return in_array($cleanCode, $codes);
-    }
-
-    /**
-     * Remove the given input code from the given available options.
-     * Will return a JSON string containing the codes.
-     */
-    public function removeInputCodeFromSet(string $code, string $codeSet): string
-    {
-        $cleanCode = $this->cleanInputCode($code);
-        $codes = json_decode($codeSet);
-        $pos = array_search($cleanCode, $codes, true);
-        array_splice($codes, $pos, 1);
-
-        return json_encode($codes);
-    }
-
-    /**
-     * Count the number of codes in the given set.
-     */
-    public function countCodesInSet(string $codeSet): int
-    {
-        return count(json_decode($codeSet));
-    }
-
-    protected function cleanInputCode(string $code): string
-    {
-        return strtolower(str_replace(' ', '-', trim($code)));
-    }
-}

app/Auth/Access/Mfa/MfaSession.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Mfa;
-
-use BookStack\Auth\User;
-
-class MfaSession
-{
-    /**
-     * Check if MFA is required for the given user.
-     */
-    public function isRequiredForUser(User $user): bool
-    {
-        // TODO - Test both these cases
-        return $user->mfaValues()->exists() || $this->userRoleEnforcesMfa($user);
-    }
-
-    /**
-     * Check if the given user is pending MFA setup.
-     * (MFA required but not yet configured).
-     */
-    public function isPendingMfaSetup(User $user): bool
-    {
-        return $this->isRequiredForUser($user) && !$user->mfaValues()->exists();
-    }
-
-    /**
-     * Check if a role of the given user enforces MFA.
-     */
-    protected function userRoleEnforcesMfa(User $user): bool
-    {
-        return $user->roles()
-            ->where('mfa_enforced', '=', true)
-            ->exists();
-    }
-
-    /**
-     * Check if the current MFA session has already been verified for the given user.
-     */
-    public function isVerifiedForUser(User $user): bool
-    {
-        return session()->get($this->getMfaVerifiedSessionKey($user)) === 'true';
-    }
-
-    /**
-     * Mark the current session as MFA-verified.
-     */
-    public function markVerifiedForUser(User $user): void
-    {
-        session()->put($this->getMfaVerifiedSessionKey($user), 'true');
-    }
-
-    /**
-     * Get the session key in which the MFA verification status is stored.
-     */
-    protected function getMfaVerifiedSessionKey(User $user): string
-    {
-        return 'mfa-verification-passed:' . $user->id;
-    }
-}

app/Auth/Access/Mfa/MfaValue.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Mfa;
-
-use BookStack\Auth\User;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property int    $id
- * @property int    $user_id
- * @property string $method
- * @property string $value
- * @property Carbon $created_at
- * @property Carbon $updated_at
- */
-class MfaValue extends Model
-{
-    protected static $unguarded = true;
-
-    const METHOD_TOTP = 'totp';
-    const METHOD_BACKUP_CODES = 'backup_codes';
-
-    /**
-     * Get all the MFA methods available.
-     */
-    public static function allMethods(): array
-    {
-        return [self::METHOD_TOTP, self::METHOD_BACKUP_CODES];
-    }
-
-    /**
-     * Upsert a new MFA value for the given user and method
-     * using the provided value.
-     */
-    public static function upsertWithValue(User $user, string $method, string $value): void
-    {
-        /** @var MfaValue $mfaVal */
-        $mfaVal = static::query()->firstOrNew([
-            'user_id' => $user->id,
-            'method'  => $method,
-        ]);
-        $mfaVal->setValue($value);
-        $mfaVal->save();
-    }
-
-    /**
-     * Easily get the decrypted MFA value for the given user and method.
-     */
-    public static function getValueForUser(User $user, string $method): ?string
-    {
-        /** @var MfaValue $mfaVal */
-        $mfaVal = static::query()
-            ->where('user_id', '=', $user->id)
-            ->where('method', '=', $method)
-            ->first();
-
-        return $mfaVal ? $mfaVal->getValue() : null;
-    }
-
-    /**
-     * Decrypt the value attribute upon access.
-     */
-    protected function getValue(): string
-    {
-        return decrypt($this->value);
-    }
-
-    /**
-     * Encrypt the value attribute upon access.
-     */
-    protected function setValue($value): void
-    {
-        $this->value = encrypt($value);
-    }
-}

app/Auth/Access/Mfa/TotpService.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Mfa;
-
-use BaconQrCode\Renderer\Color\Rgb;
-use BaconQrCode\Renderer\Image\SvgImageBackEnd;
-use BaconQrCode\Renderer\ImageRenderer;
-use BaconQrCode\Renderer\RendererStyle\Fill;
-use BaconQrCode\Renderer\RendererStyle\RendererStyle;
-use BaconQrCode\Writer;
-use BookStack\Auth\User;
-use PragmaRX\Google2FA\Google2FA;
-use PragmaRX\Google2FA\Support\Constants;
-
-class TotpService
-{
-    protected $google2fa;
-
-    public function __construct(Google2FA $google2fa)
-    {
-        $this->google2fa = $google2fa;
-        // Use SHA1 as a default, Personal testing of other options in 2021 found
-        // many apps lack support for other algorithms yet still will scan
-        // the code causing a confusing UX.
-        $this->google2fa->setAlgorithm(Constants::SHA1);
-    }
-
-    /**
-     * Generate a new totp secret key.
-     */
-    public function generateSecret(): string
-    {
-        /** @noinspection PhpUnhandledExceptionInspection */
-        return $this->google2fa->generateSecretKey();
-    }
-
-    /**
-     * Generate a TOTP URL from secret key.
-     */
-    public function generateUrl(string $secret, User $user): string
-    {
-        return $this->google2fa->getQRCodeUrl(
-            setting('app-name'),
-            $user->email,
-            $secret
-        );
-    }
-
-    /**
-     * Generate a QR code to display a TOTP URL.
-     */
-    public function generateQrCodeSvg(string $url): string
-    {
-        $color = Fill::uniformColor(new Rgb(255, 255, 255), new Rgb(32, 110, 167));
-
-        return (new Writer(
-            new ImageRenderer(
-                new RendererStyle(192, 4, null, null, $color),
-                new SvgImageBackEnd()
-            )
-        ))->writeString($url);
-    }
-
-    /**
-     * Verify that the user provided code is valid for the secret.
-     * The secret must be known, not user-provided.
-     */
-    public function verifyCode(string $code, string $secret): bool
-    {
-        /** @noinspection PhpUnhandledExceptionInspection */
-        return $this->google2fa->verifyKey($secret, $code);
-    }
-}

app/Auth/Access/Mfa/TotpValidationRule.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Mfa;
-
-use Illuminate\Contracts\Validation\Rule;
-
-class TotpValidationRule implements Rule
-{
-    protected $secret;
-    protected $totpService;
-
-    /**
-     * Create a new rule instance.
-     * Takes the TOTP secret that must be system provided, not user provided.
-     */
-    public function __construct(string $secret)
-    {
-        $this->secret = $secret;
-        $this->totpService = app()->make(TotpService::class);
-    }
-
-    /**
-     * Determine if the validation rule passes.
-     */
-    public function passes($attribute, $value)
-    {
-        return $this->totpService->verifyCode($value, $this->secret);
-    }
-
-    /**
-     * Get the validation error message.
-     */
-    public function message()
-    {
-        return trans('validation.totp');
-    }
-}

app/Auth/Access/Oidc/OidcAccessToken.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use InvalidArgumentException;
-use League\OAuth2\Client\Token\AccessToken;
-
-class OidcAccessToken extends AccessToken
-{
-    /**
-     * Constructs an access token.
-     *
-     * @param array $options An array of options returned by the service provider
-     *                       in the access token request. The `access_token` option is required.
-     *
-     * @throws InvalidArgumentException if `access_token` is not provided in `$options`.
-     */
-    public function __construct(array $options = [])
-    {
-        parent::__construct($options);
-        $this->validate($options);
-    }
-
-    /**
-     * Validate this access token response for OIDC.
-     * As per https://openid.net/specs/openid-connect-basic-1_0.html#TokenOK.
-     */
-    private function validate(array $options): void
-    {
-        // access_token: REQUIRED. Access Token for the UserInfo Endpoint.
-        // Performed on the extended class
-
-        // token_type: REQUIRED. OAuth 2.0 Token Type value. The value MUST be Bearer, as specified in OAuth 2.0
-        // Bearer Token Usage [RFC6750], for Clients using this subset.
-        // Note that the token_type value is case-insensitive.
-        if (strtolower(($options['token_type'] ?? '')) !== 'bearer') {
-            throw new InvalidArgumentException('The response token type MUST be "Bearer"');
-        }
-
-        // id_token: REQUIRED. ID Token.
-        if (empty($options['id_token'])) {
-            throw new InvalidArgumentException('An "id_token" property must be provided');
-        }
-    }
-
-    /**
-     * Get the id token value from this access token response.
-     */
-    public function getIdToken(): string
-    {
-        return $this->getValues()['id_token'];
-    }
-}

app/Auth/Access/Oidc/OidcException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use Exception;
-
-class OidcException extends Exception
-{
-}

app/Auth/Access/Oidc/OidcIdToken.php

@@ -1,238 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-class OidcIdToken
-{
-    /**
-     * @var array
-     */
-    protected $header;
-
-    /**
-     * @var array
-     */
-    protected $payload;
-
-    /**
-     * @var string
-     */
-    protected $signature;
-
-    /**
-     * @var array[]|string[]
-     */
-    protected $keys;
-
-    /**
-     * @var string
-     */
-    protected $issuer;
-
-    /**
-     * @var array
-     */
-    protected $tokenParts = [];
-
-    public function __construct(string $token, string $issuer, array $keys)
-    {
-        $this->keys = $keys;
-        $this->issuer = $issuer;
-        $this->parse($token);
-    }
-
-    /**
-     * Parse the token content into its components.
-     */
-    protected function parse(string $token): void
-    {
-        $this->tokenParts = explode('.', $token);
-        $this->header = $this->parseEncodedTokenPart($this->tokenParts[0]);
-        $this->payload = $this->parseEncodedTokenPart($this->tokenParts[1] ?? '');
-        $this->signature = $this->base64UrlDecode($this->tokenParts[2] ?? '') ?: '';
-    }
-
-    /**
-     * Parse a Base64-JSON encoded token part.
-     * Returns the data as a key-value array or empty array upon error.
-     */
-    protected function parseEncodedTokenPart(string $part): array
-    {
-        $json = $this->base64UrlDecode($part) ?: '{}';
-        $decoded = json_decode($json, true);
-
-        return is_array($decoded) ? $decoded : [];
-    }
-
-    /**
-     * Base64URL decode. Needs some character conversions to be compatible
-     * with PHP's default base64 handling.
-     */
-    protected function base64UrlDecode(string $encoded): string
-    {
-        return base64_decode(strtr($encoded, '-_', '+/'));
-    }
-
-    /**
-     * Validate all possible parts of the id token.
-     *
-     * @throws OidcInvalidTokenException
-     */
-    public function validate(string $clientId): bool
-    {
-        $this->validateTokenStructure();
-        $this->validateTokenSignature();
-        $this->validateTokenClaims($clientId);
-
-        return true;
-    }
-
-    /**
-     * Fetch a specific claim from this token.
-     * Returns null if it is null or does not exist.
-     *
-     * @return mixed|null
-     */
-    public function getClaim(string $claim)
-    {
-        return $this->payload[$claim] ?? null;
-    }
-
-    /**
-     * Get all returned claims within the token.
-     */
-    public function getAllClaims(): array
-    {
-        return $this->payload;
-    }
-
-    /**
-     * Validate the structure of the given token and ensure we have the required pieces.
-     * As per https://datatracker.ietf.org/doc/html/rfc7519#section-7.2.
-     *
-     * @throws OidcInvalidTokenException
-     */
-    protected function validateTokenStructure(): void
-    {
-        foreach (['header', 'payload'] as $prop) {
-            if (empty($this->$prop) || !is_array($this->$prop)) {
-                throw new OidcInvalidTokenException("Could not parse out a valid {$prop} within the provided token");
-            }
-        }
-
-        if (empty($this->signature) || !is_string($this->signature)) {
-            throw new OidcInvalidTokenException('Could not parse out a valid signature within the provided token');
-        }
-    }
-
-    /**
-     * Validate the signature of the given token and ensure it validates against the provided key.
-     *
-     * @throws OidcInvalidTokenException
-     */
-    protected function validateTokenSignature(): void
-    {
-        if ($this->header['alg'] !== 'RS256') {
-            throw new OidcInvalidTokenException("Only RS256 signature validation is supported. Token reports using {$this->header['alg']}");
-        }
-
-        $parsedKeys = array_map(function ($key) {
-            try {
-                return new OidcJwtSigningKey($key);
-            } catch (OidcInvalidKeyException $e) {
-                throw new OidcInvalidTokenException('Failed to read signing key with error: ' . $e->getMessage());
-            }
-        }, $this->keys);
-
-        $parsedKeys = array_filter($parsedKeys);
-
-        $contentToSign = $this->tokenParts[0] . '.' . $this->tokenParts[1];
-        /** @var OidcJwtSigningKey $parsedKey */
-        foreach ($parsedKeys as $parsedKey) {
-            if ($parsedKey->verify($contentToSign, $this->signature)) {
-                return;
-            }
-        }
-
-        throw new OidcInvalidTokenException('Token signature could not be validated using the provided keys');
-    }
-
-    /**
-     * Validate the claims of the token.
-     * As per https://openid.net/specs/openid-connect-basic-1_0.html#IDTokenValidation.
-     *
-     * @throws OidcInvalidTokenException
-     */
-    protected function validateTokenClaims(string $clientId): void
-    {
-        // 1. The Issuer Identifier for the OpenID Provider (which is typically obtained during Discovery)
-        // MUST exactly match the value of the iss (issuer) Claim.
-        if (empty($this->payload['iss']) || $this->issuer !== $this->payload['iss']) {
-            throw new OidcInvalidTokenException('Missing or non-matching token issuer value');
-        }
-
-        // 2. The Client MUST validate that the aud (audience) Claim contains its client_id value registered
-        // at the Issuer identified by the iss (issuer) Claim as an audience. The ID Token MUST be rejected
-        // if the ID Token does not list the Client as a valid audience, or if it contains additional
-        // audiences not trusted by the Client.
-        if (empty($this->payload['aud'])) {
-            throw new OidcInvalidTokenException('Missing token audience value');
-        }
-
-        $aud = is_string($this->payload['aud']) ? [$this->payload['aud']] : $this->payload['aud'];
-        if (count($aud) !== 1) {
-            throw new OidcInvalidTokenException('Token audience value has ' . count($aud) . ' values, Expected 1');
-        }
-
-        if ($aud[0] !== $clientId) {
-            throw new OidcInvalidTokenException('Token audience value did not match the expected client_id');
-        }
-
-        // 3. If the ID Token contains multiple audiences, the Client SHOULD verify that an azp Claim is present.
-        // NOTE: Addressed by enforcing a count of 1 above.
-
-        // 4. If an azp (authorized party) Claim is present, the Client SHOULD verify that its client_id
-        // is the Claim Value.
-        if (isset($this->payload['azp']) && $this->payload['azp'] !== $clientId) {
-            throw new OidcInvalidTokenException('Token authorized party exists but does not match the expected client_id');
-        }
-
-        // 5. The current time MUST be before the time represented by the exp Claim
-        // (possibly allowing for some small leeway to account for clock skew).
-        if (empty($this->payload['exp'])) {
-            throw new OidcInvalidTokenException('Missing token expiration time value');
-        }
-
-        $skewSeconds = 120;
-        $now = time();
-        if ($now >= (intval($this->payload['exp']) + $skewSeconds)) {
-            throw new OidcInvalidTokenException('Token has expired');
-        }
-
-        // 6. The iat Claim can be used to reject tokens that were issued too far away from the current time,
-        // limiting the amount of time that nonces need to be stored to prevent attacks.
-        // The acceptable range is Client specific.
-        if (empty($this->payload['iat'])) {
-            throw new OidcInvalidTokenException('Missing token issued at time value');
-        }
-
-        $dayAgo = time() - 86400;
-        $iat = intval($this->payload['iat']);
-        if ($iat > ($now + $skewSeconds) || $iat < $dayAgo) {
-            throw new OidcInvalidTokenException('Token issue at time is not recent or is invalid');
-        }
-
-        // 7. If the acr Claim was requested, the Client SHOULD check that the asserted Claim Value is appropriate.
-        // The meaning and processing of acr Claim Values is out of scope for this document.
-        // NOTE: Not used for our case here. acr is not requested.
-
-        // 8. When a max_age request is made, the Client SHOULD check the auth_time Claim value and request
-        // re-authentication if it determines too much time has elapsed since the last End-User authentication.
-        // NOTE: Not used for our case here. A max_age request is not made.
-
-        // Custom: Ensure the "sub" (Subject) Claim exists and has a value.
-        if (empty($this->payload['sub'])) {
-            throw new OidcInvalidTokenException('Missing token subject value');
-        }
-    }
-}

app/Auth/Access/Oidc/OidcInvalidKeyException.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-class OidcInvalidKeyException extends \Exception
-{
-}

app/Auth/Access/Oidc/OidcInvalidTokenException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use Exception;
-
-class OidcInvalidTokenException extends Exception
-{
-}

app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use Exception;
-
-class OidcIssuerDiscoveryException extends Exception
-{
-}

app/Auth/Access/Oidc/OidcJwtSigningKey.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use phpseclib3\Crypt\Common\PublicKey;
-use phpseclib3\Crypt\PublicKeyLoader;
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Math\BigInteger;
-
-class OidcJwtSigningKey
-{
-    /**
-     * @var PublicKey
-     */
-    protected $key;
-
-    /**
-     * Can be created either from a JWK parameter array or local file path to load a certificate from.
-     * Examples:
-     * 'file:///var/www/cert.pem'
-     * ['kty' => 'RSA', 'alg' => 'RS256', 'n' => 'abc123...'].
-     *
-     * @param array|string $jwkOrKeyPath
-     *
-     * @throws OidcInvalidKeyException
-     */
-    public function __construct($jwkOrKeyPath)
-    {
-        if (is_array($jwkOrKeyPath)) {
-            $this->loadFromJwkArray($jwkOrKeyPath);
-        } elseif (is_string($jwkOrKeyPath) && strpos($jwkOrKeyPath, 'file://') === 0) {
-            $this->loadFromPath($jwkOrKeyPath);
-        } else {
-            throw new OidcInvalidKeyException('Unexpected type of key value provided');
-        }
-    }
-
-    /**
-     * @throws OidcInvalidKeyException
-     */
-    protected function loadFromPath(string $path)
-    {
-        try {
-            $key = PublicKeyLoader::load(
-                file_get_contents($path)
-            );
-        } catch (\Exception $exception) {
-            throw new OidcInvalidKeyException("Failed to load key from file path with error: {$exception->getMessage()}");
-        }
-
-        if (!$key instanceof RSA) {
-            throw new OidcInvalidKeyException('Key loaded from file path is not an RSA key as expected');
-        }
-
-        $this->key = $key->withPadding(RSA::SIGNATURE_PKCS1);
-    }
-
-    /**
-     * @throws OidcInvalidKeyException
-     */
-    protected function loadFromJwkArray(array $jwk)
-    {
-        // 'alg' is optional for a JWK, but we will still attempt to validate if
-        // it exists otherwise presume it will be compatible.
-        $alg = $jwk['alg'] ?? null;
-        if ($jwk['kty'] !== 'RSA' || !(is_null($alg) || $alg === 'RS256')) {
-            throw new OidcInvalidKeyException("Only RS256 keys are currently supported. Found key using {$alg}");
-        }
-
-        if (empty($jwk['use'])) {
-            throw new OidcInvalidKeyException('A "use" parameter on the provided key is expected');
-        }
-
-        if ($jwk['use'] !== 'sig') {
-            throw new OidcInvalidKeyException("Only signature keys are currently supported. Found key for use {$jwk['use']}");
-        }
-
-        if (empty($jwk['e'])) {
-            throw new OidcInvalidKeyException('An "e" parameter on the provided key is expected');
-        }
-
-        if (empty($jwk['n'])) {
-            throw new OidcInvalidKeyException('A "n" parameter on the provided key is expected');
-        }
-
-        $n = strtr($jwk['n'] ?? '', '-_', '+/');
-
-        try {
-            $key = PublicKeyLoader::load([
-                'e' => new BigInteger(base64_decode($jwk['e']), 256),
-                'n' => new BigInteger(base64_decode($n), 256),
-            ]);
-        } catch (\Exception $exception) {
-            throw new OidcInvalidKeyException("Failed to load key from JWK parameters with error: {$exception->getMessage()}");
-        }
-
-        if (!$key instanceof RSA) {
-            throw new OidcInvalidKeyException('Key loaded from file path is not an RSA key as expected');
-        }
-
-        $this->key = $key->withPadding(RSA::SIGNATURE_PKCS1);
-    }
-
-    /**
-     * Use this key to sign the given content and return the signature.
-     */
-    public function verify(string $content, string $signature): bool
-    {
-        return $this->key->verify($content, $signature);
-    }
-
-    /**
-     * Convert the key to a PEM encoded key string.
-     */
-    public function toPem(): string
-    {
-        return $this->key->toString('PKCS8');
-    }
-}

app/Auth/Access/Oidc/OidcOAuthProvider.php

@@ -1,127 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use League\OAuth2\Client\Grant\AbstractGrant;
-use League\OAuth2\Client\Provider\AbstractProvider;
-use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
-use League\OAuth2\Client\Provider\GenericResourceOwner;
-use League\OAuth2\Client\Provider\ResourceOwnerInterface;
-use League\OAuth2\Client\Token\AccessToken;
-use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * Extended OAuth2Provider for using with OIDC.
- * Credit to the https://github.com/steverhoades/oauth2-openid-connect-client
- * project for the idea of extending a League\OAuth2 client for this use-case.
- */
-class OidcOAuthProvider extends AbstractProvider
-{
-    use BearerAuthorizationTrait;
-
-    /**
-     * @var string
-     */
-    protected $authorizationEndpoint;
-
-    /**
-     * @var string
-     */
-    protected $tokenEndpoint;
-
-    /**
-     * Returns the base URL for authorizing a client.
-     */
-    public function getBaseAuthorizationUrl(): string
-    {
-        return $this->authorizationEndpoint;
-    }
-
-    /**
-     * Returns the base URL for requesting an access token.
-     */
-    public function getBaseAccessTokenUrl(array $params): string
-    {
-        return $this->tokenEndpoint;
-    }
-
-    /**
-     * Returns the URL for requesting the resource owner's details.
-     */
-    public function getResourceOwnerDetailsUrl(AccessToken $token): string
-    {
-        return '';
-    }
-
-    /**
-     * Returns the default scopes used by this provider.
-     *
-     * This should only be the scopes that are required to request the details
-     * of the resource owner, rather than all the available scopes.
-     */
-    protected function getDefaultScopes(): array
-    {
-        return ['openid', 'profile', 'email'];
-    }
-
-    /**
-     * Returns the string that should be used to separate scopes when building
-     * the URL for requesting an access token.
-     */
-    protected function getScopeSeparator(): string
-    {
-        return ' ';
-    }
-
-    /**
-     * Checks a provider response for errors.
-     *
-     * @param ResponseInterface $response
-     * @param array|string      $data     Parsed response data
-     *
-     * @throws IdentityProviderException
-     *
-     * @return void
-     */
-    protected function checkResponse(ResponseInterface $response, $data)
-    {
-        if ($response->getStatusCode() >= 400 || isset($data['error'])) {
-            throw new IdentityProviderException(
-                $data['error'] ?? $response->getReasonPhrase(),
-                $response->getStatusCode(),
-                (string) $response->getBody()
-            );
-        }
-    }
-
-    /**
-     * Generates a resource owner object from a successful resource owner
-     * details request.
-     *
-     * @param array       $response
-     * @param AccessToken $token
-     *
-     * @return ResourceOwnerInterface
-     */
-    protected function createResourceOwner(array $response, AccessToken $token)
-    {
-        return new GenericResourceOwner($response, '');
-    }
-
-    /**
-     * Creates an access token from a response.
-     *
-     * The grant that was used to fetch the response can be used to provide
-     * additional context.
-     *
-     * @param array         $response
-     * @param AbstractGrant $grant
-     *
-     * @return OidcAccessToken
-     */
-    protected function createAccessToken(array $response, AbstractGrant $grant)
-    {
-        return new OidcAccessToken($response);
-    }
-}

app/Auth/Access/Oidc/OidcProviderSettings.php

@@ -1,205 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use GuzzleHttp\Psr7\Request;
-use Illuminate\Contracts\Cache\Repository;
-use InvalidArgumentException;
-use Psr\Http\Client\ClientExceptionInterface;
-use Psr\Http\Client\ClientInterface;
-
-/**
- * OpenIdConnectProviderSettings
- * Acts as a DTO for settings used within the oidc request and token handling.
- * Performs auto-discovery upon request.
- */
-class OidcProviderSettings
-{
-    /**
-     * @var string
-     */
-    public $issuer;
-
-    /**
-     * @var string
-     */
-    public $clientId;
-
-    /**
-     * @var string
-     */
-    public $clientSecret;
-
-    /**
-     * @var string
-     */
-    public $redirectUri;
-
-    /**
-     * @var string
-     */
-    public $authorizationEndpoint;
-
-    /**
-     * @var string
-     */
-    public $tokenEndpoint;
-
-    /**
-     * @var string[]|array[]
-     */
-    public $keys = [];
-
-    public function __construct(array $settings)
-    {
-        $this->applySettingsFromArray($settings);
-        $this->validateInitial();
-    }
-
-    /**
-     * Apply an array of settings to populate setting properties within this class.
-     */
-    protected function applySettingsFromArray(array $settingsArray)
-    {
-        foreach ($settingsArray as $key => $value) {
-            if (property_exists($this, $key)) {
-                $this->$key = $value;
-            }
-        }
-    }
-
-    /**
-     * Validate any core, required properties have been set.
-     *
-     * @throws InvalidArgumentException
-     */
-    protected function validateInitial()
-    {
-        $required = ['clientId', 'clientSecret', 'redirectUri', 'issuer'];
-        foreach ($required as $prop) {
-            if (empty($this->$prop)) {
-                throw new InvalidArgumentException("Missing required configuration \"{$prop}\" value");
-            }
-        }
-
-        if (strpos($this->issuer, 'https://') !== 0) {
-            throw new InvalidArgumentException('Issuer value must start with https://');
-        }
-    }
-
-    /**
-     * Perform a full validation on these settings.
-     *
-     * @throws InvalidArgumentException
-     */
-    public function validate(): void
-    {
-        $this->validateInitial();
-        $required = ['keys', 'tokenEndpoint', 'authorizationEndpoint'];
-        foreach ($required as $prop) {
-            if (empty($this->$prop)) {
-                throw new InvalidArgumentException("Missing required configuration \"{$prop}\" value");
-            }
-        }
-    }
-
-    /**
-     * Discover and autoload settings from the configured issuer.
-     *
-     * @throws OidcIssuerDiscoveryException
-     */
-    public function discoverFromIssuer(ClientInterface $httpClient, Repository $cache, int $cacheMinutes)
-    {
-        try {
-            $cacheKey = 'oidc-discovery::' . $this->issuer;
-            $discoveredSettings = $cache->remember($cacheKey, $cacheMinutes * 60, function () use ($httpClient) {
-                return $this->loadSettingsFromIssuerDiscovery($httpClient);
-            });
-            $this->applySettingsFromArray($discoveredSettings);
-        } catch (ClientExceptionInterface $exception) {
-            throw new OidcIssuerDiscoveryException("HTTP request failed during discovery with error: {$exception->getMessage()}");
-        }
-    }
-
-    /**
-     * @throws OidcIssuerDiscoveryException
-     * @throws ClientExceptionInterface
-     */
-    protected function loadSettingsFromIssuerDiscovery(ClientInterface $httpClient): array
-    {
-        $issuerUrl = rtrim($this->issuer, '/') . '/.well-known/openid-configuration';
-        $request = new Request('GET', $issuerUrl);
-        $response = $httpClient->sendRequest($request);
-        $result = json_decode($response->getBody()->getContents(), true);
-
-        if (empty($result) || !is_array($result)) {
-            throw new OidcIssuerDiscoveryException("Error discovering provider settings from issuer at URL {$issuerUrl}");
-        }
-
-        if ($result['issuer'] !== $this->issuer) {
-            throw new OidcIssuerDiscoveryException('Unexpected issuer value found on discovery response');
-        }
-
-        $discoveredSettings = [];
-
-        if (!empty($result['authorization_endpoint'])) {
-            $discoveredSettings['authorizationEndpoint'] = $result['authorization_endpoint'];
-        }
-
-        if (!empty($result['token_endpoint'])) {
-            $discoveredSettings['tokenEndpoint'] = $result['token_endpoint'];
-        }
-
-        if (!empty($result['jwks_uri'])) {
-            $keys = $this->loadKeysFromUri($result['jwks_uri'], $httpClient);
-            $discoveredSettings['keys'] = $this->filterKeys($keys);
-        }
-
-        return $discoveredSettings;
-    }
-
-    /**
-     * Filter the given JWK keys down to just those we support.
-     */
-    protected function filterKeys(array $keys): array
-    {
-        return array_filter($keys, function (array $key) {
-            $alg = $key['alg'] ?? null;
-
-            return $key['kty'] === 'RSA' && $key['use'] === 'sig' && (is_null($alg) || $alg === 'RS256');
-        });
-    }
-
-    /**
-     * Return an array of jwks as PHP key=>value arrays.
-     *
-     * @throws ClientExceptionInterface
-     * @throws OidcIssuerDiscoveryException
-     */
-    protected function loadKeysFromUri(string $uri, ClientInterface $httpClient): array
-    {
-        $request = new Request('GET', $uri);
-        $response = $httpClient->sendRequest($request);
-        $result = json_decode($response->getBody()->getContents(), true);
-
-        if (empty($result) || !is_array($result) || !isset($result['keys'])) {
-            throw new OidcIssuerDiscoveryException('Error reading keys from issuer jwks_uri');
-        }
-
-        return $result['keys'];
-    }
-
-    /**
-     * Get the settings needed by an OAuth provider, as a key=>value array.
-     */
-    public function arrayForProvider(): array
-    {
-        $settingKeys = ['clientId', 'clientSecret', 'redirectUri', 'authorizationEndpoint', 'tokenEndpoint'];
-        $settings = [];
-        foreach ($settingKeys as $setting) {
-            $settings[$setting] = $this->$setting;
-        }
-
-        return $settings;
-    }
-}

app/Auth/Access/Oidc/OidcService.php

@@ -1,224 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use function auth;
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\RegistrationService;
-use BookStack\Auth\User;
-use BookStack\Exceptions\JsonDebugException;
-use BookStack\Exceptions\StoppedAuthenticationException;
-use BookStack\Exceptions\UserRegistrationException;
-use function config;
-use Illuminate\Support\Facades\Cache;
-use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
-use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
-use Psr\Http\Client\ClientInterface as HttpClient;
-use function trans;
-use function url;
-
-/**
- * Class OpenIdConnectService
- * Handles any app-specific OIDC tasks.
- */
-class OidcService
-{
-    protected RegistrationService $registrationService;
-    protected LoginService $loginService;
-    protected HttpClient $httpClient;
-
-    /**
-     * OpenIdService constructor.
-     */
-    public function __construct(RegistrationService $registrationService, LoginService $loginService, HttpClient $httpClient)
-    {
-        $this->registrationService = $registrationService;
-        $this->loginService = $loginService;
-        $this->httpClient = $httpClient;
-    }
-
-    /**
-     * Initiate an authorization flow.
-     *
-     * @throws OidcException
-     *
-     * @return array{url: string, state: string}
-     */
-    public function login(): array
-    {
-        $settings = $this->getProviderSettings();
-        $provider = $this->getProvider($settings);
-
-        return [
-            'url'   => $provider->getAuthorizationUrl(),
-            'state' => $provider->getState(),
-        ];
-    }
-
-    /**
-     * Process the Authorization response from the authorization server and
-     * return the matching, or new if registration active, user matched to the
-     * authorization server. Throws if the user cannot be auth if not authenticated.
-     *
-     * @throws JsonDebugException
-     * @throws OidcException
-     * @throws StoppedAuthenticationException
-     * @throws IdentityProviderException
-     */
-    public function processAuthorizeResponse(?string $authorizationCode): User
-    {
-        $settings = $this->getProviderSettings();
-        $provider = $this->getProvider($settings);
-
-        // Try to exchange authorization code for access token
-        $accessToken = $provider->getAccessToken('authorization_code', [
-            'code' => $authorizationCode,
-        ]);
-
-        return $this->processAccessTokenCallback($accessToken, $settings);
-    }
-
-    /**
-     * @throws OidcException
-     */
-    protected function getProviderSettings(): OidcProviderSettings
-    {
-        $config = $this->config();
-        $settings = new OidcProviderSettings([
-            'issuer'                => $config['issuer'],
-            'clientId'              => $config['client_id'],
-            'clientSecret'          => $config['client_secret'],
-            'redirectUri'           => url('/oidc/callback'),
-            'authorizationEndpoint' => $config['authorization_endpoint'],
-            'tokenEndpoint'         => $config['token_endpoint'],
-        ]);
-
-        // Use keys if configured
-        if (!empty($config['jwt_public_key'])) {
-            $settings->keys = [$config['jwt_public_key']];
-        }
-
-        // Run discovery
-        if ($config['discover'] ?? false) {
-            try {
-                $settings->discoverFromIssuer($this->httpClient, Cache::store(null), 15);
-            } catch (OidcIssuerDiscoveryException $exception) {
-                throw new OidcException('OIDC Discovery Error: ' . $exception->getMessage());
-            }
-        }
-
-        $settings->validate();
-
-        return $settings;
-    }
-
-    /**
-     * Load the underlying OpenID Connect Provider.
-     */
-    protected function getProvider(OidcProviderSettings $settings): OidcOAuthProvider
-    {
-        return new OidcOAuthProvider($settings->arrayForProvider(), [
-            'httpClient'     => $this->httpClient,
-            'optionProvider' => new HttpBasicAuthOptionProvider(),
-        ]);
-    }
-
-    /**
-     * Calculate the display name.
-     */
-    protected function getUserDisplayName(OidcIdToken $token, string $defaultValue): string
-    {
-        $displayNameAttr = $this->config()['display_name_claims'];
-
-        $displayName = [];
-        foreach ($displayNameAttr as $dnAttr) {
-            $dnComponent = $token->getClaim($dnAttr) ?? '';
-            if ($dnComponent !== '') {
-                $displayName[] = $dnComponent;
-            }
-        }
-
-        if (count($displayName) == 0) {
-            $displayName[] = $defaultValue;
-        }
-
-        return implode(' ', $displayName);
-    }
-
-    /**
-     * Extract the details of a user from an ID token.
-     *
-     * @return array{name: string, email: string, external_id: string}
-     */
-    protected function getUserDetails(OidcIdToken $token): array
-    {
-        $id = $token->getClaim('sub');
-
-        return [
-            'external_id' => $id,
-            'email'       => $token->getClaim('email'),
-            'name'        => $this->getUserDisplayName($token, $id),
-        ];
-    }
-
-    /**
-     * Processes a received access token for a user. Login the user when
-     * they exist, optionally registering them automatically.
-     *
-     * @throws OidcException
-     * @throws JsonDebugException
-     * @throws StoppedAuthenticationException
-     */
-    protected function processAccessTokenCallback(OidcAccessToken $accessToken, OidcProviderSettings $settings): User
-    {
-        $idTokenText = $accessToken->getIdToken();
-        $idToken = new OidcIdToken(
-            $idTokenText,
-            $settings->issuer,
-            $settings->keys,
-        );
-
-        if ($this->config()['dump_user_details']) {
-            throw new JsonDebugException($idToken->getAllClaims());
-        }
-
-        try {
-            $idToken->validate($settings->clientId);
-        } catch (OidcInvalidTokenException $exception) {
-            throw new OidcException("ID token validate failed with error: {$exception->getMessage()}");
-        }
-
-        $userDetails = $this->getUserDetails($idToken);
-        $isLoggedIn = auth()->check();
-
-        if (empty($userDetails['email'])) {
-            throw new OidcException(trans('errors.oidc_no_email_address'));
-        }
-
-        if ($isLoggedIn) {
-            throw new OidcException(trans('errors.oidc_already_logged_in'));
-        }
-
-        try {
-            $user = $this->registrationService->findOrRegister(
-                $userDetails['name'],
-                $userDetails['email'],
-                $userDetails['external_id']
-            );
-        } catch (UserRegistrationException $exception) {
-            throw new OidcException($exception->getMessage());
-        }
-
-        $this->loginService->login($user, 'oidc');
-
-        return $user;
-    }
-
-    /**
-     * Get the OIDC config from the application.
-     */
-    protected function config(): array
-    {
-        return config('oidc');
-    }
-}

app/Auth/Access/RegistrationService.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\SocialAccount;
@@ -11,10 +9,10 @@ use BookStack\Facades\Activity;
 use BookStack\Facades\Theme;
 use BookStack\Theming\ThemeEvents;
 use Exception;
-use Illuminate\Support\Str;
 
 class RegistrationService
 {
+
     protected $userRepo;
     protected $emailConfirmationService;
 
@@ -29,7 +27,6 @@ class RegistrationService
 
     /**
      * Check whether or not registrations are allowed in the app settings.
-     *
      * @throws UserRegistrationException
      */
     public function ensureRegistrationAllowed()
@@ -47,39 +44,11 @@ class RegistrationService
     {
         $authMethod = config('auth.method');
         $authMethodsWithRegistration = ['standard'];
-
         return in_array($authMethod, $authMethodsWithRegistration) && setting('registration-enabled');
     }
 
-    /**
-     * Attempt to find a user in the system otherwise register them as a new
-     * user. For use with external auth systems since password is auto-generated.
-     *
-     * @throws UserRegistrationException
-     */
-    public function findOrRegister(string $name, string $email, string $externalId): User
-    {
-        $user = User::query()
-            ->where('external_auth_id', '=', $externalId)
-            ->first();
-
-        if (is_null($user)) {
-            $userData = [
-                'name'             => $name,
-                'email'            => $email,
-                'password'         => Str::random(32),
-                'external_auth_id' => $externalId,
-            ];
-
-            $user = $this->registerUser($userData, null, false);
-        }
-
-        return $user;
-    }
-
     /**
      * The registrations flow for all users.
-     *
      * @throws UserRegistrationException
      */
     public function registerUser(array $userData, ?SocialAccount $socialAccount = null, bool $emailConfirmed = false): User
@@ -96,8 +65,7 @@ class RegistrationService
         }
 
         // Create the user
-        $newUser = $this->userRepo->createWithoutActivity($userData, $emailConfirmed);
-        $newUser->attachDefaultRole();
+        $newUser = $this->userRepo->registerNew($userData, $emailConfirmed);
 
         // Assign social account if given
         if ($socialAccount) {
@@ -116,7 +84,6 @@ class RegistrationService
                 session()->flash('sent-email-confirmation', true);
             } catch (Exception $e) {
                 $message = trans('auth.email_confirm_send_error');
-
                 throw new UserRegistrationException($message, '/register/confirm');
             }
         }
@@ -127,7 +94,6 @@ class RegistrationService
     /**
      * Ensure that the given email meets any active email domain registration restrictions.
      * Throws if restrictions are active and the email does not match an allowed domain.
-     *
      * @throws UserRegistrationException
      */
     protected function ensureEmailDomainAllowed(string $userEmail): void
@@ -139,10 +105,9 @@ class RegistrationService
         }
 
         $restrictedEmailDomains = explode(',', str_replace(' ', '', $registrationRestrict));
-        $userEmailDomain = $domain = mb_substr(mb_strrchr($userEmail, '@'), 1);
+        $userEmailDomain = $domain = mb_substr(mb_strrchr($userEmail, "@"), 1);
         if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
             $redirect = $this->registrationAllowed() ? '/register' : '/login';
-
             throw new UserRegistrationException(trans('auth.registration_email_domain_invalid'), $redirect);
         }
     }

app/Auth/Access/Saml2Service.php

@@ -1,15 +1,16 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
+use BookStack\Actions\ActivityType;
 use BookStack\Auth\User;
 use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\SamlException;
-use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Facades\Activity;
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
 use Exception;
+use Illuminate\Support\Str;
 use OneLogin\Saml2\Auth;
-use OneLogin\Saml2\Constants;
 use OneLogin\Saml2\Error;
 use OneLogin\Saml2\IdPMetadataParser;
 use OneLogin\Saml2\ValidationError;
@@ -18,62 +19,47 @@ use OneLogin\Saml2\ValidationError;
  * Class Saml2Service
  * Handles any app-specific SAML tasks.
  */
-class Saml2Service
+class Saml2Service extends ExternalAuthService
 {
     protected $config;
     protected $registrationService;
-    protected $loginService;
-    protected $groupSyncService;
+    protected $user;
 
     /**
      * Saml2Service constructor.
      */
-    public function __construct(
-        RegistrationService $registrationService,
-        LoginService $loginService,
-        GroupSyncService $groupSyncService
-    ) {
+    public function __construct(RegistrationService $registrationService, User $user)
+    {
         $this->config = config('saml2');
         $this->registrationService = $registrationService;
-        $this->loginService = $loginService;
-        $this->groupSyncService = $groupSyncService;
+        $this->user = $user;
     }
 
     /**
      * Initiate a login flow.
-     *
      * @throws Error
      */
     public function login(): array
     {
         $toolKit = $this->getToolkit();
         $returnRoute = url('/saml2/acs');
-
         return [
             'url' => $toolKit->login($returnRoute, [], false, false, true),
-            'id'  => $toolKit->getLastRequestID(),
+            'id' => $toolKit->getLastRequestID(),
         ];
     }
 
     /**
      * Initiate a logout flow.
-     *
      * @throws Error
      */
-    public function logout(User $user): array
+    public function logout(): array
     {
         $toolKit = $this->getToolkit();
         $returnRoute = url('/');
 
         try {
-            $url = $toolKit->logout(
-                $returnRoute,
-                [],
-                $user->email,
-                null,
-                true,
-                Constants::NAMEID_EMAIL_ADDRESS
-            );
+            $url = $toolKit->logout($returnRoute, [], null, null, true);
             $id = $toolKit->getLastRequestID();
         } catch (Error $error) {
             if ($error->getCode() !== Error::SAML_SINGLE_LOGOUT_NOT_SUPPORTED) {
@@ -92,25 +78,21 @@ class Saml2Service
      * Process the ACS response from the idp and return the
      * matching, or new if registration active, user matched to the idp.
      * Returns null if not authenticated.
-     *
      * @throws Error
      * @throws SamlException
      * @throws ValidationError
      * @throws JsonDebugException
      * @throws UserRegistrationException
      */
-    public function processAcsResponse(?string $requestId, string $samlResponse): ?User
+    public function processAcsResponse(?string $requestId): ?User
     {
-        // The SAML2 toolkit expects the response to be within the $_POST superglobal
-        // so we need to manually put it back there at this point.
-        $_POST['SAMLResponse'] = $samlResponse;
         $toolkit = $this->getToolkit();
         $toolkit->processResponse($requestId);
         $errors = $toolkit->getErrors();
 
         if (!empty($errors)) {
             throw new Error(
-                'Invalid ACS Response: ' . implode(', ', $errors)
+                'Invalid ACS Response: '.implode(', ', $errors)
             );
         }
 
@@ -126,29 +108,22 @@ class Saml2Service
 
     /**
      * Process a response for the single logout service.
-     *
      * @throws Error
      */
     public function processSlsResponse(?string $requestId): ?string
     {
         $toolkit = $this->getToolkit();
+        $redirect = $toolkit->processSLO(true, $requestId, false, null, true);
 
-        // The $retrieveParametersFromServer in the call below will mean the library will take the query
-        // parameters, used for the response signing, from the raw $_SERVER['QUERY_STRING']
-        // value so that the exact encoding format is matched when checking the signature.
-        // This is primarily due to ADFS encoding query params with lowercase percent encoding while
-        // PHP (And most other sensible providers) standardise on uppercase.
-        $redirect = $toolkit->processSLO(true, $requestId, true, null, true);
         $errors = $toolkit->getErrors();
 
         if (!empty($errors)) {
             throw new Error(
-                'Invalid SLS Response: ' . implode(', ', $errors)
+                'Invalid SLS Response: '.implode(', ', $errors)
             );
         }
 
         $this->actionLogout();
-
         return $redirect;
     }
 
@@ -163,7 +138,6 @@ class Saml2Service
 
     /**
      * Get the metadata for this service provider.
-     *
      * @throws Error
      */
     public function metadata(): string
@@ -175,7 +149,7 @@ class Saml2Service
 
         if (!empty($errors)) {
             throw new Error(
-                'Invalid SP metadata: ' . implode(', ', $errors),
+                'Invalid SP metadata: '.implode(', ', $errors),
                 Error::METADATA_SP_INVALID
             );
         }
@@ -185,7 +159,6 @@ class Saml2Service
 
     /**
      * Load the underlying Onelogin SAML2 toolkit.
-     *
      * @throws Error
      * @throws Exception
      */
@@ -205,7 +178,6 @@ class Saml2Service
 
         $spSettings = $this->loadOneloginServiceProviderDetails();
         $settings = array_replace_recursive($settings, $spSettings, $metaDataSettings, $overrides);
-
         return new Auth($settings);
     }
 
@@ -215,18 +187,18 @@ class Saml2Service
     protected function loadOneloginServiceProviderDetails(): array
     {
         $spDetails = [
-            'entityId'                 => url('/saml2/metadata'),
+            'entityId' => url('/saml2/metadata'),
             'assertionConsumerService' => [
                 'url' => url('/saml2/acs'),
             ],
             'singleLogoutService' => [
-                'url' => url('/saml2/sls'),
+                'url' => url('/saml2/sls')
             ],
         ];
 
         return [
             'baseurl' => url('/saml2'),
-            'sp'      => $spDetails,
+            'sp' => $spDetails
         ];
     }
 
@@ -239,7 +211,7 @@ class Saml2Service
     }
 
     /**
-     * Calculate the display name.
+     * Calculate the display name
      */
     protected function getUserDisplayName(array $samlAttributes, string $defaultValue): string
     {
@@ -278,8 +250,6 @@ class Saml2Service
 
     /**
      * Extract the details of a user from a SAML response.
-     *
-     * @return array{external_id: string, name: string, email: string, saml_id: string}
      */
     protected function getUserDetails(string $samlID, $samlAttributes): array
     {
@@ -291,9 +261,9 @@ class Saml2Service
 
         return [
             'external_id' => $externalId,
-            'name'        => $this->getUserDisplayName($samlAttributes, $externalId),
-            'email'       => $email,
-            'saml_id'     => $samlID,
+            'name' => $this->getUserDisplayName($samlAttributes, $externalId),
+            'email' => $email,
+            'saml_id' => $samlID,
         ];
     }
 
@@ -327,7 +297,6 @@ class Saml2Service
                 $data = $data[0];
                 break;
         }
-
         return $data;
     }
 
@@ -344,14 +313,36 @@ class Saml2Service
         return $defaultValue;
     }
 
+    /**
+     * Get the user from the database for the specified details.
+     * @throws UserRegistrationException
+     */
+    protected function getOrRegisterUser(array $userDetails): ?User
+    {
+        $user = $this->user->newQuery()
+          ->where('external_auth_id', '=', $userDetails['external_id'])
+          ->first();
+
+        if (is_null($user)) {
+            $userData = [
+                'name' => $userDetails['name'],
+                'email' => $userDetails['email'],
+                'password' => Str::random(32),
+                'external_auth_id' => $userDetails['external_id'],
+            ];
+
+            $user = $this->registrationService->registerUser($userData, null, false);
+        }
+
+        return $user;
+    }
+
     /**
      * Process the SAML response for a user. Login the user when
      * they exist, optionally registering them automatically.
-     *
      * @throws SamlException
      * @throws JsonDebugException
      * @throws UserRegistrationException
-     * @throws StoppedAuthenticationException
      */
     public function processLoginCallback(string $samlID, array $samlAttributes): User
     {
@@ -360,8 +351,8 @@ class Saml2Service
 
         if ($this->config['dump_user_details']) {
             throw new JsonDebugException([
-                'id_from_idp'         => $samlID,
-                'attrs_from_idp'      => $samlAttributes,
+                'id_from_idp' => $samlID,
+                'attrs_from_idp' => $samlAttributes,
                 'attrs_after_parsing' => $userDetails,
             ]);
         }
@@ -374,23 +365,19 @@ class Saml2Service
             throw new SamlException(trans('errors.saml_already_logged_in'), '/login');
         }
 
-        $user = $this->registrationService->findOrRegister(
-            $userDetails['name'],
-            $userDetails['email'],
-            $userDetails['external_id']
-        );
-
+        $user = $this->getOrRegisterUser($userDetails);
         if ($user === null) {
             throw new SamlException(trans('errors.saml_user_not_registered', ['name' => $userDetails['external_id']]), '/login');
         }
 
         if ($this->shouldSyncGroups()) {
             $groups = $this->getUserGroups($samlAttributes);
-            $this->groupSyncService->syncUserWithFoundGroups($user, $groups, $this->config['remove_from_groups']);
+            $this->syncWithGroups($user, $groups);
         }
 
-        $this->loginService->login($user, 'saml2');
-
+        auth()->login($user);
+        Activity::add(ActivityType::AUTH_LOGIN, "saml2; {$user->logDescriptor()}");
+        Theme::dispatch(ThemeEvents::AUTH_LOGIN, 'saml2', $user);
         return $user;
     }
 }

app/Auth/Access/SocialAuthService.php

@@ -1,99 +1,59 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
+use BookStack\Actions\ActivityType;
 use BookStack\Auth\SocialAccount;
 use BookStack\Auth\User;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Facades\Activity;
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\Factory as Socialite;
 use Laravel\Socialite\Contracts\Provider;
 use Laravel\Socialite\Contracts\User as SocialUser;
-use Laravel\Socialite\Two\GoogleProvider;
 use SocialiteProviders\Manager\SocialiteWasCalled;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class SocialAuthService
 {
-    /**
-     * The core socialite library used.
-     *
-     * @var Socialite
-     */
     protected $socialite;
+    protected $socialAccount;
 
-    /**
-     * @var LoginService
-     */
-    protected $loginService;
-
-    /**
-     * The default built-in social drivers we support.
-     *
-     * @var string[]
-     */
-    protected $validSocialDrivers = [
-        'google',
-        'github',
-        'facebook',
-        'slack',
-        'twitter',
-        'azure',
-        'okta',
-        'gitlab',
-        'twitch',
-        'discord',
-    ];
-
-    /**
-     * Callbacks to run when configuring a social driver
-     * for an initial redirect action.
-     * Array is keyed by social driver name.
-     * Callbacks are passed an instance of the driver.
-     *
-     * @var array<string, callable>
-     */
-    protected $configureForRedirectCallbacks = [];
+    protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta', 'gitlab', 'twitch', 'discord'];
 
     /**
      * SocialAuthService constructor.
      */
-    public function __construct(Socialite $socialite, LoginService $loginService)
+    public function __construct(Socialite $socialite)
     {
         $this->socialite = $socialite;
-        $this->loginService = $loginService;
     }
 
     /**
      * Start the social login path.
-     *
      * @throws SocialDriverNotConfigured
      */
     public function startLogIn(string $socialDriver): RedirectResponse
     {
         $driver = $this->validateDriver($socialDriver);
-
-        return $this->getDriverForRedirect($driver)->redirect();
+        return $this->getSocialDriver($driver)->redirect();
     }
 
     /**
-     * Start the social registration process.
-     *
+     * Start the social registration process
      * @throws SocialDriverNotConfigured
      */
     public function startRegister(string $socialDriver): RedirectResponse
     {
         $driver = $this->validateDriver($socialDriver);
-
-        return $this->getDriverForRedirect($driver)->redirect();
+        return $this->getSocialDriver($driver)->redirect();
     }
 
     /**
      * Handle the social registration process on callback.
-     *
      * @throws UserRegistrationException
      */
     public function handleRegistrationCallback(string $socialDriver, SocialUser $socialUser): SocialUser
@@ -105,7 +65,6 @@ class SocialAuthService
 
         if (User::query()->where('email', '=', $socialUser->getEmail())->exists()) {
             $email = $socialUser->getEmail();
-
             throw new UserRegistrationException(trans('errors.error_user_exists_different_creds', ['email' => $email]), '/login');
         }
 
@@ -114,19 +73,16 @@ class SocialAuthService
 
     /**
      * Get the social user details via the social driver.
-     *
      * @throws SocialDriverNotConfigured
      */
     public function getSocialUser(string $socialDriver): SocialUser
     {
         $driver = $this->validateDriver($socialDriver);
-
         return $this->socialite->driver($driver)->user();
     }
 
     /**
      * Handle the login process on a oAuth callback.
-     *
      * @throws SocialSignInAccountNotUsed
      */
     public function handleLoginCallback(string $socialDriver, SocialUser $socialUser)
@@ -142,8 +98,9 @@ class SocialAuthService
         // When a user is not logged in and a matching SocialAccount exists,
         // Simply log the user into the application.
         if (!$isLoggedIn && $socialAccount !== null) {
-            $this->loginService->login($socialAccount->user, $socialDriver);
-
+            auth()->login($socialAccount->user);
+            Activity::add(ActivityType::AUTH_LOGIN, $socialAccount);
+            Theme::dispatch(ThemeEvents::AUTH_LOGIN, $socialDriver, $socialAccount->user);
             return redirect()->intended('/');
         }
 
@@ -153,21 +110,18 @@ class SocialAuthService
             $account = $this->newSocialAccount($socialDriver, $socialUser);
             $currentUser->socialAccounts()->save($account);
             session()->flash('success', trans('settings.users_social_connected', ['socialAccount' => $titleCaseDriver]));
-
             return redirect($currentUser->getEditUrl());
         }
 
         // When a user is logged in and the social account exists and is already linked to the current user.
         if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id === $currentUser->id) {
             session()->flash('error', trans('errors.social_account_existing', ['socialAccount' => $titleCaseDriver]));
-
             return redirect($currentUser->getEditUrl());
         }
 
         // When a user is logged in, A social account exists but the users do not match.
         if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id != $currentUser->id) {
             session()->flash('error', trans('errors.social_account_already_used_existing', ['socialAccount' => $titleCaseDriver]));
-
             return redirect($currentUser->getEditUrl());
         }
 
@@ -182,7 +136,6 @@ class SocialAuthService
 
     /**
      * Ensure the social driver is correct and supported.
-     *
      * @throws SocialDriverNotConfigured
      */
     protected function validateDriver(string $socialDriver): string
@@ -208,7 +161,6 @@ class SocialAuthService
         $lowerName = strtolower($driver);
         $configPrefix = 'services.' . $lowerName . '.';
         $config = [config($configPrefix . 'client_id'), config($configPrefix . 'client_secret'), config('services.callback_url')];
-
         return !in_array(false, $config) && !in_array(null, $config);
     }
 
@@ -258,9 +210,9 @@ class SocialAuthService
     public function newSocialAccount(string $socialDriver, SocialUser $socialUser): SocialAccount
     {
         return new SocialAccount([
-            'driver'    => $socialDriver,
+            'driver' => $socialDriver,
             'driver_id' => $socialUser->getId(),
-            'avatar'    => $socialUser->getAvatar(),
+            'avatar' => $socialUser->getAvatar()
         ]);
     }
 
@@ -273,18 +225,17 @@ class SocialAuthService
     }
 
     /**
-     * Provide redirect options per service for the Laravel Socialite driver.
+     * Provide redirect options per service for the Laravel Socialite driver
      */
-    protected function getDriverForRedirect(string $driverName): Provider
+    public function getSocialDriver(string $driverName): Provider
     {
         $driver = $this->socialite->driver($driverName);
 
-        if ($driver instanceof GoogleProvider && config('services.google.select_account')) {
+        if ($driverName === 'google' && config('services.google.select_account')) {
             $driver->with(['prompt' => 'select_account']);
         }
-
-        if (isset($this->configureForRedirectCallbacks[$driverName])) {
-            $this->configureForRedirectCallbacks[$driverName]($driver);
+        if ($driverName === 'azure') {
+            $driver->with(['resource' => 'https://graph.windows.net']);
         }
 
         return $driver;
@@ -297,19 +248,12 @@ class SocialAuthService
      * within the `Config/services.php` file.
      * Handler should be a Class@method handler to the SocialiteWasCalled event.
      */
-    public function addSocialDriver(
-        string $driverName,
-        array $config,
-        string $socialiteHandler,
-        callable $configureForRedirect = null
-    ) {
+    public function addSocialDriver(string $driverName, array $config, string $socialiteHandler)
+    {
         $this->validSocialDrivers[] = $driverName;
         config()->set('services.' . $driverName, $config);
         config()->set('services.' . $driverName . '.redirect', url('/login/service/' . $driverName . '/callback'));
         config()->set('services.' . $driverName . '.name', $config['name'] ?? $driverName);
         Event::listen(SocialiteWasCalled::class, $socialiteHandler);
-        if (!is_null($configureForRedirect)) {
-            $this->configureForRedirectCallbacks[$driverName] = $configureForRedirect;
-        }
     }
 }

app/Auth/Access/UserInviteService.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
 use BookStack\Auth\User;
 use BookStack\Notifications\UserInvite;
@@ -13,7 +11,6 @@ class UserInviteService extends UserTokenService
     /**
      * Send an invitation to a user to sign into BookStack
      * Removes existing invitation tokens.
-     *
      * @param User $user
      */
     public function sendInvitation(User $user)

app/Auth/Access/UserTokenService.php

@@ -1,56 +1,59 @@
-<?php
-
-namespace BookStack\Auth\Access;
+<?php namespace BookStack\Auth\Access;
 
 use BookStack\Auth\User;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Connection as Database;
 use Illuminate\Support\Str;
 use stdClass;
 
 class UserTokenService
 {
+
     /**
      * Name of table where user tokens are stored.
-     *
      * @var string
      */
     protected $tokenTable = 'user_tokens';
 
     /**
      * Token expiry time in hours.
-     *
      * @var int
      */
     protected $expiryTime = 24;
 
+    protected $db;
+
+    /**
+     * UserTokenService constructor.
+     * @param Database $db
+     */
+    public function __construct(Database $db)
+    {
+        $this->db = $db;
+    }
+
     /**
      * Delete all email confirmations that belong to a user.
-     *
      * @param User $user
-     *
      * @return mixed
      */
     public function deleteByUser(User $user)
     {
-        return DB::table($this->tokenTable)
+        return $this->db->table($this->tokenTable)
             ->where('user_id', '=', $user->id)
             ->delete();
     }
 
     /**
      * Get the user id from a token, while check the token exists and has not expired.
-     *
      * @param string $token
-     *
+     * @return int
      * @throws UserTokenNotFoundException
      * @throws UserTokenExpiredException
-     *
-     * @return int
      */
-    public function checkTokenAndGetUserId(string $token): int
+    public function checkTokenAndGetUserId(string $token) : int
     {
         $entry = $this->getEntryByToken($token);
 
@@ -67,74 +70,63 @@ class UserTokenService
 
     /**
      * Creates a unique token within the email confirmation database.
-     *
      * @return string
      */
-    protected function generateToken(): string
+    protected function generateToken() : string
     {
         $token = Str::random(24);
         while ($this->tokenExists($token)) {
             $token = Str::random(25);
         }
-
         return $token;
     }
 
     /**
      * Generate and store a token for the given user.
-     *
      * @param User $user
-     *
      * @return string
      */
-    protected function createTokenForUser(User $user): string
+    protected function createTokenForUser(User $user) : string
     {
         $token = $this->generateToken();
-        DB::table($this->tokenTable)->insert([
-            'user_id'    => $user->id,
-            'token'      => $token,
+        $this->db->table($this->tokenTable)->insert([
+            'user_id' => $user->id,
+            'token' => $token,
             'created_at' => Carbon::now(),
-            'updated_at' => Carbon::now(),
+            'updated_at' => Carbon::now()
         ]);
-
         return $token;
     }
 
     /**
      * Check if the given token exists.
-     *
      * @param string $token
-     *
      * @return bool
      */
-    protected function tokenExists(string $token): bool
+    protected function tokenExists(string $token) : bool
     {
-        return DB::table($this->tokenTable)
+        return $this->db->table($this->tokenTable)
             ->where('token', '=', $token)->exists();
     }
 
     /**
      * Get a token entry for the given token.
-     *
      * @param string $token
-     *
      * @return object|null
      */
     protected function getEntryByToken(string $token)
     {
-        return DB::table($this->tokenTable)
+        return $this->db->table($this->tokenTable)
             ->where('token', '=', $token)
             ->first();
     }
 
     /**
      * Check if the given token entry has expired.
-     *
      * @param stdClass $tokenEntry
-     *
      * @return bool
      */
-    protected function entryExpired(stdClass $tokenEntry): bool
+    protected function entryExpired(stdClass $tokenEntry) : bool
     {
         return Carbon::now()->subHours($this->expiryTime)
             ->gt(new Carbon($tokenEntry->created_at));

app/Auth/Permissions/EntityPermission.php

@@ -1,17 +1,15 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
+<?php namespace BookStack\Auth\Permissions;
 
 use BookStack\Model;
 
 class EntityPermission extends Model
 {
+
     protected $fillable = ['role_id', 'action'];
     public $timestamps = false;
 
     /**
      * Get all this restriction's attached entity.
-     *
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
     public function restrictable()

app/Auth/Permissions/JointPermission.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
+<?php namespace BookStack\Auth\Permissions;
 
 use BookStack\Auth\Role;
 use BookStack\Entities\Models\Entity;

app/Auth/Permissions/PermissionService.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
+<?php namespace BookStack\Auth\Permissions;
 
 use BookStack\Auth\Role;
 use BookStack\Auth\User;
@@ -50,7 +48,7 @@ class PermissionService
     }
 
     /**
-     * Set the database connection.
+     * Set the database connection
      */
     public function setConnection(Connection $connection)
     {
@@ -58,8 +56,7 @@ class PermissionService
     }
 
     /**
-     * Prepare the local entity cache and ensure it's empty.
-     *
+     * Prepare the local entity cache and ensure it's empty
      * @param Entity[] $entities
      */
     protected function readyEntityCache(array $entities = [])
@@ -76,7 +73,7 @@ class PermissionService
     }
 
     /**
-     * Get a book via ID, Checks local cache.
+     * Get a book via ID, Checks local cache
      */
     protected function getBook(int $bookId): ?Book
     {
@@ -88,7 +85,7 @@ class PermissionService
     }
 
     /**
-     * Get a chapter via ID, Checks local cache.
+     * Get a chapter via ID, Checks local cache
      */
     protected function getChapter(int $chapterId): ?Chapter
     {
@@ -154,13 +151,12 @@ class PermissionService
                 },
                 'pages' => function ($query) {
                     $query->withTrashed()->select(['id', 'restricted', 'owned_by', 'book_id', 'chapter_id']);
-                },
+                }
             ]);
     }
 
     /**
      * Build joint permissions for the given shelf and role combinations.
-     *
      * @throws Throwable
      */
     protected function buildJointPermissionsForShelves(EloquentCollection $shelves, array $roles, bool $deleteOld = false)
@@ -173,7 +169,6 @@ class PermissionService
 
     /**
      * Build joint permissions for the given book and role combinations.
-     *
      * @throws Throwable
      */
     protected function buildJointPermissionsForBooks(EloquentCollection $books, array $roles, bool $deleteOld = false)
@@ -198,7 +193,6 @@ class PermissionService
 
     /**
      * Rebuild the entity jointPermissions for a particular entity.
-     *
      * @throws Throwable
      */
     public function buildJointPermissionsForEntity(Entity $entity)
@@ -207,7 +201,6 @@ class PermissionService
         if ($entity instanceof Book) {
             $books = $this->bookFetchQuery()->where('id', '=', $entity->id)->get();
             $this->buildJointPermissionsForBooks($books, Role::query()->get()->all(), true);
-
             return;
         }
 
@@ -231,7 +224,6 @@ class PermissionService
 
     /**
      * Rebuild the entity jointPermissions for a collection of entities.
-     *
      * @throws Throwable
      */
     public function buildJointPermissionsForEntities(array $entities)
@@ -271,7 +263,6 @@ class PermissionService
 
     /**
      * Delete all of the entity jointPermissions for a list of entities.
-     *
      * @param Role[] $roles
      */
     protected function deleteManyJointPermissionsForRoles($roles)
@@ -284,9 +275,7 @@ class PermissionService
 
     /**
      * Delete the entity jointPermissions for a particular entity.
-     *
      * @param Entity $entity
-     *
      * @throws Throwable
      */
     public function deleteJointPermissionsForEntity(Entity $entity)
@@ -296,9 +285,7 @@ class PermissionService
 
     /**
      * Delete all of the entity jointPermissions for a list of entities.
-     *
      * @param Entity[] $entities
-     *
      * @throws Throwable
      */
     protected function deleteManyJointPermissionsForEntities(array $entities)
@@ -308,6 +295,7 @@ class PermissionService
         }
 
         $this->db->transaction(function () use ($entities) {
+
             foreach (array_chunk($entities, 1000) as $entityChunk) {
                 $query = $this->db->table('joint_permissions');
                 foreach ($entityChunk as $entity) {
@@ -323,10 +311,8 @@ class PermissionService
 
     /**
      * Create & Save entity jointPermissions for many entities and roles.
-     *
      * @param Entity[] $entities
-     * @param Role[]   $roles
-     *
+     * @param Role[] $roles
      * @throws Throwable
      */
     protected function createManyJointPermissions(array $entities, array $roles)
@@ -377,6 +363,7 @@ class PermissionService
         });
     }
 
+
     /**
      * Get the actions related to an entity.
      */
@@ -389,7 +376,6 @@ class PermissionService
         if ($entity instanceof Book) {
             $baseActions[] = 'chapter-create';
         }
-
         return $baseActions;
     }
 
@@ -411,7 +397,6 @@ class PermissionService
 
         if ($entity->restricted) {
             $hasAccess = $this->mapHasActiveRestriction($permissionMap, $entity, $role, $restrictionAction);
-
             return $this->createJointPermissionDataArray($entity, $role, $action, $hasAccess, $hasAccess);
         }
 
@@ -448,7 +433,6 @@ class PermissionService
     protected function mapHasActiveRestriction(array $entityMap, Entity $entity, Role $role, string $action): bool
     {
         $key = $entity->getMorphClass() . ':' . $entity->getRawAttribute('id') . ':' . $role->getRawAttribute('id') . ':' . $action;
-
         return $entityMap[$key] ?? false;
     }
 
@@ -459,19 +443,18 @@ class PermissionService
     protected function createJointPermissionDataArray(Entity $entity, Role $role, string $action, bool $permissionAll, bool $permissionOwn): array
     {
         return [
-            'role_id'            => $role->getRawAttribute('id'),
-            'entity_id'          => $entity->getRawAttribute('id'),
-            'entity_type'        => $entity->getMorphClass(),
-            'action'             => $action,
-            'has_permission'     => $permissionAll,
+            'role_id' => $role->getRawAttribute('id'),
+            'entity_id' => $entity->getRawAttribute('id'),
+            'entity_type' => $entity->getMorphClass(),
+            'action' => $action,
+            'has_permission' => $permissionAll,
             'has_permission_own' => $permissionOwn,
-            'owned_by'           => $entity->getRawAttribute('owned_by'),
+            'owned_by' => $entity->getRawAttribute('owned_by'),
         ];
     }
 
     /**
      * Checks if an entity has a restriction set upon it.
-     *
      * @param HasCreatorAndUpdater|HasOwner $ownable
      */
     public function checkOwnableUserAccess(Model $ownable, string $permission): bool
@@ -490,8 +473,7 @@ class PermissionService
             $ownPermission = $user && $user->can($permission . '-own');
             $ownerField = ($ownable instanceof Entity) ? 'owned_by' : 'created_by';
             $isOwner = $user && $user->id === $ownable->$ownerField;
-
-            return $allPermission || ($isOwner && $ownPermission);
+            return ($allPermission || ($isOwner && $ownPermission));
         }
 
         // Handle abnormal create jointPermissions
@@ -501,7 +483,6 @@ class PermissionService
 
         $hasAccess = $this->entityRestrictionQuery($baseQuery, $action)->count() > 0;
         $this->clean();
-
         return $hasAccess;
     }
 
@@ -528,7 +509,6 @@ class PermissionService
 
         $hasPermission = $permissionQuery->count() > 0;
         $this->clean();
-
         return $hasPermission;
     }
 
@@ -549,7 +529,6 @@ class PermissionService
         });
 
         $this->clean();
-
         return $q;
     }
 
@@ -560,7 +539,6 @@ class PermissionService
     public function restrictEntityQuery(Builder $query, string $ability = 'view'): Builder
     {
         $this->clean();
-
         return $query->where(function (Builder $parentQuery) use ($ability) {
             $parentQuery->whereHas('jointPermissions', function (Builder $permissionQuery) use ($ability) {
                 $permissionQuery->whereIn('role_id', $this->getCurrentUserRoles())
@@ -602,39 +580,25 @@ class PermissionService
 
     /**
      * Filter items that have entities set as a polymorphic relation.
-     * For simplicity, this will not return results attached to draft pages.
-     * Draft pages should never really have related items though.
-     *
-     * @param Builder|QueryBuilder $query
      */
-    public function filterRestrictedEntityRelations($query, string $tableName, string $entityIdColumn, string $entityTypeColumn, string $action = 'view')
+    public function filterRestrictedEntityRelations(Builder $query, string $tableName, string $entityIdColumn, string $entityTypeColumn, string $action = 'view'): Builder
     {
         $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn, 'entityTypeColumn' => $entityTypeColumn];
-        $pageMorphClass = (new Page())->getMorphClass();
 
-        $q = $query->whereExists(function ($permissionQuery) use (&$tableDetails, $action) {
-            /** @var Builder $permissionQuery */
-            $permissionQuery->select(['role_id'])->from('joint_permissions')
-                ->whereColumn('joint_permissions.entity_id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
-                ->whereColumn('joint_permissions.entity_type', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'])
-                ->where('joint_permissions.action', '=', $action)
-                ->whereIn('joint_permissions.role_id', $this->getCurrentUserRoles())
-                ->where(function (QueryBuilder $query) {
-                    $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
-                });
-        })->where(function ($query) use ($tableDetails, $pageMorphClass) {
-            /** @var Builder $query */
-            $query->where($tableDetails['entityTypeColumn'], '!=', $pageMorphClass)
-                ->orWhereExists(function (QueryBuilder $query) use ($tableDetails, $pageMorphClass) {
-                    $query->select('id')->from('pages')
-                        ->whereColumn('pages.id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
-                        ->where($tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'], '=', $pageMorphClass)
-                        ->where('pages.draft', '=', false);
-                });
+        $q = $query->where(function ($query) use ($tableDetails, $action) {
+            $query->whereExists(function ($permissionQuery) use (&$tableDetails, $action) {
+                $permissionQuery->select('id')->from('joint_permissions')
+                    ->whereRaw('joint_permissions.entity_id=' . $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+                    ->whereRaw('joint_permissions.entity_type=' . $tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'])
+                    ->where('action', '=', $action)
+                    ->whereIn('role_id', $this->getCurrentUserRoles())
+                    ->where(function (QueryBuilder $query) {
+                        $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+                    });
+            });
         });
 
         $this->clean();
-
         return $q;
     }
 
@@ -644,60 +608,43 @@ class PermissionService
      */
     public function filterRelatedEntity(string $entityClass, Builder $query, string $tableName, string $entityIdColumn): Builder
     {
-        $fullEntityIdColumn = $tableName . '.' . $entityIdColumn;
-        $instance = new $entityClass();
-        $morphClass = $instance->getMorphClass();
+        $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn];
+        $morphClass = app($entityClass)->getMorphClass();
 
-        $existsQuery = function ($permissionQuery) use ($fullEntityIdColumn, $morphClass) {
-            /** @var Builder $permissionQuery */
-            $permissionQuery->select('joint_permissions.role_id')->from('joint_permissions')
-                ->whereColumn('joint_permissions.entity_id', '=', $fullEntityIdColumn)
-                ->where('joint_permissions.entity_type', '=', $morphClass)
-                ->where('joint_permissions.action', '=', 'view')
-                ->whereIn('joint_permissions.role_id', $this->getCurrentUserRoles())
-                ->where(function (QueryBuilder $query) {
-                    $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+        $q = $query->where(function ($query) use ($tableDetails, $morphClass) {
+            $query->where(function ($query) use (&$tableDetails, $morphClass) {
+                $query->whereExists(function ($permissionQuery) use (&$tableDetails, $morphClass) {
+                    $permissionQuery->select('id')->from('joint_permissions')
+                        ->whereRaw('joint_permissions.entity_id=' . $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+                        ->where('entity_type', '=', $morphClass)
+                        ->where('action', '=', 'view')
+                        ->whereIn('role_id', $this->getCurrentUserRoles())
+                        ->where(function (QueryBuilder $query) {
+                            $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+                        });
                 });
-        };
-
-        $q = $query->where(function ($query) use ($existsQuery, $fullEntityIdColumn) {
-            $query->whereExists($existsQuery)
-                ->orWhere($fullEntityIdColumn, '=', 0);
+            })->orWhere($tableDetails['entityIdColumn'], '=', 0);
         });
 
-        if ($instance instanceof Page) {
-            // Prevent visibility of non-owned draft pages
-            $q->whereExists(function (QueryBuilder $query) use ($fullEntityIdColumn) {
-                $query->select('id')->from('pages')
-                    ->whereColumn('pages.id', '=', $fullEntityIdColumn)
-                    ->where(function (QueryBuilder $query) {
-                        $query->where('pages.draft', '=', false)
-                            ->orWhere('pages.owned_by', '=', $this->currentUser()->id);
-                    });
-            });
-        }
-
         $this->clean();
-
         return $q;
     }
 
     /**
      * Add the query for checking the given user id has permission
      * within the join_permissions table.
-     *
      * @param QueryBuilder|Builder $query
      */
     protected function addJointHasPermissionCheck($query, int $userIdToCheck)
     {
-        $query->where('joint_permissions.has_permission', '=', true)->orWhere(function ($query) use ($userIdToCheck) {
-            $query->where('joint_permissions.has_permission_own', '=', true)
-                ->where('joint_permissions.owned_by', '=', $userIdToCheck);
+        $query->where('has_permission', '=', true)->orWhere(function ($query) use ($userIdToCheck) {
+            $query->where('has_permission_own', '=', true)
+                ->where('owned_by', '=', $userIdToCheck);
         });
     }
 
     /**
-     * Get the current user.
+     * Get the current user
      */
     private function currentUser(): User
     {

app/Auth/Permissions/PermissionsRepo.php

@@ -1,6 +1,4 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
+<?php namespace BookStack\Auth\Permissions;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\Role;
@@ -11,6 +9,7 @@ use Illuminate\Database\Eloquent\Collection;
 
 class PermissionsRepo
 {
+
     protected $permission;
     protected $role;
     protected $permissionService;
@@ -57,14 +56,12 @@ class PermissionsRepo
     public function saveNewRole(array $roleData): Role
     {
         $role = $this->role->newInstance($roleData);
-        $role->mfa_enforced = ($roleData['mfa_enforced'] ?? 'false') === 'true';
         $role->save();
 
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
         $this->permissionService->buildJointPermissionForRole($role);
         Activity::add(ActivityType::ROLE_CREATE, $role);
-
         return $role;
     }
 
@@ -91,7 +88,6 @@ class PermissionsRepo
         $this->assignRolePermissions($role, $permissions);
 
         $role->fill($roleData);
-        $role->mfa_enforced = ($roleData['mfa_enforced'] ?? 'false') === 'true';
         $role->save();
         $this->permissionService->buildJointPermissionForRole($role);
         Activity::add(ActivityType::ROLE_UPDATE, $role);
@@ -120,7 +116,6 @@ class PermissionsRepo
      * Check it's not an admin role or set as default before deleting.
      * If an migration Role ID is specified the users assign to the current role
      * will be added to the role of the specified id.
-     *
      * @throws PermissionsException
      * @throws Exception
      */
@@ -132,7 +127,7 @@ class PermissionsRepo
         // Prevent deleting admin role or default registration role.
         if ($role->system_name && in_array($role->system_name, $this->systemRoles)) {
             throw new PermissionsException(trans('errors.role_system_cannot_be_deleted'));
-        } elseif ($role->id === intval(setting('registration-role'))) {
+        } else if ($role->id === intval(setting('registration-role'))) {
             throw new PermissionsException(trans('errors.role_registration_default_cannot_delete'));
         }
 

app/Auth/Permissions/RolePermission.php

@@ -1,10 +1,7 @@
-<?php
-
-namespace BookStack\Auth\Permissions;
+<?php namespace BookStack\Auth\Permissions;
 
 use BookStack\Auth\Role;
 use BookStack\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
  * @property int $id
@@ -14,15 +11,17 @@ class RolePermission extends Model
     /**
      * The roles that belong to the permission.
      */
-    public function roles(): BelongsToMany
+    public function roles()
     {
         return $this->belongsToMany(Role::class, 'permission_role', 'permission_id', 'role_id');
     }
 
     /**
      * Get the permission object by name.
+     * @param $name
+     * @return mixed
      */
-    public static function getByName(string $name): ?RolePermission
+    public static function getByName($name)
     {
         return static::where('name', '=', $name)->first();
     }

app/Auth/Queries/AllUsersPaginatedAndSorted.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Queries;
-
-use BookStack\Auth\User;
-use Illuminate\Pagination\LengthAwarePaginator;
-
-/**
- * Get all the users with their permissions in a paginated format.
- * Note: Due to the use of email search this should only be used when
- * user is assumed to be trusted. (Admin users).
- * Email search can be abused to extract email addresses.
- */
-class AllUsersPaginatedAndSorted
-{
-    /**
-     * @param array{sort: string, order: string, search: string} $sortData
-     */
-    public function run(int $count, array $sortData): LengthAwarePaginator
-    {
-        $sort = $sortData['sort'];
-
-        $query = User::query()->select(['*'])
-            ->scopes(['withLastActivityAt'])
-            ->with(['roles', 'avatar'])
-            ->withCount('mfaValues')
-            ->orderBy($sort, $sortData['order']);
-
-        if ($sortData['search']) {
-            $term = '%' . $sortData['search'] . '%';
-            $query->where(function ($query) use ($term) {
-                $query->where('name', 'like', $term)
-                    ->orWhere('email', 'like', $term);
-            });
-        }
-
-        return $query->paginate($count);
-    }
-}

app/Auth/Queries/UserContentCounts.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Queries;
-
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
-
-/**
- * Get asset created counts for the given user.
- */
-class UserContentCounts
-{
-    /**
-     * @return array{pages: int, chapters: int, books: int, shelves: int}
-     */
-    public function run(User $user): array
-    {
-        $createdBy = ['created_by' => $user->id];
-
-        return [
-            'pages'    => Page::visible()->where($createdBy)->count(),
-            'chapters' => Chapter::visible()->where($createdBy)->count(),
-            'books'    => Book::visible()->where($createdBy)->count(),
-            'shelves'  => Bookshelf::visible()->where($createdBy)->count(),
-        ];
-    }
-}

app/Auth/Queries/UserRecentlyCreatedContent.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Queries;
-
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-
-/**
- * Get the recently created content for the provided user.
- */
-class UserRecentlyCreatedContent
-{
-    /**
-     * @return array{pages: Collection, chapters: Collection, books: Collection, shelves: Collection}
-     */
-    public function run(User $user, int $count): array
-    {
-        $query = function (Builder $query) use ($user, $count) {
-            return $query->orderBy('created_at', 'desc')
-                ->where('created_by', '=', $user->id)
-                ->take($count)
-                ->get();
-        };
-
-        return [
-            'pages'    => $query(Page::visible()->where('draft', '=', false)),
-            'chapters' => $query(Chapter::visible()),
-            'books'    => $query(Book::visible()),
-            'shelves'  => $query(Bookshelf::visible()),
-        ];
-    }
-}

app/Auth/Role.php

@@ -1,35 +1,26 @@
-<?php
-
-namespace BookStack\Auth;
+<?php namespace BookStack\Auth;
 
 use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Auth\Permissions\RolePermission;
 use BookStack\Interfaces\Loggable;
 use BookStack\Model;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * Class Role.
- *
- * @property int        $id
- * @property string     $display_name
- * @property string     $description
- * @property string     $external_auth_id
- * @property string     $system_name
- * @property bool       $mfa_enforced
- * @property Collection $users
+ * Class Role
+ * @property int $id
+ * @property string $display_name
+ * @property string $description
+ * @property string $external_auth_id
+ * @property string $system_name
  */
 class Role extends Model implements Loggable
 {
-    use HasFactory;
 
     protected $fillable = ['display_name', 'description', 'external_auth_id'];
 
-    protected $hidden = ['pivot'];
-
     /**
      * The roles that belong to the role.
      */
@@ -65,7 +56,6 @@ class Role extends Model implements Loggable
                 return true;
             }
         }
-
         return false;
     }
 
@@ -88,7 +78,7 @@ class Role extends Model implements Loggable
     /**
      * Get the role of the specified display name.
      */
-    public static function getRole(string $displayName): ?self
+    public static function getRole(string $displayName): ?Role
     {
         return static::query()->where('display_name', '=', $displayName)->first();
     }
@@ -96,13 +86,13 @@ class Role extends Model implements Loggable
     /**
      * Get the role object for the specified system role.
      */
-    public static function getSystemRole(string $systemName): ?self
+    public static function getSystemRole(string $systemName): ?Role
     {
         return static::query()->where('system_name', '=', $systemName)->first();
     }
 
     /**
-     * Get all visible roles.
+     * Get all visible roles
      */
     public static function visible(): Collection
     {
@@ -114,14 +104,11 @@ class Role extends Model implements Loggable
      */
     public static function restrictable(): Collection
     {
-        return static::query()
-            ->where('system_name', '!=', 'admin')
-            ->orderBy('display_name', 'asc')
-            ->get();
+        return static::query()->where('system_name', '!=', 'admin')->get();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function logDescriptor(): string
     {

app/Auth/SocialAccount.php

@@ -1,18 +1,16 @@
-<?php
-
-namespace BookStack\Auth;
+<?php namespace BookStack\Auth;
 
 use BookStack\Interfaces\Loggable;
 use BookStack\Model;
 
 /**
- * Class SocialAccount.
- *
+ * Class SocialAccount
  * @property string $driver
- * @property User   $user
+ * @property User $user
  */
 class SocialAccount extends Model implements Loggable
 {
+
     protected $fillable = ['user_id', 'driver', 'driver_id', 'timestamps'];
 
     public function user()
@@ -21,7 +19,7 @@ class SocialAccount extends Model implements Loggable
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function logDescriptor(): string
     {

app/Auth/User.php

@@ -1,10 +1,6 @@
-<?php
+<?php namespace BookStack\Auth;
 
-namespace BookStack\Auth;
-
-use BookStack\Actions\Favourite;
 use BookStack\Api\ApiToken;
-use BookStack\Auth\Access\Mfa\MfaValue;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Interfaces\Loggable;
 use BookStack\Interfaces\Sluggable;
@@ -18,7 +14,6 @@ use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -26,39 +21,32 @@ use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Collection;
 
 /**
- * Class User.
- *
- * @property int        $id
- * @property string     $name
- * @property string     $slug
- * @property string     $email
- * @property string     $password
- * @property Carbon     $created_at
- * @property Carbon     $updated_at
- * @property bool       $email_confirmed
- * @property int        $image_id
- * @property string     $external_auth_id
- * @property string     $system_name
+ * Class User
+ * @property string $id
+ * @property string $name
+ * @property string $slug
+ * @property string $email
+ * @property string $password
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property bool $email_confirmed
+ * @property int $image_id
+ * @property string $external_auth_id
+ * @property string $system_name
  * @property Collection $roles
- * @property Collection $mfaValues
  */
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract, Loggable, Sluggable
 {
-    use HasFactory;
-    use Authenticatable;
-    use CanResetPassword;
-    use Notifiable;
+    use Authenticatable, CanResetPassword, Notifiable;
 
     /**
      * The database table used by the model.
-     *
      * @var string
      */
     protected $table = 'users';
 
     /**
      * The attributes that are mass assignable.
-     *
      * @var array
      */
     protected $fillable = ['name', 'email'];
@@ -67,37 +55,35 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     /**
      * The attributes excluded from the model's JSON form.
-     *
      * @var array
      */
     protected $hidden = [
         'password', 'remember_token', 'system_name', 'email_confirmed', 'external_auth_id', 'email',
-        'created_at', 'updated_at', 'image_id', 'roles', 'avatar', 'user_id',
+        'created_at', 'updated_at', 'image_id',
     ];
 
     /**
      * This holds the user's permissions when loaded.
+     * @var ?Collection
      */
-    protected ?Collection $permissions;
+    protected $permissions;
 
     /**
      * This holds the default user when loaded.
-     *
      * @var null|User
      */
-    protected static ?User $defaultUser = null;
+    protected static $defaultUser = null;
 
     /**
      * Returns the default public user.
      */
-    public static function getDefault(): self
+    public static function getDefault(): User
     {
         if (!is_null(static::$defaultUser)) {
             return static::$defaultUser;
         }
-
+        
         static::$defaultUser = static::query()->where('system_name', '=', 'public')->first();
-
         return static::$defaultUser;
     }
 
@@ -111,15 +97,13 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     /**
      * The roles that belong to the user.
-     *
      * @return BelongsToMany
      */
     public function roles()
     {
         if ($this->id === 0) {
-            return;
+            return ;
         }
-
         return $this->belongsToMany(Role::class);
     }
 
@@ -144,7 +128,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function attachDefaultRole(): void
     {
-        $roleId = intval(setting('registration-role'));
+        $roleId = setting('registration-role');
         if ($roleId && $this->roles()->where('id', '=', $roleId)->count() === 0) {
             $this->roles()->attach($roleId);
         }
@@ -176,6 +160,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             ->leftJoin('permission_role', 'ru.role_id', '=', 'permission_role.role_id')
             ->leftJoin('role_permissions', 'permission_role.permission_id', '=', 'role_permissions.id')
             ->where('ru.user_id', '=', $this->id)
+            ->get()
             ->pluck('name');
 
         return $this->permissions;
@@ -208,9 +193,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     /**
      * Check if the user has a social account,
      * If a driver is passed it checks for that single account type.
-     *
      * @param bool|string $socialDriver
-     *
      * @return bool
      */
     public function hasSocialAccount($socialDriver = false)
@@ -223,7 +206,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     }
 
     /**
-     * Returns a URL to the user's avatar.
+     * Returns a URL to the user's avatar
      */
     public function getAvatar(int $size = 50): string
     {
@@ -238,7 +221,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         } catch (Exception $err) {
             $avatar = $default;
         }
-
         return $avatar;
     }
 
@@ -258,22 +240,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         return $this->hasMany(ApiToken::class);
     }
 
-    /**
-     * Get the favourite instances for this user.
-     */
-    public function favourites(): HasMany
-    {
-        return $this->hasMany(Favourite::class);
-    }
-
-    /**
-     * Get the MFA values belonging to this use.
-     */
-    public function mfaValues(): HasMany
-    {
-        return $this->hasMany(MfaValue::class);
-    }
-
     /**
      * Get the last activity time for this user.
      */
@@ -293,7 +259,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     public function getEditUrl(string $path = ''): string
     {
         $uri = '/settings/users/' . $this->id . '/' . trim($path, '/');
-
         return url(rtrim($uri, '/'));
     }
 
@@ -324,9 +289,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     /**
      * Send the password reset notification.
-     *
-     * @param string $token
-     *
+     * @param  string  $token
      * @return void
      */
     public function sendPasswordResetNotification($token)
@@ -335,7 +298,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function logDescriptor(): string
     {
@@ -343,12 +306,11 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function refreshSlug(): string
     {
         $this->slug = app(SlugGenerator::class)->generate($this);
-
         return $this->slug;
     }
 }

app/Auth/UserRepo.php

@@ -1,30 +1,32 @@
-<?php
+<?php namespace BookStack\Auth;
 
-namespace BookStack\Auth;
-
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\UserInviteService;
+use Activity;
 use BookStack\Entities\EntityProvider;
-use BookStack\Exceptions\NotifyException;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\UserUpdateException;
-use BookStack\Facades\Activity;
+use BookStack\Uploads\Image;
 use BookStack\Uploads\UserAvatars;
 use Exception;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Images;
+use Log;
 
 class UserRepo
 {
-    protected UserAvatars $userAvatar;
-    protected UserInviteService $inviteService;
+    protected $userAvatar;
 
     /**
      * UserRepo constructor.
      */
-    public function __construct(UserAvatars $userAvatar, UserInviteService $inviteService)
+    public function __construct(UserAvatars $userAvatar)
     {
         $this->userAvatar = $userAvatar;
-        $this->inviteService = $inviteService;
     }
 
     /**
@@ -52,164 +54,65 @@ class UserRepo
     }
 
     /**
-     * Create a new basic instance of user with the given pre-validated data.
-     *
-     * @param array{name: string, email: string, password: ?string, external_auth_id: ?string, language: ?string, roles: ?array} $data
+     * Get all the users with their permissions.
      */
-    public function createWithoutActivity(array $data, bool $emailConfirmed = false): User
+    public function getAllUsers(): Collection
     {
-        $user = new User();
-        $user->name = $data['name'];
-        $user->email = $data['email'];
-        $user->password = bcrypt(empty($data['password']) ? Str::random(32) : $data['password']);
-        $user->email_confirmed = $emailConfirmed;
-        $user->external_auth_id = $data['external_auth_id'] ?? '';
+        return User::query()->with('roles', 'avatar')->orderBy('name', 'asc')->get();
+    }
 
-        $user->refreshSlug();
-        $user->save();
+    /**
+     * Get all the users with their permissions in a paginated format.
+     */
+    public function getAllUsersPaginatedAndSorted(int $count, array $sortData): LengthAwarePaginator
+    {
+        $sort = $sortData['sort'];
 
-        if (!empty($data['language'])) {
-            setting()->putUser($user, 'language', $data['language']);
+        $query = User::query()->select(['*'])
+            ->withLastActivityAt()
+            ->with(['roles', 'avatar'])
+            ->orderBy($sort, $sortData['order']);
+
+        if ($sortData['search']) {
+            $term = '%' . $sortData['search'] . '%';
+            $query->where(function ($query) use ($term) {
+                $query->where('name', 'like', $term)
+                    ->orWhere('email', 'like', $term);
+            });
         }
 
-        if (isset($data['roles'])) {
-            $this->setUserRoles($user, $data['roles']);
-        }
+        return $query->paginate($count);
+    }
 
+     /**
+     * Creates a new user and attaches a role to them.
+     */
+    public function registerNew(array $data, bool $emailConfirmed = false): User
+    {
+        $user = $this->create($data, $emailConfirmed);
+        $user->attachDefaultRole();
         $this->downloadAndAssignUserAvatar($user);
 
         return $user;
     }
 
     /**
-     * As per "createWithoutActivity" but records a "create" activity.
-     *
-     * @param array{name: string, email: string, password: ?string, external_auth_id: ?string, language: ?string, roles: ?array} $data
+     * Assign a user to a system-level role.
+     * @throws NotFoundException
      */
-    public function create(array $data, bool $sendInvite = false): User
+    public function attachSystemRole(User $user, string $systemRoleName)
     {
-        $user = $this->createWithoutActivity($data, true);
-
-        if ($sendInvite) {
-            $this->inviteService->sendInvitation($user);
-        }
-
-        Activity::add(ActivityType::USER_CREATE, $user);
-
-        return $user;
-    }
-
-    /**
-     * Update the given user with the given data.
-     *
-     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string} $data
-     *
-     * @throws UserUpdateException
-     */
-    public function update(User $user, array $data, bool $manageUsersAllowed): User
-    {
-        if (!empty($data['name'])) {
-            $user->name = $data['name'];
-            $user->refreshSlug();
-        }
-
-        if (!empty($data['email']) && $manageUsersAllowed) {
-            $user->email = $data['email'];
-        }
-
-        if (!empty($data['external_auth_id']) && $manageUsersAllowed) {
-            $user->external_auth_id = $data['external_auth_id'];
-        }
-
-        if (isset($data['roles']) && $manageUsersAllowed) {
-            $this->setUserRoles($user, $data['roles']);
-        }
-
-        if (!empty($data['password'])) {
-            $user->password = bcrypt($data['password']);
-        }
-
-        if (!empty($data['language'])) {
-            setting()->putUser($user, 'language', $data['language']);
-        }
-
-        $user->save();
-        Activity::add(ActivityType::USER_UPDATE, $user);
-
-        return $user;
-    }
-
-    /**
-     * Remove the given user from storage, Delete all related content.
-     *
-     * @throws Exception
-     */
-    public function destroy(User $user, ?int $newOwnerId = null)
-    {
-        $this->ensureDeletable($user);
-
-        $user->socialAccounts()->delete();
-        $user->apiTokens()->delete();
-        $user->favourites()->delete();
-        $user->mfaValues()->delete();
-        $user->delete();
-
-        // Delete user profile images
-        $this->userAvatar->destroyAllForUser($user);
-
-        if (!empty($newOwnerId)) {
-            $newOwner = User::query()->find($newOwnerId);
-            if (!is_null($newOwner)) {
-                $this->migrateOwnership($user, $newOwner);
-            }
-        }
-
-        Activity::add(ActivityType::USER_DELETE, $user);
-    }
-
-    /**
-     * @throws NotifyException
-     */
-    protected function ensureDeletable(User $user): void
-    {
-        if ($this->isOnlyAdmin($user)) {
-            throw new NotifyException(trans('errors.users_cannot_delete_only_admin'), $user->getEditUrl());
-        }
-
-        if ($user->system_name === 'public') {
-            throw new NotifyException(trans('errors.users_cannot_delete_guest'), $user->getEditUrl());
-        }
-    }
-
-    /**
-     * Migrate ownership of items in the system from one user to another.
-     */
-    protected function migrateOwnership(User $fromUser, User $toUser)
-    {
-        $entities = (new EntityProvider())->all();
-        foreach ($entities as $instance) {
-            $instance->newQuery()->where('owned_by', '=', $fromUser->id)
-                ->update(['owned_by' => $toUser->id]);
-        }
-    }
-
-    /**
-     * Get an avatar image for a user and set it as their avatar.
-     * Returns early if avatars disabled or not set in config.
-     */
-    protected function downloadAndAssignUserAvatar(User $user): void
-    {
-        try {
-            $this->userAvatar->fetchAndAssignToUser($user);
-        } catch (Exception $e) {
-            Log::error('Failed to save user avatar image');
+        $role = Role::getSystemRole($systemRoleName);
+        if (is_null($role)) {
+            throw new NotFoundException("Role '{$systemRoleName}' not found");
         }
+        $user->attachRole($role);
     }
 
     /**
      * Checks if the give user is the only admin.
      */
-    protected function isOnlyAdmin(User $user): bool
+    public function isOnlyAdmin(User $user): bool
     {
         if (!$user->hasSystemRole('admin')) {
             return false;
@@ -225,10 +128,9 @@ class UserRepo
 
     /**
      * Set the assigned user roles via an array of role IDs.
-     *
      * @throws UserUpdateException
      */
-    protected function setUserRoles(User $user, array $roles)
+    public function setUserRoles(User $user, array $roles)
     {
         if ($this->demotingLastAdmin($user, $roles)) {
             throw new UserUpdateException(trans('errors.role_cannot_remove_only_admin'), $user->getEditUrl());
@@ -241,7 +143,7 @@ class UserRepo
      * Check if the given user is the last admin and their new roles no longer
      * contains the admin role.
      */
-    protected function demotingLastAdmin(User $user, array $newRoles): bool
+    protected function demotingLastAdmin(User $user, array $newRoles) : bool
     {
         if ($this->isOnlyAdmin($user)) {
             $adminRole = Role::getSystemRole('admin');
@@ -252,4 +154,127 @@ class UserRepo
 
         return false;
     }
+
+    /**
+     * Create a new basic instance of user.
+     */
+    public function create(array $data, bool $emailConfirmed = false): User
+    {
+        $details = [
+            'name'     => $data['name'],
+            'email'    => $data['email'],
+            'password' => bcrypt($data['password']),
+            'email_confirmed' => $emailConfirmed,
+            'external_auth_id' => $data['external_auth_id'] ?? '',
+        ];
+
+        $user = new User();
+        $user->forceFill($details);
+        $user->refreshSlug();
+        $user->save();
+
+        return $user;
+    }
+
+    /**
+     * Remove the given user from storage, Delete all related content.
+     * @throws Exception
+     */
+    public function destroy(User $user, ?int $newOwnerId = null)
+    {
+        $user->socialAccounts()->delete();
+        $user->apiTokens()->delete();
+        $user->delete();
+        
+        // Delete user profile images
+        $profileImages = Image::query()->where('type', '=', 'user')
+            ->where('uploaded_to', '=', $user->id)
+            ->get();
+
+        foreach ($profileImages as $image) {
+            Images::destroy($image);
+        }
+
+        if (!empty($newOwnerId)) {
+            $newOwner = User::query()->find($newOwnerId);
+            if (!is_null($newOwner)) {
+                $this->migrateOwnership($user, $newOwner);
+            }
+        }
+    }
+
+    /**
+     * Migrate ownership of items in the system from one user to another.
+     */
+    protected function migrateOwnership(User $fromUser, User $toUser)
+    {
+        $entities = (new EntityProvider)->all();
+        foreach ($entities as $instance) {
+            $instance->newQuery()->where('owned_by', '=', $fromUser->id)
+                ->update(['owned_by' => $toUser->id]);
+        }
+    }
+
+    /**
+     * Get the latest activity for a user.
+     */
+    public function getActivity(User $user, int $count = 20, int $page = 0): array
+    {
+        return Activity::userActivity($user, $count, $page);
+    }
+
+    /**
+     * Get the recently created content for this given user.
+     */
+    public function getRecentlyCreated(User $user, int $count = 20): array
+    {
+        $query = function (Builder $query) use ($user, $count) {
+            return $query->orderBy('created_at', 'desc')
+                ->where('created_by', '=', $user->id)
+                ->take($count)
+                ->get();
+        };
+
+        return [
+            'pages'    => $query(Page::visible()->where('draft', '=', false)),
+            'chapters' => $query(Chapter::visible()),
+            'books'    => $query(Book::visible()),
+            'shelves'  => $query(Bookshelf::visible()),
+        ];
+    }
+
+    /**
+     * Get asset created counts for the give user.
+     */
+    public function getAssetCounts(User $user): array
+    {
+        $createdBy = ['created_by' => $user->id];
+        return [
+            'pages'    =>  Page::visible()->where($createdBy)->count(),
+            'chapters'    =>  Chapter::visible()->where($createdBy)->count(),
+            'books'    =>  Book::visible()->where($createdBy)->count(),
+            'shelves'    =>  Bookshelf::visible()->where($createdBy)->count(),
+        ];
+    }
+
+    /**
+     * Get the roles in the system that are assignable to a user.
+     */
+    public function getAllRoles(): Collection
+    {
+        return Role::query()->orderBy('display_name', 'asc')->get();
+    }
+
+    /**
+     * Get an avatar image for a user and set it as their avatar.
+     * Returns early if avatars disabled or not set in config.
+     */
+    public function downloadAndAssignUserAvatar(User $user): void
+    {
+        try {
+            $this->userAvatar->fetchAndAssignToUser($user);
+        } catch (Exception $e) {
+            Log::error('Failed to save user avatar image');
+        }
+    }
 }

app/Config/api.php

@@ -18,6 +18,6 @@ return [
     'max_item_count' => env('API_MAX_ITEM_COUNT', 500),
 
     // The number of API requests that can be made per minute by a single user.
-    'requests_per_minute' => env('API_REQUESTS_PER_MIN', 180),
+    'requests_per_minute' => env('API_REQUESTS_PER_MIN', 180)
 
 ];

app/Config/app.php

@@ -31,19 +31,11 @@ return [
     // Set to -1 for unlimited recycle bin lifetime.
     'recycle_bin_lifetime' => env('RECYCLE_BIN_LIFETIME', 30),
 
-    // The limit for all uploaded files, including images and attachments in MB.
-    'upload_limit' => env('FILE_UPLOAD_SIZE_LIMIT', 50),
-
     // Allow <script> tags to entered within page content.
     // <script> tags are escaped by default.
     // Even when overridden the WYSIWYG editor may still escape script content.
     'allow_content_scripts' => env('ALLOW_CONTENT_SCRIPTS', false),
 
-    // Allow server-side fetches to be performed to potentially unknown
-    // and user-provided locations. Primarily used in exports when loading
-    // in externally referenced assets.
-    'allow_untrusted_server_fetching' => env('ALLOW_UNTRUSTED_SERVER_FETCHING', false),
-
     // Override the default behaviour for allowing crawlers to crawl the instance.
     // May be ignored if view has be overridden or modified.
     // Defaults to null since, if not set, 'app-public' status used instead.
@@ -57,13 +49,6 @@ return [
     // Space separated if multiple. BookStack host domain is auto-inferred.
     'iframe_hosts' => env('ALLOWED_IFRAME_HOSTS', null),
 
-    // A list of sources/hostnames that can be loaded within iframes within BookStack.
-    // Space separated if multiple. BookStack host domain is auto-inferred.
-    // Can be set to a lone "*" to allow all sources for iframe content (Not advised).
-    // Defaults to a set of common services.
-    // Current host and source for the "DRAWIO" setting will be auto-appended to the sources configured.
-    'iframe_sources' => env('ALLOWED_IFRAME_SOURCES', 'https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com'),
-
     // Application timezone for back-end date functions.
     'timezone' => env('APP_TIMEZONE', 'UTC'),
 
@@ -71,7 +56,7 @@ return [
     'locale' => env('APP_LANG', 'en'),
 
     // Locales available
-    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'et', 'eu', 'fa', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'lt', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'uz', 'vi', 'zh_CN', 'zh_TW'],
+    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'id', 'it', 'ja', 'ko', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
 
     //  Application Fallback Locale
     'fallback_locale' => 'en',
@@ -153,57 +138,57 @@ return [
 
     // Class aliases, Registered on application start
     'aliases' => [
-        // Laravel
-        'App'          => Illuminate\Support\Facades\App::class,
-        'Arr'          => Illuminate\Support\Arr::class,
-        'Artisan'      => Illuminate\Support\Facades\Artisan::class,
-        'Auth'         => Illuminate\Support\Facades\Auth::class,
-        'Blade'        => Illuminate\Support\Facades\Blade::class,
-        'Bus'          => Illuminate\Support\Facades\Bus::class,
-        'Cache'        => Illuminate\Support\Facades\Cache::class,
-        'Config'       => Illuminate\Support\Facades\Config::class,
-        'Cookie'       => Illuminate\Support\Facades\Cookie::class,
-        'Crypt'        => Illuminate\Support\Facades\Crypt::class,
-        'Date'         => Illuminate\Support\Facades\Date::class,
-        'DB'           => Illuminate\Support\Facades\DB::class,
-        'Eloquent'     => Illuminate\Database\Eloquent\Model::class,
-        'Event'        => Illuminate\Support\Facades\Event::class,
-        'File'         => Illuminate\Support\Facades\File::class,
-        'Gate'         => Illuminate\Support\Facades\Gate::class,
-        'Hash'         => Illuminate\Support\Facades\Hash::class,
-        'Http'         => Illuminate\Support\Facades\Http::class,
-        'Lang'         => Illuminate\Support\Facades\Lang::class,
-        'Log'          => Illuminate\Support\Facades\Log::class,
-        'Mail'         => Illuminate\Support\Facades\Mail::class,
-        'Notification' => Illuminate\Support\Facades\Notification::class,
-        'Password'     => Illuminate\Support\Facades\Password::class,
-        'Queue'        => Illuminate\Support\Facades\Queue::class,
-        'RateLimiter'  => Illuminate\Support\Facades\RateLimiter::class,
-        'Redirect'     => Illuminate\Support\Facades\Redirect::class,
-        // 'Redis'        => Illuminate\Support\Facades\Redis::class,
-        'Request'      => Illuminate\Support\Facades\Request::class,
-        'Response'     => Illuminate\Support\Facades\Response::class,
-        'Route'        => Illuminate\Support\Facades\Route::class,
-        'Schema'       => Illuminate\Support\Facades\Schema::class,
-        'Session'      => Illuminate\Support\Facades\Session::class,
-        'Storage'      => Illuminate\Support\Facades\Storage::class,
-        'Str'          => Illuminate\Support\Str::class,
-        'URL'          => Illuminate\Support\Facades\URL::class,
-        'Validator'    => Illuminate\Support\Facades\Validator::class,
-        'View'         => Illuminate\Support\Facades\View::class,
 
-        // Laravel Packages
-        'Socialite'    => Laravel\Socialite\Facades\Socialite::class,
+        // Laravel
+        'App'       => Illuminate\Support\Facades\App::class,
+        'Arr'       => Illuminate\Support\Arr::class,
+        'Artisan'   => Illuminate\Support\Facades\Artisan::class,
+        'Auth'      => Illuminate\Support\Facades\Auth::class,
+        'Blade'     => Illuminate\Support\Facades\Blade::class,
+        'Bus'       => Illuminate\Support\Facades\Bus::class,
+        'Cache'     => Illuminate\Support\Facades\Cache::class,
+        'Config'    => Illuminate\Support\Facades\Config::class,
+        'Cookie'    => Illuminate\Support\Facades\Cookie::class,
+        'Crypt'     => Illuminate\Support\Facades\Crypt::class,
+        'DB'        => Illuminate\Support\Facades\DB::class,
+        'Eloquent'  => Illuminate\Database\Eloquent\Model::class,
+        'Event'     => Illuminate\Support\Facades\Event::class,
+        'File'      => Illuminate\Support\Facades\File::class,
+        'Hash'      => Illuminate\Support\Facades\Hash::class,
+        'Input'     => Illuminate\Support\Facades\Input::class,
+        'Inspiring' => Illuminate\Foundation\Inspiring::class,
+        'Lang'      => Illuminate\Support\Facades\Lang::class,
+        'Log'       => Illuminate\Support\Facades\Log::class,
+        'Mail'      => Illuminate\Support\Facades\Mail::class,
+        'Notification' => Illuminate\Support\Facades\Notification::class,
+        'Password'  => Illuminate\Support\Facades\Password::class,
+        'Queue'     => Illuminate\Support\Facades\Queue::class,
+        'Redirect'  => Illuminate\Support\Facades\Redirect::class,
+        'Redis'     => Illuminate\Support\Facades\Redis::class,
+        'Request'   => Illuminate\Support\Facades\Request::class,
+        'Response'  => Illuminate\Support\Facades\Response::class,
+        'Route'     => Illuminate\Support\Facades\Route::class,
+        'Schema'    => Illuminate\Support\Facades\Schema::class,
+        'Session'   => Illuminate\Support\Facades\Session::class,
+        'Storage'   => Illuminate\Support\Facades\Storage::class,
+        'Str'       => Illuminate\Support\Str::class,
+        'URL'       => Illuminate\Support\Facades\URL::class,
+        'Validator' => Illuminate\Support\Facades\Validator::class,
+        'View'      => Illuminate\Support\Facades\View::class,
+        'Socialite' => Laravel\Socialite\Facades\Socialite::class,
 
         // Third Party
         'ImageTool' => Intervention\Image\Facades\Image::class,
-        'DomPDF'    => Barryvdh\DomPDF\Facade::class,
+        'DomPDF' => Barryvdh\DomPDF\Facade::class,
         'SnappyPDF' => Barryvdh\Snappy\Facades\SnappyPdf::class,
 
         // Custom BookStack
-        'Activity'    => BookStack\Facades\Activity::class,
+        'Activity' => BookStack\Facades\Activity::class,
+        'Views'    => BookStack\Facades\Views::class,
+        'Images'   => BookStack\Facades\Images::class,
         'Permissions' => BookStack\Facades\Permissions::class,
-        'Theme'       => BookStack\Facades\Theme::class,
+        'Theme'    => BookStack\Facades\Theme::class,
+
     ],
 
     // Proxy configuration

app/Config/auth.php

@@ -10,14 +10,15 @@
 
 return [
 
-    // Options: standard, ldap, saml2, oidc
+    // Method of authentication to use
+    // Options: standard, ldap, saml2
     'method' => env('AUTH_METHOD', 'standard'),
 
     // Authentication Defaults
     // This option controls the default authentication "guard" and password
     // reset options for your application.
     'defaults' => [
-        'guard'     => env('AUTH_METHOD', 'standard'),
+        'guard' => env('AUTH_METHOD', 'standard'),
         'passwords' => 'users',
     ],
 
@@ -25,26 +26,22 @@ return [
     // All authentication drivers have a user provider. This defines how the
     // users are actually retrieved out of your database or other storage
     // mechanisms used by this application to persist your user's data.
-    // Supported drivers: "session", "api-token", "ldap-session", "async-external-session"
+    // Supported drivers: "session", "api-token", "ldap-session"
     'guards' => [
         'standard' => [
-            'driver'   => 'session',
+            'driver' => 'session',
             'provider' => 'users',
         ],
         'ldap' => [
-            'driver'   => 'ldap-session',
+            'driver' => 'ldap-session',
             'provider' => 'external',
         ],
         'saml2' => [
-            'driver'   => 'async-external-session',
-            'provider' => 'external',
-        ],
-        'oidc' => [
-            'driver'   => 'async-external-session',
+            'driver' => 'saml2-session',
             'provider' => 'external',
         ],
         'api' => [
-            'driver'   => 'api-token',
+            'driver' => 'api-token',
         ],
     ],
 
@@ -55,18 +52,12 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model'  => \BookStack\Auth\User::class,
+            'model' => \BookStack\Auth\User::class,
         ],
-
         'external' => [
             'driver' => 'external-users',
-            'model'  => \BookStack\Auth\User::class,
+            'model' => \BookStack\Auth\User::class,
         ],
-
-        // 'users' => [
-        //     'driver' => 'database',
-        //     'table' => 'users',
-        // ],
     ],
 
     // Resetting Passwords
@@ -76,17 +67,10 @@ return [
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'email'    => 'emails.password',
-            'table'    => 'password_resets',
-            'expire'   => 60,
-            'throttle' => 60,
+            'email' => 'emails.password',
+            'table' => 'password_resets',
+            'expire' => 60,
         ],
     ],
 
-    // Password Confirmation Timeout
-    // Here you may define the amount of seconds before a password confirmation
-    // times out and the user is prompted to re-enter their password via the
-    // confirmation screen. By default, the timeout lasts for three hours.
-    'password_timeout' => 10800,
-
 ];

app/Config/broadcasting.php

@@ -23,18 +23,18 @@ return [
     'connections' => [
 
         'pusher' => [
-            'driver'  => 'pusher',
-            'key'     => env('PUSHER_APP_KEY'),
-            'secret'  => env('PUSHER_APP_SECRET'),
-            'app_id'  => env('PUSHER_APP_ID'),
+            'driver' => 'pusher',
+            'key' => env('PUSHER_APP_KEY'),
+            'secret' => env('PUSHER_APP_SECRET'),
+            'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                'useTLS'  => true,
+                'useTLS' => true,
             ],
         ],
 
         'redis' => [
-            'driver'     => 'redis',
+            'driver' => 'redis',
             'connection' => 'default',
         ],
 
@@ -46,6 +46,7 @@ return [
             'driver' => 'null',
         ],
 
+
     ],
 
 ];

app/Config/cache.php

@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Support\Str;
-
 /**
  * Caching configuration options.
  *
@@ -40,15 +38,13 @@ return [
         ],
 
         'array' => [
-            'driver'    => 'array',
-            'serialize' => false,
+            'driver' => 'array',
         ],
 
         'database' => [
-            'driver'          => 'database',
-            'table'           => 'cache',
-            'connection'      => null,
-            'lock_connection' => null,
+            'driver' => 'database',
+            'table'  => 'cache',
+            'connection' => null,
         ],
 
         'file' => [
@@ -57,36 +53,19 @@ return [
         ],
 
         'memcached' => [
-            'driver'        => 'memcached',
-            'options'       => [
-                // Memcached::OPT_CONNECT_TIMEOUT => 2000,
-            ],
-            'servers' => $memcachedServers ?? [],
+            'driver'  => 'memcached',
+            'servers' => env('CACHE_DRIVER') === 'memcached' ? $memcachedServers : [],
         ],
 
         'redis' => [
-            'driver'          => 'redis',
-            'connection'      => 'default',
-            'lock_connection' => 'default',
-        ],
-
-        'octane' => [
-            'driver' => 'octane',
+            'driver' => 'redis',
+            'connection' => 'default',
         ],
 
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Cache Key Prefix
-    |--------------------------------------------------------------------------
-    |
-    | When utilizing a RAM based store such as APC or Memcached, there might
-    | be other applications utilizing the same cache. So, we'll specify a
-    | value to get prefixed to all our keys so we can avoid collisions.
-    |
-    */
-
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache'),
+    // Cache key prefix
+    // Used to prevent collisions in shared cache systems.
+    'prefix' => env('CACHE_PREFIX', 'bookstack_cache'),
 
 ];

app/Config/clockwork.php

@@ -1,415 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Enable Clockwork
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork is enabled by default only when your application is in debug mode. Here you can explicitly enable or
-    | disable Clockwork. When disabled, no data is collected and the api and web ui are inactive.
-    |
-    */
-
-    'enable' => env('CLOCKWORK_ENABLE', false),
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Features
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | You can enable or disable various Clockwork features here. Some features have additional settings (eg. slow query
-    | threshold for database queries).
-    |
-    */
-
-    'features' => [
-
-        // Cache usage stats and cache queries including results
-        'cache' => [
-            'enabled' => true,
-
-            // Collect cache queries
-            'collect_queries' => true,
-
-            // Collect values from cache queries (high performance impact with a very high number of queries)
-            'collect_values' => false,
-        ],
-
-        // Database usage stats and queries
-        'database' => [
-            'enabled' => true,
-
-            // Collect database queries (high performance impact with a very high number of queries)
-            'collect_queries' => true,
-
-            // Collect details of models updates (high performance impact with a lot of model updates)
-            'collect_models_actions' => true,
-
-            // Collect details of retrieved models (very high performance impact with a lot of models retrieved)
-            'collect_models_retrieved' => false,
-
-            // Query execution time threshold in miliseconds after which the query will be marked as slow
-            'slow_threshold' => null,
-
-            // Collect only slow database queries
-            'slow_only' => false,
-
-            // Detect and report duplicate (N+1) queries
-            'detect_duplicate_queries' => false,
-        ],
-
-        // Dispatched events
-        'events' => [
-            'enabled' => true,
-
-            // Ignored events (framework events are ignored by default)
-            'ignored_events' => [
-                // App\Events\UserRegistered::class,
-                // 'user.registered'
-            ],
-        ],
-
-        // Laravel log (you can still log directly to Clockwork with laravel log disabled)
-        'log' => [
-            'enabled' => true,
-        ],
-
-        // Sent notifications
-        'notifications' => [
-            'enabled' => true,
-        ],
-
-        // Performance metrics
-        'performance' => [
-            // Allow collecting of client metrics. Requires separate clockwork-browser npm package.
-            'client_metrics' => true,
-        ],
-
-        // Dispatched queue jobs
-        'queue' => [
-            'enabled' => true,
-        ],
-
-        // Redis commands
-        'redis' => [
-            'enabled' => true,
-        ],
-
-        // Routes list
-        'routes' => [
-            'enabled' => false,
-
-            // Collect only routes from particular namespaces (only application routes by default)
-            'only_namespaces' => ['App'],
-        ],
-
-        // Rendered views
-        'views' => [
-            'enabled' => true,
-
-            // Collect views including view data (high performance impact with a high number of views)
-            'collect_data' => false,
-
-            // Use Twig profiler instead of Laravel events for apps using laravel-twigbridge (more precise, but does
-            // not support collecting view data)
-            'use_twig_profiler' => false,
-        ],
-
-    ],
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Enable web UI
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork comes with a web UI accessibla via http://your.app/clockwork. Here you can enable or disable this
-    | feature. You can also set a custom path for the web UI.
-    |
-    */
-
-    'web' => true,
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Enable toolbar
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork can show a toolbar with basic metrics on all responses. Here you can enable or disable this feature.
-    | Requires a separate clockwork-browser npm library.
-    | For installation instructions see https://underground.works/clockwork/#docs-viewing-data
-    |
-    */
-
-    'toolbar' => true,
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | HTTP requests collection
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork collects data about HTTP requests to your app. Here you can choose which requests should be collected.
-    |
-    */
-
-    'requests' => [
-        // With on-demand mode enabled, Clockwork will only profile requests when the browser extension is open or you
-        // manually pass a "clockwork-profile" cookie or get/post data key.
-        // Optionally you can specify a "secret" that has to be passed as the value to enable profiling.
-        'on_demand' => false,
-
-        // Collect only errors (requests with HTTP 4xx and 5xx responses)
-        'errors_only' => false,
-
-        // Response time threshold in miliseconds after which the request will be marked as slow
-        'slow_threshold' => null,
-
-        // Collect only slow requests
-        'slow_only' => false,
-
-        // Sample the collected requests (eg. set to 100 to collect only 1 in 100 requests)
-        'sample' => false,
-
-        // List of URIs that should not be collected
-        'except' => [
-            '/horizon/.*', // Laravel Horizon requests
-            '/telescope/.*', // Laravel Telescope requests
-            '/_debugbar/.*', // Laravel DebugBar requests
-        ],
-
-        // List of URIs that should be collected, any other URI will not be collected if not empty
-        'only' => [
-            // '/api/.*'
-        ],
-
-        // Don't collect OPTIONS requests, mostly used in the CSRF pre-flight requests and are rarely of interest
-        'except_preflight' => true,
-    ],
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Artisan commands collection
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork can collect data about executed artisan commands. Here you can enable and configure which commands
-    | should be collected.
-    |
-    */
-
-    'artisan' => [
-        // Enable or disable collection of executed Artisan commands
-        'collect' => false,
-
-        // List of commands that should not be collected (built-in commands are not collected by default)
-        'except' => [
-            // 'inspire'
-        ],
-
-        // List of commands that should be collected, any other command will not be collected if not empty
-        'only' => [
-            // 'inspire'
-        ],
-
-        // Enable or disable collection of command output
-        'collect_output' => false,
-
-        // Enable or disable collection of built-in Laravel commands
-        'except_laravel_commands' => true,
-    ],
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Queue jobs collection
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork can collect data about executed queue jobs. Here you can enable and configure which queue jobs should
-    | be collected.
-    |
-    */
-
-    'queue' => [
-        // Enable or disable collection of executed queue jobs
-        'collect' => false,
-
-        // List of queue jobs that should not be collected
-        'except' => [
-            // App\Jobs\ExpensiveJob::class
-        ],
-
-        // List of queue jobs that should be collected, any other queue job will not be collected if not empty
-        'only' => [
-            // App\Jobs\BuggyJob::class
-        ],
-    ],
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Tests collection
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork can collect data about executed tests. Here you can enable and configure which tests should be
-    | collected.
-    |
-    */
-
-    'tests' => [
-        // Enable or disable collection of ran tests
-        'collect' => false,
-
-        // List of tests that should not be collected
-        'except' => [
-            // Tests\Unit\ExampleTest::class
-        ],
-    ],
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Enable data collection when Clockwork is disabled
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | You can enable this setting to collect data even when Clockwork is disabled. Eg. for future analysis.
-    |
-    */
-
-    'collect_data_always' => false,
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Metadata storage
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Configure how is the metadata collected by Clockwork stored. Two options are available:
-    |   - files - A simple fast storage implementation storing data in one-per-request files.
-    |   - sql - Stores requests in a sql database. Supports MySQL, Postgresql, Sqlite and requires PDO.
-    |
-    */
-
-    'storage' => 'files',
-
-    // Path where the Clockwork metadata is stored
-    'storage_files_path' => storage_path('clockwork'),
-
-    // Compress the metadata files using gzip, trading a little bit of performance for lower disk usage
-    'storage_files_compress' => false,
-
-    // SQL database to use, can be a name of database configured in database.php or a path to a sqlite file
-    'storage_sql_database' => storage_path('clockwork.sqlite'),
-
-    // SQL table name to use, the table is automatically created and udpated when needed
-    'storage_sql_table' => 'clockwork',
-
-    // Maximum lifetime of collected metadata in minutes, older requests will automatically be deleted, false to disable
-    'storage_expiration' => 60 * 24 * 7,
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Authentication
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork can be configured to require authentication before allowing access to the collected data. This might be
-    | useful when the application is publicly accessible. Setting to true will enable a simple authentication with a
-    | pre-configured password. You can also pass a class name of a custom implementation.
-    |
-    */
-
-    'authentication' => false,
-
-    // Password for the simple authentication
-    'authentication_password' => 'VerySecretPassword',
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Stack traces collection
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork can collect stack traces for log messages and certain data like database queries. Here you can set
-    | whether to collect stack traces, limit the number of collected frames and set further configuration. Collecting
-    | long stack traces considerably increases metadata size.
-    |
-    */
-
-    'stack_traces' => [
-        // Enable or disable collecting of stack traces
-        'enabled' => true,
-
-        // Limit the number of frames to be collected
-        'limit' => 10,
-
-        // List of vendor names to skip when determining caller, common vendors are automatically added
-        'skip_vendors' => [
-            // 'phpunit'
-        ],
-
-        // List of namespaces to skip when determining caller
-        'skip_namespaces' => [
-            // 'Laravel'
-        ],
-
-        // List of class names to skip when determining caller
-        'skip_classes' => [
-            // App\CustomLog::class
-        ],
-
-    ],
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Serialization
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork serializes the collected data to json for storage and transfer. Here you can configure certain aspects
-    | of serialization. Serialization has a large effect on the cpu time and memory usage.
-    |
-    */
-
-    // Maximum depth of serialized multi-level arrays and objects
-    'serialization_depth' => 10,
-
-    // A list of classes that will never be serialized (eg. a common service container class)
-    'serialization_blackbox' => [
-        \Illuminate\Container\Container::class,
-        \Illuminate\Foundation\Application::class,
-    ],
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Register helpers
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork comes with a "clock" global helper function. You can use this helper to quickly log something and to
-    | access the Clockwork instance.
-    |
-    */
-
-    'register_helpers' => true,
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Send Headers for AJAX request
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | When trying to collect data the AJAX method can sometimes fail if it is missing required headers. For example, an
-    | API might require a version number using Accept headers to route the HTTP request to the correct codebase.
-    |
-    */
-
-    'headers' => [
-        // 'Accept' => 'application/vnd.com.whatever.v1+json',
-    ],
-
-    /*
-    |------------------------------------------------------------------------------------------------------------------
-    | Server-Timing
-    |------------------------------------------------------------------------------------------------------------------
-    |
-    | Clockwork supports the W3C Server Timing specification, which allows for collecting a simple performance metrics
-    | in a cross-browser way. Eg. in Chrome, your app, database and timeline event timings will be shown in the Dev
-    | Tools network tab. This setting specifies the max number of timeline events that will be sent. Setting to false
-    | will disable the feature.
-    |
-    */
-
-    'server_timing' => 10,
-
-];

app/Config/database.php

@@ -59,41 +59,38 @@ return [
     'connections' => [
 
         'mysql' => [
-            'driver'         => 'mysql',
-            'url'            => env('DATABASE_URL'),
-            'host'           => $mysql_host,
-            'database'       => env('DB_DATABASE', 'forge'),
-            'username'       => env('DB_USERNAME', 'forge'),
-            'password'       => env('DB_PASSWORD', ''),
-            'unix_socket'    => env('DB_SOCKET', ''),
-            'port'           => $mysql_port,
-            'charset'        => 'utf8mb4',
-            'collation'      => 'utf8mb4_unicode_ci',
-            // Prefixes are only semi-supported and may be unstable
-            // since they are not tested as part of our automated test suite.
-            // If used, the prefix should not be changed otherwise you will likely receive errors.
-            'prefix'         => env('DB_TABLE_PREFIX', ''),
+            'driver'    => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host'      => $mysql_host,
+            'database'  => env('DB_DATABASE', 'forge'),
+            'username'  => env('DB_USERNAME', 'forge'),
+            'password'  => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'port'      => $mysql_port,
+            'charset'   => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix'    => '',
             'prefix_indexes' => true,
-            'strict'         => false,
-            'engine'         => null,
-            'options'        => extension_loaded('pdo_mysql') ? array_filter([
+            'strict'    => false,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
 
         'mysql_testing' => [
-            'driver'         => 'mysql',
-            'url'            => env('TEST_DATABASE_URL'),
-            'host'           => '127.0.0.1',
-            'database'       => 'bookstack-test',
-            'username'       => env('MYSQL_USER', 'bookstack-test'),
-            'password'       => env('MYSQL_PASSWORD', 'bookstack-test'),
-            'port'           => $mysql_port,
-            'charset'        => 'utf8mb4',
-            'collation'      => 'utf8mb4_unicode_ci',
-            'prefix'         => '',
+            'driver'    => 'mysql',
+            'url' => env('TEST_DATABASE_URL'),
+            'host'      => '127.0.0.1',
+            'database'  => 'bookstack-test',
+            'username'  => env('MYSQL_USER', 'bookstack-test'),
+            'password'  => env('MYSQL_PASSWORD', 'bookstack-test'),
+            'port'      => $mysql_port,
+            'charset'   => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix'    => '',
             'prefix_indexes' => true,
-            'strict'         => false,
+            'strict'    => false,
         ],
 
     ],
@@ -105,6 +102,6 @@ return [
     'migrations' => 'migrations',
 
     // Redis configuration to use if set
-    'redis' => $redisConfig ?? [],
+    'redis' => env('REDIS_SERVERS', false) ? $redisConfig : [],
 
 ];

app/Config/debugbar.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Debugbar Configuration Options.
+ * Debugbar Configuration Options
  *
  * Changes to these config files are not supported by BookStack and may break upon updates.
  * Configuration should be altered via the `.env` file or environment variables.
@@ -10,52 +10,53 @@
 
 return [
 
-    // Debugbar is enabled by default, when debug is set to true in app.php.
-    // You can override the value by setting enable to true or false instead of null.
-    //
-    // You can provide an array of URI's that must be ignored (eg. 'api/*')
+     // Debugbar is enabled by default, when debug is set to true in app.php.
+     // You can override the value by setting enable to true or false instead of null.
+     //
+     // You can provide an array of URI's that must be ignored (eg. 'api/*')
     'enabled' => env('DEBUGBAR_ENABLED', false),
-    'except'  => [
-        'telescope*',
+    'except' => [
+        'telescope*'
     ],
 
-    // DebugBar stores data for session/ajax requests.
-    // You can disable this, so the debugbar stores data in headers/session,
-    // but this can cause problems with large data collectors.
-    // By default, file storage (in the storage folder) is used. Redis and PDO
-    // can also be used. For PDO, run the package migrations first.
+
+     // DebugBar stores data for session/ajax requests.
+     // You can disable this, so the debugbar stores data in headers/session,
+     // but this can cause problems with large data collectors.
+     // By default, file storage (in the storage folder) is used. Redis and PDO
+     // can also be used. For PDO, run the package migrations first.
     'storage' => [
         'enabled'    => true,
         'driver'     => 'file', // redis, file, pdo, custom
         'path'       => storage_path('debugbar'), // For file driver
         'connection' => null,   // Leave null for default connection (Redis/PDO)
-        'provider'   => '', // Instance of StorageInterface for custom driver
+        'provider'   => '' // Instance of StorageInterface for custom driver
     ],
 
-    // Vendor files are included by default, but can be set to false.
-    // This can also be set to 'js' or 'css', to only include javascript or css vendor files.
-    // Vendor files are for css: font-awesome (including fonts) and highlight.js (css files)
-    // and for js: jquery and and highlight.js
-    // So if you want syntax highlighting, set it to true.
-    // jQuery is set to not conflict with existing jQuery scripts.
+     // Vendor files are included by default, but can be set to false.
+     // This can also be set to 'js' or 'css', to only include javascript or css vendor files.
+     // Vendor files are for css: font-awesome (including fonts) and highlight.js (css files)
+     // and for js: jquery and and highlight.js
+     // So if you want syntax highlighting, set it to true.
+     // jQuery is set to not conflict with existing jQuery scripts.
     'include_vendors' => true,
 
-    // The Debugbar can capture Ajax requests and display them. If you don't want this (ie. because of errors),
-    // you can use this option to disable sending the data through the headers.
-    // Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools.
+     // The Debugbar can capture Ajax requests and display them. If you don't want this (ie. because of errors),
+     // you can use this option to disable sending the data through the headers.
+     // Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools.
 
-    'capture_ajax'    => true,
+    'capture_ajax' => true,
     'add_ajax_timing' => false,
 
-    // When enabled, the Debugbar shows deprecated warnings for Symfony components
-    // in the Messages tab.
+     // When enabled, the Debugbar shows deprecated warnings for Symfony components
+     // in the Messages tab.
     'error_handler' => false,
 
-    // The Debugbar can emulate the Clockwork headers, so you can use the Chrome
-    // Extension, without the server-side code. It uses Debugbar collectors instead.
+     // The Debugbar can emulate the Clockwork headers, so you can use the Chrome
+     // Extension, without the server-side code. It uses Debugbar collectors instead.
     'clockwork' => false,
 
-    // Enable/disable DataCollectors
+     // Enable/disable DataCollectors
     'collectors' => [
         'phpinfo'         => true,  // Php version
         'messages'        => true,  // Messages
@@ -81,7 +82,7 @@ return [
         'models'          => true, // Display models
     ],
 
-    // Configure some DataCollectors
+     // Configure some DataCollectors
     'options' => [
         'auth' => [
             'show_name' => true,   // Also show the users name/email in the debugbar
@@ -90,43 +91,43 @@ return [
             'with_params'       => true,   // Render SQL with the parameters substituted
             'backtrace'         => true,   // Use a backtrace to find the origin of the query in your files.
             'timeline'          => false,  // Add the queries to the timeline
-            'explain'           => [                 // Show EXPLAIN output on queries
+            'explain' => [                 // Show EXPLAIN output on queries
                 'enabled' => false,
-                'types'   => ['SELECT'],     // ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+
+                'types' => ['SELECT'],     // ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+
             ],
             'hints'             => true,    // Show hints for common mistakes
         ],
         'mail' => [
-            'full_log' => false,
+            'full_log' => false
         ],
         'views' => [
             'data' => false,    //Note: Can slow down the application, because the data can be quite large..
         ],
         'route' => [
-            'label' => true,  // show complete route on bar
+            'label' => true  // show complete route on bar
         ],
         'logs' => [
-            'file' => null,
+            'file' => null
         ],
         'cache' => [
-            'values' => true, // collect cache values
+            'values' => true // collect cache values
         ],
     ],
 
-    // Inject Debugbar into the response
-    // Usually, the debugbar is added just before </body>, by listening to the
-    // Response after the App is done. If you disable this, you have to add them
-    // in your template yourself. See http://phpdebugbar.com/docs/rendering.html
+     // Inject Debugbar into the response
+     // Usually, the debugbar is added just before </body>, by listening to the
+     // Response after the App is done. If you disable this, you have to add them
+     // in your template yourself. See http://phpdebugbar.com/docs/rendering.html
     'inject' => true,
 
-    // DebugBar route prefix
-    // Sometimes you want to set route prefix to be used by DebugBar to load
-    // its resources from. Usually the need comes from misconfigured web server or
-    // from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97
+     // DebugBar route prefix
+     // Sometimes you want to set route prefix to be used by DebugBar to load
+     // its resources from. Usually the need comes from misconfigured web server or
+     // from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97
     'route_prefix' => '_debugbar',
 
-    // DebugBar route domain
-    // By default DebugBar route served from the same domain that request served.
-    // To override default domain, specify it as a non-empty value.
+     // DebugBar route domain
+     // By default DebugBar route served from the same domain that request served.
+     // To override default domain, specify it as a non-empty value.
     'route_domain' => env('APP_URL', '') === 'http://bookstack.dev' ? '' : env('APP_URL', ''),
 ];

app/Config/dompdf.php

@@ -7,18 +7,15 @@
  * Configuration should be altered via the `.env` file or environment variables.
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
-$dompdfPaperSizeMap = [
-    'a4'     => 'a4',
-    'letter' => 'letter',
-];
 
 return [
 
+
     'show_warnings' => false,   // Throw an Exception on warnings from dompdf
-    'orientation'   => 'portrait',
-    'defines'       => [
+    'orientation' => 'portrait',
+    'defines' => [
         /**
-         * The location of the DOMPDF font directory.
+         * The location of the DOMPDF font directory
          *
          * The location of the directory where DOMPDF will store fonts and font metrics
          * Note: This directory must exist and be writable by the webserver process.
@@ -41,17 +38,17 @@ return [
          * Times-Roman, Times-Bold, Times-BoldItalic, Times-Italic,
          * Symbol, ZapfDingbats.
          */
-        'font_dir' => storage_path('fonts/'),  // advised by dompdf (https://github.com/dompdf/dompdf/pull/782)
+        "DOMPDF_FONT_DIR" => app_path('vendor/dompdf/dompdf/lib/fonts/'), //storage_path('fonts/'), // advised by dompdf (https://github.com/dompdf/dompdf/pull/782)
 
         /**
-         * The location of the DOMPDF font cache directory.
+         * The location of the DOMPDF font cache directory
          *
          * This directory contains the cached font metrics for the fonts used by DOMPDF.
          * This directory can be the same as DOMPDF_FONT_DIR
          *
          * Note: This directory must exist and be writable by the webserver process.
          */
-        'font_cache' => storage_path('fonts/'),
+        "DOMPDF_FONT_CACHE" => storage_path('fonts/'),
 
         /**
          * The location of a temporary directory.
@@ -60,10 +57,10 @@ return [
          * The temporary directory is required to download remote images and when
          * using the PFDLib back end.
          */
-        'temp_dir' => sys_get_temp_dir(),
+        "DOMPDF_TEMP_DIR" => sys_get_temp_dir(),
 
         /**
-         * ==== IMPORTANT ====.
+         * ==== IMPORTANT ====
          *
          * dompdf's "chroot": Prevents dompdf from accessing system files or other
          * files on the webserver.  All local files opened by dompdf must be in a
@@ -74,7 +71,7 @@ return [
          * direct class use like:
          * $dompdf = new DOMPDF();  $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
          */
-        'chroot' => realpath(public_path()),
+        "DOMPDF_CHROOT" => realpath(base_path()),
 
         /**
          * Whether to use Unicode fonts or not.
@@ -85,19 +82,20 @@ return [
          * When enabled, dompdf can support all Unicode glyphs. Any glyphs used in a
          * document must be present in your fonts, however.
          */
-        'unicode_enabled' => true,
+        "DOMPDF_UNICODE_ENABLED" => true,
 
         /**
          * Whether to enable font subsetting or not.
          */
-        'enable_fontsubsetting' => false,
+        "DOMPDF_ENABLE_FONTSUBSETTING" => false,
 
         /**
-         * The PDF rendering backend to use.
+         * The PDF rendering backend to use
          *
          * Valid settings are 'PDFLib', 'CPDF' (the bundled R&OS PDF class), 'GD' and
          * 'auto'. 'auto' will look for PDFLib and use it if found, or if not it will
-         * fall back on CPDF. 'GD' renders PDFs to graphic files. {@link * Canvas_Factory} ultimately determines which rendering class to instantiate
+         * fall back on CPDF. 'GD' renders PDFs to graphic files. {@link
+         * Canvas_Factory} ultimately determines which rendering class to instantiate
          * based on this setting.
          *
          * Both PDFLib & CPDF rendering backends provide sufficient rendering
@@ -119,10 +117,10 @@ return [
          * @link http://www.ros.co.nz/pdf
          * @link http://www.php.net/image
          */
-        'pdf_backend' => 'CPDF',
+        "DOMPDF_PDF_BACKEND" => "CPDF",
 
         /**
-         * PDFlib license key.
+         * PDFlib license key
          *
          * If you are using a licensed, commercial version of PDFlib, specify
          * your license key here.  If you are using PDFlib-Lite or are evaluating
@@ -145,7 +143,7 @@ return [
          * the desired content might be different (e.g. screen or projection view of html file).
          * Therefore allow specification of content here.
          */
-        'default_media_type' => 'print',
+        "DOMPDF_DEFAULT_MEDIA_TYPE" => "print",
 
         /**
          * The default paper size.
@@ -154,19 +152,18 @@ return [
          *
          * @see CPDF_Adapter::PAPER_SIZES for valid sizes ('letter', 'legal', 'A4', etc.)
          */
-        'default_paper_size' => $dompdfPaperSizeMap[env('EXPORT_PAGE_SIZE', 'a4')] ?? 'a4',
+        "DOMPDF_DEFAULT_PAPER_SIZE" => "a4",
 
         /**
-         * The default font family.
+         * The default font family
          *
          * Used if no suitable fonts can be found. This must exist in the font folder.
-         *
          * @var string
          */
-        'default_font' => 'dejavu sans',
+        "DOMPDF_DEFAULT_FONT" => "dejavu sans",
 
         /**
-         * Image DPI setting.
+         * Image DPI setting
          *
          * This setting determines the default DPI setting for images and fonts.  The
          * DPI may be overridden for inline images by explictly setting the
@@ -198,10 +195,10 @@ return [
          *
          * @var int
          */
-        'dpi' => 96,
+        "DOMPDF_DPI" => 96,
 
         /**
-         * Enable inline PHP.
+         * Enable inline PHP
          *
          * If this setting is set to true then DOMPDF will automatically evaluate
          * inline PHP contained within <script type="text/php"> ... </script> tags.
@@ -212,20 +209,20 @@ return [
          *
          * @var bool
          */
-        'enable_php' => false,
+        "DOMPDF_ENABLE_PHP" => false,
 
         /**
-         * Enable inline Javascript.
+         * Enable inline Javascript
          *
          * If this setting is set to true then DOMPDF will automatically insert
          * JavaScript code contained within <script type="text/javascript"> ... </script> tags.
          *
          * @var bool
          */
-        'enable_javascript' => false,
+        "DOMPDF_ENABLE_JAVASCRIPT" => true,
 
         /**
-         * Enable remote file access.
+         * Enable remote file access
          *
          * If this setting is set to true, DOMPDF will access remote sites for
          * images and CSS files as required.
@@ -241,27 +238,29 @@ return [
          *
          * @var bool
          */
-        'enable_remote' => env('ALLOW_UNTRUSTED_SERVER_FETCHING', false),
+        "DOMPDF_ENABLE_REMOTE" => true,
 
         /**
-         * A ratio applied to the fonts height to be more like browsers' line height.
+         * A ratio applied to the fonts height to be more like browsers' line height
          */
-        'font_height_ratio' => 1.1,
+        "DOMPDF_FONT_HEIGHT_RATIO" => 1.1,
 
         /**
-         * Enable CSS float.
+         * Enable CSS float
          *
          * Allows people to disabled CSS float support
-         *
          * @var bool
          */
-        'enable_css_float' => true,
+        "DOMPDF_ENABLE_CSS_FLOAT" => true,
+
 
         /**
-         * Use the more-than-experimental HTML5 Lib parser.
+         * Use the more-than-experimental HTML5 Lib parser
          */
-        'enable_html5parser' => true,
+        "DOMPDF_ENABLE_HTML5PARSER" => true,
+
 
     ],
 
+
 ];

app/Config/filesystems.php

@@ -25,45 +25,33 @@ return [
     // file storage service, such as s3, to store publicly accessible assets.
     'url' => env('STORAGE_URL', false),
 
+    // Default Cloud Filesystem Disk
+    'cloud' => 's3',
+
     // Available filesystem disks
     // Only local, local_secure & s3 are supported by BookStack
     'disks' => [
 
         'local' => [
-            'driver'     => 'local',
-            'root'       => public_path(),
-            'visibility' => 'public',
-        ],
-
-        'local_secure_attachments' => [
             'driver' => 'local',
-            'root'   => storage_path('uploads/files/'),
+            'root' => public_path(),
         ],
 
-        'local_secure_images' => [
-            'driver'     => 'local',
-            'root'       => storage_path('uploads/images/'),
-            'visibility' => 'public',
+        'local_secure' => [
+            'driver' => 'local',
+            'root'   => storage_path(),
         ],
 
         's3' => [
-            'driver'                  => 's3',
-            'key'                     => env('STORAGE_S3_KEY', 'your-key'),
-            'secret'                  => env('STORAGE_S3_SECRET', 'your-secret'),
-            'region'                  => env('STORAGE_S3_REGION', 'your-region'),
-            'bucket'                  => env('STORAGE_S3_BUCKET', 'your-bucket'),
-            'endpoint'                => env('STORAGE_S3_ENDPOINT', null),
+            'driver' => 's3',
+            'key'    => env('STORAGE_S3_KEY', 'your-key'),
+            'secret' => env('STORAGE_S3_SECRET', 'your-secret'),
+            'region' => env('STORAGE_S3_REGION', 'your-region'),
+            'bucket' => env('STORAGE_S3_BUCKET', 'your-bucket'),
+            'endpoint' => env('STORAGE_S3_ENDPOINT', null),
             'use_path_style_endpoint' => env('STORAGE_S3_ENDPOINT', null) !== null,
         ],
 
     ],
 
-    // Symbolic Links
-    // Here you may configure the symbolic links that will be created when the
-    // `storage:link` Artisan command is executed. The array keys should be
-    // the locations of the links and the values should be their targets.
-    'links' => [
-        public_path('storage') => storage_path('app/public'),
-    ],
-
 ];

app/Config/hashing.php

@@ -29,9 +29,9 @@ return [
     // passwords are hashed using the Argon algorithm. These will allow you
     // to control the amount of time it takes to hash the given password.
     'argon' => [
-        'memory'  => 1024,
+        'memory' => 1024,
         'threads' => 2,
-        'time'    => 2,
+        'time' => 2,
     ],
 
 ];

app/Config/logging.php

@@ -30,59 +30,66 @@ return [
     //                    "custom", "stack"
     'channels' => [
         'stack' => [
-            'driver'            => 'stack',
-            'channels'          => ['daily'],
+            'driver' => 'stack',
+            'channels' => ['daily'],
             'ignore_exceptions' => false,
         ],
 
         'single' => [
             'driver' => 'single',
-            'path'   => storage_path('logs/laravel.log'),
-            'level'  => 'debug',
-            'days'   => 14,
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+            'days' => 14,
         ],
 
         'daily' => [
             'driver' => 'daily',
-            'path'   => storage_path('logs/laravel.log'),
-            'level'  => 'debug',
-            'days'   => 7,
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+            'days' => 7,
+        ],
+
+        'slack' => [
+            'driver' => 'slack',
+            'url' => env('LOG_SLACK_WEBHOOK_URL'),
+            'username' => 'Laravel Log',
+            'emoji' => ':boom:',
+            'level' => 'critical',
         ],
 
         'stderr' => [
-            'driver'  => 'monolog',
-            'level'   => 'debug',
+            'driver' => 'monolog',
             'handler' => StreamHandler::class,
-            'with'    => [
+            'with' => [
                 'stream' => 'php://stderr',
             ],
         ],
 
         'syslog' => [
             'driver' => 'syslog',
-            'level'  => 'debug',
+            'level' => 'debug',
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
-            'level'  => 'debug',
+            'level' => 'debug',
         ],
 
         // Custom errorlog implementation that logs out a plain,
         // non-formatted message intended for the webserver log.
         'errorlog_plain_webserver' => [
-            'driver'         => 'monolog',
-            'level'          => 'debug',
-            'handler'        => ErrorLogHandler::class,
-            'handler_with'   => [4],
-            'formatter'      => LineFormatter::class,
+            'driver' => 'monolog',
+            'level' => 'debug',
+            'handler' => ErrorLogHandler::class,
+            'handler_with' => [4],
+            'formatter' => LineFormatter::class,
             'formatter_with' => [
-                'format' => '%message%',
+                'format' => "%message%",
             ],
         ],
 
         'null' => [
-            'driver'  => 'monolog',
+            'driver' => 'monolog',
             'handler' => NullHandler::class,
         ],
 
@@ -92,12 +99,9 @@ return [
         'testing' => [
             'driver' => 'testing',
         ],
-
-        'emergency' => [
-            'path' => storage_path('logs/laravel.log'),
-        ],
     ],
 
+
     // Failed Login Message
     // Allows a configurable message to be logged when a login request fails.
     'failed_login' => [

app/Config/mail.php

@@ -11,8 +11,6 @@
 return [
 
     // Mail driver to use.
-    // From Laravel 7+ this is MAIL_MAILER in laravel.
-    // Kept as MAIL_DRIVER in BookStack to prevent breaking change.
     // Options: smtp, sendmail, log, array
     'driver' => env('MAIL_DRIVER', 'smtp'),
 
@@ -25,7 +23,7 @@ return [
     // Global "From" address & name
     'from' => [
         'address' => env('MAIL_FROM', 'mail@bookstackapp.com'),
-        'name'    => env('MAIL_FROM_NAME', 'BookStack'),
+        'name' => env('MAIL_FROM_NAME', 'BookStack')
     ],
 
     // Email encryption protocol

app/Config/oidc.php

@@ -1,35 +0,0 @@
-<?php
-
-return [
-
-    // Display name, shown to users, for OpenId option
-    'name' => env('OIDC_NAME', 'SSO'),
-
-    // Dump user details after a login request for debugging purposes
-    'dump_user_details' => env('OIDC_DUMP_USER_DETAILS', false),
-
-    // Attribute, within a OpenId token, to find the user's display name
-    'display_name_claims' => explode('|', env('OIDC_DISPLAY_NAME_CLAIMS', 'name')),
-
-    // OAuth2/OpenId client id, as configured in your Authorization server.
-    'client_id' => env('OIDC_CLIENT_ID', null),
-
-    // OAuth2/OpenId client secret, as configured in your Authorization server.
-    'client_secret' => env('OIDC_CLIENT_SECRET', null),
-
-    // The issuer of the identity token (id_token) this will be compared with
-    // what is returned in the token.
-    'issuer' => env('OIDC_ISSUER', null),
-
-    // Auto-discover the relevant endpoints and keys from the issuer.
-    // Fetched details are cached for 15 minutes.
-    'discover' => env('OIDC_ISSUER_DISCOVER', false),
-
-    // Public key that's used to verify the JWT token with.
-    // Can be the key value itself or a local 'file://public.key' reference.
-    'jwt_public_key' => env('OIDC_PUBLIC_KEY', null),
-
-    // OAuth2 endpoints.
-    'authorization_endpoint' => env('OIDC_AUTH_ENDPOINT', null),
-    'token_endpoint'         => env('OIDC_TOKEN_ENDPOINT', null),
-];

app/Config/queue.php

@@ -11,40 +11,37 @@
 return [
 
     // Default driver to use for the queue
-    // Options: sync, database, redis
+    // Options: null, sync, redis
     'default' => env('QUEUE_CONNECTION', 'sync'),
 
     // Queue connection configuration
     'connections' => [
 
+
         'sync' => [
             'driver' => 'sync',
         ],
 
         'database' => [
-            'driver'       => 'database',
-            'table'        => 'jobs',
-            'queue'        => 'default',
-            'retry_after'  => 90,
-            'after_commit' => false,
+            'driver' => 'database',
+            'table' => 'jobs',
+            'queue' => 'default',
+            'retry_after' => 90,
         ],
 
         'redis' => [
-            'driver'       => 'redis',
-            'connection'   => 'default',
-            'queue'        => env('REDIS_QUEUE', 'default'),
-            'retry_after'  => 90,
-            'block_for'    => null,
-            'after_commit' => false,
+            'driver' => 'redis',
+            'connection' => 'default',
+            'queue' => env('REDIS_QUEUE', 'default'),
+            'retry_after' => 90,
+            'block_for' => null,
         ],
 
     ],
 
     // Failed queue job logging
     'failed' => [
-        'driver'   => 'database-uuids',
-        'database' => 'mysql',
-        'table'    => 'failed_jobs',
+        'database' => 'mysql', 'table' => 'failed_jobs',
     ],
 
 ];

app/Config/saml2.php

@@ -1,8 +1,5 @@
 <?php
 
-$SAML2_IDP_AUTHNCONTEXT = env('SAML2_IDP_AUTHNCONTEXT', true);
-$SAML2_SP_x509 = env('SAML2_SP_x509', false);
-
 return [
 
     // Display name, shown to users, for SAML2 option
@@ -32,6 +29,7 @@ return [
     // Overrides, in JSON format, to the configuration passed to underlying onelogin library.
     'onelogin_overrides' => env('SAML2_ONELOGIN_OVERRIDES', null),
 
+
     'onelogin' => [
         // If 'strict' is True, then the PHP Toolkit will reject unsigned
         // or unencrypted messages if it expects them signed or encrypted
@@ -79,11 +77,10 @@ return [
             // represent the requested subject.
             // Take a look on lib/Saml2/Constants.php to see the NameIdFormat supported
             'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
-
             // Usually x509cert and privateKey of the SP are provided by files placed at
             // the certs folder. But we can also provide them with the following parameters
-            'x509cert'   => $SAML2_SP_x509 ?: '',
-            'privateKey' => env('SAML2_SP_x509_KEY', ''),
+            'x509cert' => '',
+            'privateKey' => '',
         ],
         // Identity Provider Data that we want connect with our SP
         'idp' => [
@@ -142,19 +139,6 @@ return [
             //      )
             // ),
         ],
-        'security' => [
-            // SAML2 Authn context
-            // When set to false no AuthContext will be sent in the AuthNRequest,
-            // When set to true (Default) you will get an AuthContext 'exact' 'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport'.
-            // Multiple forced values can be passed via a space separated array, For example:
-            // SAML2_IDP_AUTHNCONTEXT="urn:federation:authentication:windows urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"
-            'requestedAuthnContext' => is_string($SAML2_IDP_AUTHNCONTEXT) ? explode(' ', $SAML2_IDP_AUTHNCONTEXT) : $SAML2_IDP_AUTHNCONTEXT,
-            // Sign requests and responses if a certificate is in use
-            'logoutRequestSigned'   => (bool) $SAML2_SP_x509,
-            'logoutResponseSigned'  => (bool) $SAML2_SP_x509,
-            'authnRequestsSigned'   => (bool) $SAML2_SP_x509,
-            'lowercaseUrlencoding'  => false,
-        ],
     ],
 
 ];

app/Config/services.php

@@ -28,16 +28,16 @@ return [
         'redirect'      => env('APP_URL') . '/login/service/github/callback',
         'name'          => 'GitHub',
         'auto_register' => env('GITHUB_AUTO_REGISTER', false),
-        'auto_confirm'  => env('GITHUB_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('GITHUB_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'google'   => [
-        'client_id'      => env('GOOGLE_APP_ID', false),
-        'client_secret'  => env('GOOGLE_APP_SECRET', false),
-        'redirect'       => env('APP_URL') . '/login/service/google/callback',
-        'name'           => 'Google',
-        'auto_register'  => env('GOOGLE_AUTO_REGISTER', false),
-        'auto_confirm'   => env('GOOGLE_AUTO_CONFIRM_EMAIL', false),
+        'client_id'     => env('GOOGLE_APP_ID', false),
+        'client_secret' => env('GOOGLE_APP_SECRET', false),
+        'redirect'      => env('APP_URL') . '/login/service/google/callback',
+        'name'          => 'Google',
+        'auto_register' => env('GOOGLE_AUTO_REGISTER', false),
+        'auto_confirm' => env('GOOGLE_AUTO_CONFIRM_EMAIL', false),
         'select_account' => env('GOOGLE_SELECT_ACCOUNT', false),
     ],
 
@@ -47,7 +47,7 @@ return [
         'redirect'      => env('APP_URL') . '/login/service/slack/callback',
         'name'          => 'Slack',
         'auto_register' => env('SLACK_AUTO_REGISTER', false),
-        'auto_confirm'  => env('SLACK_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('SLACK_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'facebook'   => [
@@ -56,7 +56,7 @@ return [
         'redirect'      => env('APP_URL') . '/login/service/facebook/callback',
         'name'          => 'Facebook',
         'auto_register' => env('FACEBOOK_AUTO_REGISTER', false),
-        'auto_confirm'  => env('FACEBOOK_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('FACEBOOK_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'twitter'   => [
@@ -65,27 +65,27 @@ return [
         'redirect'      => env('APP_URL') . '/login/service/twitter/callback',
         'name'          => 'Twitter',
         'auto_register' => env('TWITTER_AUTO_REGISTER', false),
-        'auto_confirm'  => env('TWITTER_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('TWITTER_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'azure'   => [
         'client_id'     => env('AZURE_APP_ID', false),
         'client_secret' => env('AZURE_APP_SECRET', false),
-        'tenant'        => env('AZURE_TENANT', false),
+        'tenant'       => env('AZURE_TENANT', false),
         'redirect'      => env('APP_URL') . '/login/service/azure/callback',
         'name'          => 'Microsoft Azure',
         'auto_register' => env('AZURE_AUTO_REGISTER', false),
-        'auto_confirm'  => env('AZURE_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('AZURE_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'okta' => [
-        'client_id'     => env('OKTA_APP_ID'),
+        'client_id' => env('OKTA_APP_ID'),
         'client_secret' => env('OKTA_APP_SECRET'),
-        'redirect'      => env('APP_URL') . '/login/service/okta/callback',
-        'base_url'      => env('OKTA_BASE_URL'),
+        'redirect' => env('APP_URL') . '/login/service/okta/callback',
+        'base_url' => env('OKTA_BASE_URL'),
         'name'          => 'Okta',
         'auto_register' => env('OKTA_AUTO_REGISTER', false),
-        'auto_confirm'  => env('OKTA_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('OKTA_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'gitlab' => [
@@ -95,46 +95,44 @@ return [
         'instance_uri'  => env('GITLAB_BASE_URI'), // Needed only for self hosted instances
         'name'          => 'GitLab',
         'auto_register' => env('GITLAB_AUTO_REGISTER', false),
-        'auto_confirm'  => env('GITLAB_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('GITLAB_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'twitch' => [
-        'client_id'     => env('TWITCH_APP_ID'),
+        'client_id' => env('TWITCH_APP_ID'),
         'client_secret' => env('TWITCH_APP_SECRET'),
-        'redirect'      => env('APP_URL') . '/login/service/twitch/callback',
+        'redirect' => env('APP_URL') . '/login/service/twitch/callback',
         'name'          => 'Twitch',
         'auto_register' => env('TWITCH_AUTO_REGISTER', false),
-        'auto_confirm'  => env('TWITCH_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('TWITCH_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'discord' => [
-        'client_id'     => env('DISCORD_APP_ID'),
+        'client_id' => env('DISCORD_APP_ID'),
         'client_secret' => env('DISCORD_APP_SECRET'),
-        'redirect'      => env('APP_URL') . '/login/service/discord/callback',
-        'name'          => 'Discord',
+        'redirect' => env('APP_URL') . '/login/service/discord/callback',
+        'name' => 'Discord',
         'auto_register' => env('DISCORD_AUTO_REGISTER', false),
-        'auto_confirm'  => env('DISCORD_AUTO_CONFIRM_EMAIL', false),
+        'auto_confirm' => env('DISCORD_AUTO_CONFIRM_EMAIL', false),
     ],
 
     'ldap' => [
-        'server'                 => env('LDAP_SERVER', false),
-        'dump_user_details'      => env('LDAP_DUMP_USER_DETAILS', false),
-        'dump_user_groups'       => env('LDAP_DUMP_USER_GROUPS', false),
-        'dn'                     => env('LDAP_DN', false),
-        'pass'                   => env('LDAP_PASS', false),
-        'base_dn'                => env('LDAP_BASE_DN', false),
-        'user_filter'            => env('LDAP_USER_FILTER', '(&(uid=${user}))'),
-        'version'                => env('LDAP_VERSION', false),
-        'id_attribute'           => env('LDAP_ID_ATTRIBUTE', 'uid'),
-        'email_attribute'        => env('LDAP_EMAIL_ATTRIBUTE', 'mail'),
+        'server' => env('LDAP_SERVER', false),
+        'dump_user_details' => env('LDAP_DUMP_USER_DETAILS', false),
+        'dn' => env('LDAP_DN', false),
+        'pass' => env('LDAP_PASS', false),
+        'base_dn' => env('LDAP_BASE_DN', false),
+        'user_filter' => env('LDAP_USER_FILTER', '(&(uid=${user}))'),
+        'version' => env('LDAP_VERSION', false),
+        'id_attribute' => env('LDAP_ID_ATTRIBUTE', 'uid'),
+        'email_attribute' => env('LDAP_EMAIL_ATTRIBUTE', 'mail'),
         'display_name_attribute' => env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn'),
-        'follow_referrals'       => env('LDAP_FOLLOW_REFERRALS', false),
-        'user_to_groups'         => env('LDAP_USER_TO_GROUPS', false),
-        'group_attribute'        => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
-        'remove_from_groups'     => env('LDAP_REMOVE_FROM_GROUPS', false),
-        'tls_insecure'           => env('LDAP_TLS_INSECURE', false),
-        'start_tls'              => env('LDAP_START_TLS', false),
-        'thumbnail_attribute'    => env('LDAP_THUMBNAIL_ATTRIBUTE', null),
+        'follow_referrals' => env('LDAP_FOLLOW_REFERRALS', false),
+        'user_to_groups' => env('LDAP_USER_TO_GROUPS', false),
+        'group_attribute' => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
+        'remove_from_groups' => env('LDAP_REMOVE_FROM_GROUPS', false),
+        'tls_insecure' => env('LDAP_TLS_INSECURE', false),
+        'start_tls' => env('LDAP_START_TLS', false),
     ],
 
 ];

app/Config/session.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Support\Str;
+use \Illuminate\Support\Str;
 
 /**
  * Session configuration options.
@@ -72,7 +72,7 @@ return [
     // to the server if the browser has a HTTPS connection. This will keep
     // the cookie from being sent to you if it can not be done securely.
     'secure' => env('SESSION_SECURE_COOKIE', null)
-        ?? Str::startsWith(env('APP_URL', ''), 'https:'),
+        ?? Str::startsWith(env('APP_URL'), 'https:'),
 
     // HTTP Access Only
     // Setting this value to true will prevent JavaScript from accessing the

app/Config/setting-defaults.php

@@ -26,10 +26,10 @@ return [
 
     // User-level default settings
     'user' => [
-        'dark-mode-enabled'     => env('APP_DEFAULT_DARK_MODE', false),
+        'dark-mode-enabled' => env('APP_DEFAULT_DARK_MODE', false),
         'bookshelves_view_type' => env('APP_VIEWS_BOOKSHELVES', 'grid'),
-        'bookshelf_view_type'   => env('APP_VIEWS_BOOKSHELF', 'grid'),
-        'books_view_type'       => env('APP_VIEWS_BOOKS', 'grid'),
+        'bookshelf_view_type' =>env('APP_VIEWS_BOOKSHELF', 'grid'),
+        'books_view_type' => env('APP_VIEWS_BOOKS', 'grid'),
     ],
 
 ];