Replaced embeds with images in exports

Unfortunately CSP rules will block embeds anyway.
Need to either relax CSP rules on exports, or instead convert to img
tags?

Also cleaned up existing regexes.

.env.example

@@ -37,10 +37,8 @@ MAIL_FROM=bookstack@example.com
 # SMTP mail options
 # These settings can be checked using the "Send a Test Email"
 # feature found in the "Settings > Maintenance" area of the system.
-# For more detailed documentation on mail options, refer to:
-# https://www.bookstackapp.com/docs/admin/email-webhooks/#email-configuration
 MAIL_HOST=localhost
-MAIL_PORT=587
+MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null

.env.example.complete

@@ -3,10 +3,6 @@
 # Each option is shown with it's default value.
 # Do not copy this whole file to use as your '.env' file.
 
-# The details here only serve as a quick reference.
-# Please refer to the BookStack documentation for full details:
-# https://www.bookstackapp.com/docs/
-
 # Application environment
 # Can be 'production', 'development', 'testing' or 'demo'
 APP_ENV=production
@@ -69,20 +65,20 @@ DB_PASSWORD=database_user_password
 # certificate itself (Common Name or Subject Alternative Name).
 MYSQL_ATTR_SSL_CA="/path/to/ca.pem"
 
-# Mail configuration
-# Refer to https://www.bookstackapp.com/docs/admin/email-webhooks/#email-configuration
+# Mail system to use
+# Can be 'smtp' or 'sendmail'
 MAIL_DRIVER=smtp
-MAIL_FROM=bookstack@example.com
+
+# Mail sending options
+MAIL_FROM=mail@bookstackapp.com
 MAIL_FROM_NAME=BookStack
 
+# SMTP mail options
 MAIL_HOST=localhost
-MAIL_PORT=587
+MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_VERIFY_SSL=true
-
-MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs"
 
 # Cache & Session driver to use
 # Can be 'file', 'database', 'memcached' or 'redis'
@@ -147,10 +143,6 @@ STORAGE_URL=false
 # Can be 'standard', 'ldap', 'saml2' or 'oidc'
 AUTH_METHOD=standard
 
-# Automatically initiate login via external auth system if it's the only auth method.
-# Works with saml2 or oidc auth methods.
-AUTH_AUTO_INITIATE=false
-
 # Social authentication configuration
 # All disabled by default.
 # Refer to https://www.bookstackapp.com/docs/admin/third-party-auth/
@@ -215,11 +207,10 @@ LDAP_SERVER=false
 LDAP_BASE_DN=false
 LDAP_DN=false
 LDAP_PASS=false
-LDAP_USER_FILTER="(&(uid={user}))"
+LDAP_USER_FILTER=false
 LDAP_VERSION=false
 LDAP_START_TLS=false
 LDAP_TLS_INSECURE=false
-LDAP_TLS_CA_CERT=false
 LDAP_ID_ATTRIBUTE=uid
 LDAP_EMAIL_ATTRIBUTE=mail
 LDAP_DISPLAY_NAME_ATTRIBUTE=cn
@@ -268,14 +259,7 @@ OIDC_ISSUER_DISCOVER=false
 OIDC_PUBLIC_KEY=null
 OIDC_AUTH_ENDPOINT=null
 OIDC_TOKEN_ENDPOINT=null
-OIDC_USERINFO_ENDPOINT=null
-OIDC_ADDITIONAL_SCOPES=null
 OIDC_DUMP_USER_DETAILS=false
-OIDC_USER_TO_GROUPS=false
-OIDC_GROUPS_CLAIM=groups
-OIDC_REMOVE_FROM_GROUPS=false
-OIDC_EXTERNAL_ID_CLAIM=sub
-OIDC_END_SESSION_ENDPOINT=false
 
 # Disable default third-party services such as Gravatar and Draw.IO
 # Service-specific options will override this option
@@ -307,7 +291,7 @@ APP_DEFAULT_DARK_MODE=false
 # Page revision limit
 # Number of page revisions to keep in the system before deleting old revisions.
 # If set to 'false' a limit will not be enforced.
-REVISION_LIMIT=100
+REVISION_LIMIT=50
 
 # Recycle Bin Lifetime
 # The number of days that content will remain in the recycle bin before
@@ -326,21 +310,6 @@ FILE_UPLOAD_SIZE_LIMIT=50
 # Can be 'a4' or 'letter'.
 EXPORT_PAGE_SIZE=a4
 
-# Export PDF Command
-# Set a command which can be used to convert a HTML file into a PDF file.
-# When false this will not be used.
-# String values represent the command to be called for conversion.
-# Supports '{input_html_path}' and '{output_pdf_path}' placeholder values.
-# Example: EXPORT_PDF_COMMAND="/scripts/convert.sh {input_html_path} {output_pdf_path}"
-EXPORT_PDF_COMMAND=false
-
-# Set path to wkhtmltopdf binary for PDF generation.
-# Can be 'false' or a path path like: '/home/bins/wkhtmltopdf'
-# When false, BookStack will attempt to find a wkhtmltopdf in the application
-# root folder then fall back to the default dompdf renderer if no binary exists.
-# Only used if 'ALLOW_UNTRUSTED_SERVER_FETCHING=true' which disables security protections.
-WKHTMLTOPDF=false
-
 # Allow <script> tags in page content
 # Note, if set to 'true' the page editor may still escape scripts.
 ALLOW_CONTENT_SCRIPTS=false
@@ -370,15 +339,6 @@ ALLOWED_IFRAME_HOSTS=null
 # 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"
 
-# A list of the sources/hostnames that can be reached by application SSR calls.
-# This is used wherever users can provide URLs/hosts in-platform, like for webhooks.
-# Host-specific functionality (usually controlled via other options) like auth
-# or user avatars for example, won't use this list.
-# Space seperated if multiple. Can use '*' as a wildcard.
-# Values will be compared prefix-matched, case-insensitive, against called SSR urls.
-# Defaults to allow all hosts.
-ALLOWED_SSR_HOSTS="*"
-
 # The default and maximum item-counts for listing API requests.
 API_DEFAULT_ITEM_COUNT=100
 API_MAX_ITEM_COUNT=500
@@ -393,11 +353,3 @@ API_REQUESTS_PER_MIN=180
 # user identifier (Username or email).
 LOG_FAILED_LOGIN_MESSAGE=false
 LOG_FAILED_LOGIN_CHANNEL=errorlog_plain_webserver
-
-# Alter the precision of IP addresses stored by BookStack.
-# Should be a number between 0 and 4, where 4 retains the full IP address
-# and 0 completely hides the IP address. As an example, a value of 2 for the
-# IP address '146.191.42.4' would result in '146.191.x.x' being logged.
-# For the IPv6 address '2001:db8:85a3:8d3:1319:8a2e:370:7348' this would result as:
-# '2001:db8:85a3:8d3:x:x:x:x'
-IP_ADDRESS_PRECISION=4

.github/FUNDING.yml

@@ -1,4 +1,3 @@
 # These are supported funding model platforms
 
 github: [ssddanbrown]
-ko_fi: ssddanbrown

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,14 +1,7 @@
 name: Bug Report
-description: Create a report to help us fix bugs & issues in existing supported functionality
+description: Create a report to help us improve or fix things
 labels: [":bug: Bug"]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out a bug report!
-        Please note that this form is for reporting bugs in existing supported functionality.
-        
-        If you are reporting something that's not an issue in functionality we've previously supported and/or is simply something different to your expectations, then it may be more appropriate to raise via a feature or support request instead.
   - type: textarea
     id: description
     attributes:
@@ -20,7 +13,7 @@ body:
     id: reproduction
     attributes:
       label: Steps to Reproduce
-      description: Detail the steps that would replicate this issue.
+      description: Detail the steps that would replicate this issue
       placeholder: |
         1. Go to '...'
         2. Click on '....'
@@ -39,7 +32,7 @@ body:
     id: context
     attributes:
       label: Screenshots or Additional Context
-      description: Provide any additional context and screenshots here to help us solve this issue.
+      description: Provide any additional context and screenshots here to help us solve this issue
     validations:
       required: false
   - type: input
@@ -55,7 +48,23 @@ body:
     id: bsversion
     attributes:
       label: Exact BookStack Version
-      description: This can be found in the settings view of BookStack. Please provide an exact version(s) you've tested on.
-      placeholder: (eg. v23.06.7)
+      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/feature_request.yml

@@ -33,9 +33,9 @@ body:
     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 fundamental benefit/goal of your request.
+        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 fundamental request
+        - label: I have searched for existing issues and none cover my fundemental request
           required: true
   - type: dropdown
     id: existing_usage
@@ -43,8 +43,8 @@ body:
       label: How long have you been using BookStack?
       options:
         - Not using yet, just scoping
-        - Under 3 months
-        - 3 months to 1 year
+        - 0 to 6 months
+        - 6 months to 1 year
         - 1 to 5 years
         - Over 5 years
     validations:

.github/ISSUE_TEMPLATE/language_request.yml

@@ -1,5 +1,5 @@
 name: Language Request
-description: Request a new language to be added to Crowdin for you to translate
+description: Request a new language to be added to CrowdIn for you to translate
 labels: [":earth_africa: Translations"]
 assignees:
   - ssddanbrown
@@ -23,7 +23,7 @@ body:
         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.
+        - label: I confirm I'm offering to help translate for this new language via CrowdIn.
           required: true
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/support_request.yml

@@ -33,7 +33,7 @@ body:
     attributes:
       label: Exact BookStack Version
       description: This can be found in the settings view of BookStack. Please provide an exact version.
-      placeholder: (eg. v23.06.7)
+      placeholder: (eg. v21.08.5)
     validations:
       required: true
   - type: textarea
@@ -44,11 +44,19 @@ body:
       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. PHP8.1 on Ubuntu 22.04 VPS, installed using official installation script)
+      placeholder: (eg. Ubuntu 20.04 VPS, installed using official installation script)
     validations:
       required: true

.github/SECURITY.md

@@ -15,13 +15,18 @@ If you'd like to be notified of new potential security concerns you can [sign-up
 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 directly contact the lead maintainer [@ssddanbrown](https://github.com/ssddanbrown). 
-You will need to log in to be able to see the email address on the [GitHub profile page](https://github.com/ssddanbrown).
-Alternatively you can send a DM via Mastodon to [@danb@fosstodon.org](https://fosstodon.org/@danb).
+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!
+Thank you for keeping BookStack instances safe!

.github/translators.txt

@@ -55,9 +55,6 @@ Name :: Languages
 @Baptistou :: French
 @arcoai :: Spanish
 @Jokuna :: Korean
-@smartshogu :: German; German Informal
-@samadha56 :: Persian
-@mrmuminov :: Uzbek
 cipi1965 :: Italian
 Mykola Ronik (Mantikor) :: Ukrainian
 furkanoyk :: Turkish
@@ -139,7 +136,7 @@ Xiphoseer :: German
 MerlinSVK (merlinsvk) :: Slovak
 Kauê Sena (kaue.sena.ks) :: Portuguese, Brazilian
 MatthieuParis :: French
-Douradinho :: Portuguese, Brazilian; Portuguese
+Douradinho :: Portuguese, Brazilian
 Gaku Yaguchi (tama11) :: Japanese
 johnroyer :: Chinese Traditional
 jackaaa :: Chinese Traditional
@@ -177,7 +174,7 @@ Alexander Predl (Harveyhase68) :: German
 Rem (Rem9000) :: Dutch
 Michał Stelmach (stelmach-web) :: Polish
 arniom :: French
-REMOVED_USER :: French; Dutch; Portuguese, Brazilian; Portuguese; Turkish; 
+REMOVED_USER :: Turkish
 林祖年 (contagion) :: Chinese Traditional
 Siamak Guodarzi (siamakgoudarzi88) :: Persian
 Lis Maestrelo (lismtrl) :: Portuguese, Brazilian
@@ -246,188 +243,3 @@ Shukrullo (vodiylik) :: Uzbek
 William W. (Nevnt) :: Chinese Traditional
 eamaro :: Portuguese
 Ypsilon-dev :: Arabic
-Hieu Vuong Trung (vuongtrunghieu) :: Vietnamese
-David Clubb (davidoclubb) :: Welsh
-welles freire (wellesximenes) :: Portuguese, Brazilian
-Magnus Jensen (MagnusHJensen) :: Danish
-Hesley Magno (hesleymagno) :: Portuguese, Brazilian
-Éric Gaspar (erga) :: French
-Fr3shlama :: German
-DSR :: Spanish, Argentina
-Andrii Bodnar (andrii-bodnar) :: Ukrainian
-Younes el Anjri (younesea28) :: Dutch
-Guclu Ozturk (gucluoz) :: Turkish
-Atmis :: French
-redjack666 :: Chinese Traditional
-Ashita007 :: Russian
-lihaorr :: Chinese Simplified
-Marcus Silber (marcus.silber82) :: German
-PellNet :: Croatian
-Winetradr :: German
-Sebastian Klaus (sebklaus) :: German
-Filip Antala (AntalaFilip) :: Slovak
-mcgong (GongMingCai) :: Chinese Simplified; Chinese Traditional
-Nanang Setia Budi (sefidananang) :: Indonesian
-Андрей Павлов (andrei.pavlov) :: Russian
-Alex Navarro (alex.n.navarro) :: Portuguese, Brazilian
-Jihyeon Gim (PotatoGim) :: Korean
-Mihai Ochian (soulstorm19) :: Romanian
-HeartCore :: German Informal; German
-simon.pct :: French
-okaeiz :: Persian
-Naoto Ishikawa (na3shkw) :: Japanese
-sdhadi :: Persian
-DerLinkman (derlinkman) :: German; German Informal
-TurnArabic :: Arabic
-Martin Sebek (sebekmartin) :: Czech
-Kuchinashi Hoshikawa (kuchinashi) :: Chinese Simplified
-digilady :: Greek
-Linus (LinusOP) :: Swedish
-Felipe Cardoso (felipecardosoruff) :: Portuguese, Brazilian
-RandomUser0815 :: German Informal; German
-Ismael Mesquita (mesquitoliveira) :: Portuguese, Brazilian
-구인회 (laskdjlaskdj12) :: Korean
-LiZerui (CNLiZerui) :: Chinese Traditional
-Fabrice Boyer (FabriceBoyer) :: French
-mikael (bitcanon) :: Swedish
-Matthias Mai (schnapsidee) :: German Informal; German
-Ufuk Ayyıldız (ufukayyildiz) :: Turkish
-Jan Mitrof (jan.kachlik) :: Czech
-edwardsmirnov :: Russian
-Mr_OSS117 :: French
-shotu :: French
-Cesar_Lopez_Aguillon :: Spanish
-bdewoop :: German
-dina davoudi (dina.davoudi) :: Persian
-Angelos Chouvardas (achouvardas) :: Greek
-rndrss :: Portuguese, Brazilian
-rirac294 :: Russian
-David Furman (thefourCraft) :: Hebrew
-Pafzedog :: French
-Yllelder :: Spanish
-Adrian Ocneanu (aocneanu) :: Romanian
-Eduardo Castanho (EduardoCastanho) :: Portuguese
-VIET NAM VPS (vietnamvps) :: Vietnamese
-m4tthi4s :: French
-toras9000 :: Japanese
-pathab :: German
-MichelSchoon85 :: Dutch
-Jøran Haugli (haugli92) :: Norwegian Bokmal
-Vasileios Kouvelis (VasilisKouvelis) :: Greek
-Dremski :: Bulgarian
-Frédéric SENE (nothingfr) :: French
-bendem :: French
-kostasdizas :: Greek
-Ricardo Schroeder (brownstone666) :: Portuguese, Brazilian
-Eitan MG (EitanMG) :: Hebrew
-Robin Flikkema (RobinFlikkema) :: Dutch
-Michal Gurcik (mgurcik) :: Slovak
-Pooyan Arab (pooyanarab) :: Persian
-Ochi Darma Putra (troke12) :: Indonesian
-Hsin-Hsiang Peng (Hsins) :: Chinese Traditional
-Mosi  Wang (mosiwang) :: Chinese Traditional
-骆言 (LawssssCat) :: Chinese Simplified
-Stickers Gaming Shøw (StickerSGSHOW) :: French
-Le Van Chinh (Chino) (lvanchinh86) :: Vietnamese
-Rubens nagios (rubenix) :: Catalan
-Patrick Dantas (pa-tiq) :: Portuguese, Brazilian
-Michal (michalgurcik) :: Slovak
-Nepomacs :: German
-Rubens (rubenix) :: Catalan
-m4z :: German; German Informal
-TheRazvy :: Romanian
-Yossi Zilber (lortens) :: Hebrew; Uzbek
-desdinova :: French
-Ingus Rūķis (ingus.rukis) :: Latvian
-Eugene Pershin (SilentEugene) :: Russian
-周盛道 (zhoushengdao) :: Chinese Simplified
-hamidreza amini (hamidrezaamini2022) :: Persian
-Tomislav Kraljević (tomislav.kraljevic) :: Croatian
-Taygun Yıldırım (yildirimtaygun) :: Turkish
-robing29 :: German
-Bruno Eduardo de Jesus Barroso (brunoejb) :: Portuguese, Brazilian
-Igor V Belousov (biv) :: Russian
-David Bauer (davbauer) :: German; German Informal
-Guttorm Hveem (guttormhveem) :: Norwegian Nynorsk; Norwegian Bokmal
-Minh Giang Truong (minhgiang1204) :: Vietnamese
-Ioannis Ioannides (i.ioannides) :: Greek
-Vadim (vadrozh) :: Russian
-Flip333 :: German Informal; German
-Paulo Henrique (paulohsantos114) :: Portuguese, Brazilian
-Dženan (Dzenan) :: Swedish
-Péter Péli (peter.peli) :: Hungarian
-TWME :: Chinese Traditional
-Sascha (Man-in-Black) :: German; German Informal
-Mohammadreza Madadi (madadi.efl) :: Persian
-Konstantin (kkovacheli) :: Ukrainian; Russian
-link1183 :: French
-Renan (rfpe) :: Portuguese, Brazilian
-Lowkey (bbsweb) :: Chinese Simplified
-ZZnOB (zznobzz) :: Russian
-rupus :: Swedish
-developernecsys :: Norwegian Nynorsk
-xuan LI (xuanli233) :: Chinese Simplified
-LameeQS :: Latvian
-Sorin T. (trimbitassorin) :: Romanian
-poesty :: Chinese Simplified
-balmag :: Hungarian
-Antti-Jussi Nygård (ajnyga) :: Finnish
-Eduard Ereza Martínez (Ereza) :: Catalan
-Jabir Lang (amar.almrad) :: Arabic
-Jaroslav Kobližek (foretix) :: Czech; French
-Wiktor Adamczyk (adamczyk.wiktor) :: Polish
-Abdulmajeed Alshuaibi (4Majeed) :: Arabic
-NotSmartZakk :: Czech
-HyoungMin Lee (ddokkaebi) :: Korean
-Dasferco :: Chinese Simplified
-Marcus Teräs (mteras) :: Finnish
-Serkan Yardim (serkanzz) :: Turkish
-Y (cnsr) :: Ukrainian
-ZY ZV (vy0b0x) :: Chinese Simplified
-diegobenitez :: Spanish
-Marc Hagen (MarcHagen) :: Dutch
-Kasper Alsøe (zeonos) :: Danish
-sultani :: Persian
-renge :: Korean
-Tim (thegatesdev) :: Dutch; German Informal; French; Romanian; Catalan; Czech; Danish; German; Finnish; Hungarian; Italian; Japanese; Korean; Polish; Russian; Ukrainian; Chinese Simplified; Chinese Traditional; Portuguese, Brazilian; Persian; Spanish, Argentina; Croatian; Norwegian Nynorsk; Estonian; Uzbek; Norwegian Bokmal
-Irdi (irdiOL) :: Albanian
-KateBarber :: Welsh
-Twister (theuncles75) :: Hebrew
-algernon19 :: Hungarian
-Ivan Krstic (ikrstic) :: Serbian (Cyrillic)
-Show :: Russian
-xBahamut :: Portuguese, Brazilian
-Pavle Knežević (pavleknezzevic) :: Serbian (Cyrillic)
-Vanja Cvelbar (b100w11) :: Slovenian
-simonpct :: French
-Honza Nagy (honza.nagy) :: Czech
-asd20752 :: Norwegian Bokmal
-Jan Picka (polipones) :: Czech
-diogoalex991 :: Portuguese
-Ehsan Sadeghi (ehsansadeghi) :: Persian
-ka_picit :: Danish
-cracrayol :: French
-CapuaSC :: Dutch
-Guardian75 :: German Informal
-mr-kanister :: German
-Michele Bastianelli (makoblaster) :: Italian
-jespernissen :: Danish
-Andrey (avmaksimov) :: Russian
-Gonzalo Loyola (AlFcl) :: Spanish, Argentina; Spanish
-grobert63 :: French
-wusst. (Supporti) :: German
-MaximMaximS :: Czech
-damian-klima :: Slovak
-crow_ :: Latvian
-JocelynDelalande :: French
-Jan (JW-CH) :: German Informal
-Timo B (lommes) :: German Informal
-Erik Lundstedt (Erik.Lundstedt) :: Swedish
-yngams (younessmouhid) :: Arabic
-Ohadp :: Hebrew
-cbridi :: Portuguese, Brazilian
-nanangsb :: Indonesian
-Michal Melich (michalmelich) :: Czech
-David (david-prv) :: German; German Informal
-Larry (lahoje) :: Swedish
-Marcia dos Santos (marciab80) :: Portuguese

.github/workflows/lint-js.yml

@@ -1,24 +0,0 @@
-name: lint-js
-
-on:
-  push:
-    paths:
-      - '**.js'
-      - '**.json'
-  pull_request:
-    paths:
-      - '**.js'
-      - '**.json'
-
-jobs:
-  build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Install NPM deps
-      run: npm ci
-
-    - name: Run formatting check
-      run: npm run lint

.github/workflows/lint-php.yml

@@ -1,25 +0,0 @@
-name: lint-php
-
-on:
-  push:
-    paths:
-      - '**.php'
-  pull_request:
-    paths:
-      - '**.php'
-
-jobs:
-  build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.1
-        tools: phpcs
-
-    - name: Run formatting check
-      run: composer lint

.github/workflows/phpstan.yml

@@ -1,40 +1,36 @@
-name: analyse-php
+name: phpstan
 
-on:
-  push:
-    paths:
-      - '**.php'
-  pull_request:
-    paths:
-      - '**.php'
+on: [push, pull_request]
 
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    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: 8.3
+        php-version: ${{ matrix.php }}
         extensions: gd, mbstring, json, curl, xml, mysql, ldap
 
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
-        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache composer packages
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-8.3
-        restore-keys: ${{ runner.os }}-composer-
+        key: ${{ runner.os }}-composer-${{ matrix.php }}
 
     - name: Install composer dependencies
       run: composer install --prefer-dist --no-interaction --ansi
 
-    - name: Run static analysis check
-      run: composer check-static
+    - name: Run PHPStan
+      run: php${{ matrix.php }} ./vendor/bin/phpstan analyse --memory-limit=2G

.github/workflows/phpunit.yml

@@ -1,22 +1,14 @@
-name: test-php
+name: phpunit
 
-on:
-  push:
-    paths:
-      - '**.php'
-      - 'composer.*'
-  pull_request:
-    paths:
-      - '**.php'
-      - 'composer.*'
+on: [push, pull_request]
 
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['7.4', '8.0', '8.1']
     steps:
     - uses: actions/checkout@v1
 
@@ -24,19 +16,18 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        extensions: gd, mbstring, json, curl, xml, mysql, ldap, gmp
+        extensions: gd, mbstring, json, curl, xml, mysql, ldap
 
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
-        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache composer packages
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ matrix.php }}
-        restore-keys: ${{ runner.os }}-composer-
 
     - name: Start Database
       run: |
@@ -57,5 +48,5 @@ jobs:
         php${{ matrix.php }} artisan migrate --force -n --database=mysql_testing
         php${{ matrix.php }} artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
 
-    - name: Run PHP tests
+    - name: phpunit
       run: php${{ matrix.php }} ./vendor/bin/phpunit

.github/workflows/test-migrations.yml

@@ -1,22 +1,14 @@
 name: test-migrations
 
-on:
-  push:
-    paths:
-      - '**.php'
-      - 'composer.*'
-  pull_request:
-    paths:
-      - '**.php'
-      - 'composer.*'
+on: [push, pull_request]
 
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['7.4', '8.0', '8.1']
     steps:
       - uses: actions/checkout@v1
 
@@ -29,14 +21,13 @@ jobs:
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer packages
-        uses: actions/cache@v4
+        uses: actions/cache@v1
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}
-          restore-keys: ${{ runner.os }}-composer-
 
       - name: Start MySQL
         run: |

.gitignore

@@ -1,19 +1,16 @@
 /vendor
 /node_modules
-/.vscode
-/composer
 Homestead.yaml
 .env
 .idea
 npm-debug.log
 yarn-error.log
-/public/dist/*.map
+/public/dist
 /public/plugins
-/public/css/*.map
-/public/js/*.map
+/public/css
+/public/js
 /public/bower
 /public/build/
-/public/favicon.ico
 /storage/images
 _ide_helper.php
 /storage/debugbar
@@ -23,11 +20,8 @@ yarn.lock
 nbproject
 .buildpath
 .project
-.nvmrc
 .settings/
 webpack-stats.json
 .phpunit.result.cache
 .DS_Store
-phpstan.neon
-esbuild-meta.json
-.phpactor.json
+phpstan.neon

LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2024, Dan Brown and the BookStack Project contributors.
+Copyright (c) 2015-present, 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
 of this software and associated documentation files (the "Software"), to deal

app/Access/Controllers/RegisterController.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace BookStack\Access\Controllers;
-
-use BookStack\Access\LoginService;
-use BookStack\Access\RegistrationService;
-use BookStack\Access\SocialDriverManager;
-use BookStack\Exceptions\StoppedAuthenticationException;
-use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Http\Controller;
-use Illuminate\Contracts\Validation\Validator as ValidatorContract;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rules\Password;
-
-class RegisterController extends Controller
-{
-    public function __construct(
-        protected SocialDriverManager $socialDriverManager,
-        protected RegistrationService $registrationService,
-        protected LoginService $loginService
-    ) {
-        $this->middleware('guest');
-        $this->middleware('guard:standard');
-    }
-
-    /**
-     * Show the application registration form.
-     *
-     * @throws UserRegistrationException
-     */
-    public function getRegister()
-    {
-        $this->registrationService->ensureRegistrationAllowed();
-        $socialDrivers = $this->socialDriverManager->getActive();
-
-        return view('auth.register', [
-            'socialDrivers' => $socialDrivers,
-        ]);
-    }
-
-    /**
-     * Handle a registration request for the application.
-     *
-     * @throws UserRegistrationException
-     * @throws StoppedAuthenticationException
-     */
-    public function postRegister(Request $request)
-    {
-        $this->registrationService->ensureRegistrationAllowed();
-        $this->validator($request->all())->validate();
-        $userData = $request->all();
-
-        try {
-            $user = $this->registrationService->registerUser($userData);
-            $this->loginService->login($user, auth()->getDefaultDriver());
-        } catch (UserRegistrationException $exception) {
-            if ($exception->getMessage()) {
-                $this->showErrorNotification($exception->getMessage());
-            }
-
-            return redirect($exception->redirectLocation);
-        }
-
-        $this->showSuccessNotification(trans('auth.register_success'));
-
-        return redirect('/');
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     */
-    protected function validator(array $data): ValidatorContract
-    {
-        return Validator::make($data, [
-            'name'     => ['required', 'min:2', 'max:100'],
-            'email'    => ['required', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', Password::default()],
-            // Basic honey for bots that must not be filled in
-            'username' => ['prohibited'],
-        ]);
-    }
-}

app/Access/Controllers/ResetPasswordController.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace BookStack\Access\Controllers;
-
-use BookStack\Access\LoginService;
-use BookStack\Activity\ActivityType;
-use BookStack\Http\Controller;
-use BookStack\Users\Models\User;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Password;
-use Illuminate\Support\Str;
-use Illuminate\Validation\Rules\Password as PasswordRule;
-
-class ResetPasswordController extends Controller
-{
-    public function __construct(
-        protected LoginService $loginService
-    ) {
-        $this->middleware('guest');
-        $this->middleware('guard:standard');
-    }
-
-    /**
-     * Display the password reset view for the given token.
-     * If no token is present, display the link request form.
-     */
-    public function showResetForm(Request $request)
-    {
-        $token = $request->route()->parameter('token');
-
-        return view('auth.passwords.reset')->with(
-            ['token' => $token, 'email' => $request->email]
-        );
-    }
-
-    /**
-     * Reset the given user's password.
-     */
-    public function reset(Request $request)
-    {
-        $request->validate([
-            'token' => 'required',
-            'email' => 'required|email',
-            'password' => ['required', 'confirmed', PasswordRule::defaults()],
-        ]);
-
-        // Here we will attempt to reset the user's password. If it is successful we
-        // will update the password on an actual user model and persist it to the
-        // database. Otherwise we will parse the error and return the response.
-        $credentials = $request->only('email', 'password', 'password_confirmation', 'token');
-        $response = Password::broker()->reset($credentials, function (User $user, string $password) {
-            $user->password = Hash::make($password);
-            $user->setRememberToken(Str::random(60));
-            $user->save();
-
-            $this->loginService->login($user, auth()->getDefaultDriver());
-        });
-
-        // If the password was successfully reset, we will redirect the user back to
-        // the application's home authenticated view. If there is an error we can
-        // redirect them back to where they came from with their error message.
-        return $response === Password::PASSWORD_RESET
-            ? $this->sendResetResponse()
-            : $this->sendResetFailedResponse($request, $response, $request->get('token'));
-    }
-
-    /**
-     * Get the response for a successful password reset.
-     */
-    protected function sendResetResponse(): RedirectResponse
-    {
-        $this->showSuccessNotification(trans('auth.reset_password_success'));
-        $this->logActivity(ActivityType::AUTH_PASSWORD_RESET_UPDATE, user());
-
-        return redirect('/');
-    }
-
-    /**
-     * Get the response for a failed password reset.
-     */
-    protected function sendResetFailedResponse(Request $request, string $response, string $token): RedirectResponse
-    {
-        // We show invalid users as invalid tokens as to not leak what
-        // users may exist in the system.
-        if ($response === Password::INVALID_USER) {
-            $response = Password::INVALID_TOKEN;
-        }
-
-        return redirect("/password/reset/{$token}")
-            ->withInput($request->only('email'))
-            ->withErrors(['email' => trans($response)]);
-    }
-}

app/Access/Controllers/ThrottlesLogins.php

@@ -1,92 +0,0 @@
-<?php
-
-namespace BookStack\Access\Controllers;
-
-use Illuminate\Cache\RateLimiter;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Str;
-use Illuminate\Validation\ValidationException;
-
-trait ThrottlesLogins
-{
-    /**
-     * Determine if the user has too many failed login attempts.
-     */
-    protected function hasTooManyLoginAttempts(Request $request): bool
-    {
-        return $this->limiter()->tooManyAttempts(
-            $this->throttleKey($request),
-            $this->maxAttempts()
-        );
-    }
-
-    /**
-     * Increment the login attempts for the user.
-     */
-    protected function incrementLoginAttempts(Request $request): void
-    {
-        $this->limiter()->hit(
-            $this->throttleKey($request),
-            $this->decayMinutes() * 60
-        );
-    }
-
-    /**
-     * Redirect the user after determining they are locked out.
-     * @throws ValidationException
-     */
-    protected function sendLockoutResponse(Request $request): \Symfony\Component\HttpFoundation\Response
-    {
-        $seconds = $this->limiter()->availableIn(
-            $this->throttleKey($request)
-        );
-
-        throw ValidationException::withMessages([
-            $this->username() => [trans('auth.throttle', [
-                'seconds' => $seconds,
-                'minutes' => ceil($seconds / 60),
-            ])],
-        ])->status(Response::HTTP_TOO_MANY_REQUESTS);
-    }
-
-    /**
-     * Clear the login locks for the given user credentials.
-     */
-    protected function clearLoginAttempts(Request $request): void
-    {
-        $this->limiter()->clear($this->throttleKey($request));
-    }
-
-    /**
-     * Get the throttle key for the given request.
-     */
-    protected function throttleKey(Request $request): string
-    {
-        return Str::transliterate(Str::lower($request->input($this->username())) . '|' . $request->ip());
-    }
-
-    /**
-     * Get the rate limiter instance.
-     */
-    protected function limiter(): RateLimiter
-    {
-        return app()->make(RateLimiter::class);
-    }
-
-    /**
-     * Get the maximum number of attempts to allow.
-     */
-    public function maxAttempts(): int
-    {
-        return 5;
-    }
-
-    /**
-     * Get the number of minutes to throttle for.
-     */
-    public function decayMinutes(): int
-    {
-        return 1;
-    }
-}

app/Access/Ldap.php

@@ -1,110 +0,0 @@
-<?php
-
-namespace BookStack\Access;
-
-/**
- * Class Ldap
- * An object-orientated thin abstraction wrapper for common PHP LDAP functions.
- * Allows the standard LDAP functions to be mocked for testing.
- */
-class Ldap
-{
-    /**
-     * Connect to an LDAP server.
-     *
-     * @return resource|\LDAP\Connection|false
-     */
-    public function connect(string $hostName)
-    {
-        return ldap_connect($hostName);
-    }
-
-    /**
-     * Set the value of an LDAP option for the given connection.
-     *
-     * @param resource|\LDAP\Connection|null $ldapConnection
-     */
-    public function setOption($ldapConnection, int $option, mixed $value): bool
-    {
-        return ldap_set_option($ldapConnection, $option, $value);
-    }
-
-    /**
-     * Start TLS on the given LDAP connection.
-     */
-    public function startTls($ldapConnection): bool
-    {
-        return ldap_start_tls($ldapConnection);
-    }
-
-    /**
-     * Set the version number for the given LDAP connection.
-     *
-     * @param resource|\LDAP\Connection $ldapConnection
-     */
-    public function setVersion($ldapConnection, int $version): bool
-    {
-        return $this->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $version);
-    }
-
-    /**
-     * Search LDAP tree using the provided filter.
-     *
-     * @param resource|\LDAP\Connection   $ldapConnection
-     *
-     * @return resource|\LDAP\Result
-     */
-    public function search($ldapConnection, string $baseDn, string $filter, array $attributes = null)
-    {
-        return ldap_search($ldapConnection, $baseDn, $filter, $attributes);
-    }
-
-    /**
-     * Get entries from an LDAP search result.
-     *
-     * @param resource|\LDAP\Connection $ldapConnection
-     * @param resource|\LDAP\Result $ldapSearchResult
-     */
-    public function getEntries($ldapConnection, $ldapSearchResult): array|false
-    {
-        return ldap_get_entries($ldapConnection, $ldapSearchResult);
-    }
-
-    /**
-     * Search and get entries immediately.
-     *
-     * @param resource|\LDAP\Connection   $ldapConnection
-     */
-    public function searchAndGetEntries($ldapConnection, string $baseDn, string $filter, array $attributes = null): array|false
-    {
-        $search = $this->search($ldapConnection, $baseDn, $filter, $attributes);
-
-        return $this->getEntries($ldapConnection, $search);
-    }
-
-    /**
-     * Bind to LDAP directory.
-     *
-     * @param resource|\LDAP\Connection $ldapConnection
-     */
-    public function bind($ldapConnection, string $bindRdn = null, string $bindPassword = null): bool
-    {
-        return ldap_bind($ldapConnection, $bindRdn, $bindPassword);
-    }
-
-    /**
-     * Explode an LDAP dn string into an array of components.
-     */
-    public function explodeDn(string $dn, int $withAttrib): array|false
-    {
-        return ldap_explode_dn($dn, $withAttrib);
-    }
-
-    /**
-     * Escape a string for use in an LDAP filter.
-     */
-    public function escape(string $value, string $ignore = '', int $flags = 0): string
-    {
-        return ldap_escape($value, $ignore, $flags);
-    }
-}

app/Access/Mfa/TotpValidationRule.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace BookStack\Access\Mfa;
-
-use Closure;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class TotpValidationRule implements ValidationRule
-{
-    /**
-     * Create a new rule instance.
-     * Takes the TOTP secret that must be system provided, not user provided.
-     */
-    public function __construct(
-        protected string $secret,
-        protected TotpService $totpService,
-    ) {
-    }
-
-    public function validate(string $attribute, mixed $value, Closure $fail): void
-    {
-        $passes = $this->totpService->verifyCode($value, $this->secret);
-        if (!$passes) {
-            $fail(trans('validation.totp'));
-        }
-    }
-}

app/Access/Notifications/ConfirmEmailNotification.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace BookStack\Access\Notifications;
-
-use BookStack\App\MailNotification;
-use BookStack\Users\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class ConfirmEmailNotification extends MailNotification
-{
-    public function __construct(
-        public string $token
-    ) {
-    }
-
-    public function toMail(User $notifiable): MailMessage
-    {
-        $appName = ['appName' => setting('app-name')];
-
-        return $this->newMailMessage()
-                ->subject(trans('auth.email_confirm_subject', $appName))
-                ->greeting(trans('auth.email_confirm_greeting', $appName))
-                ->line(trans('auth.email_confirm_text'))
-                ->action(trans('auth.email_confirm_action'), url('/register/confirm/' . $this->token));
-    }
-}

app/Access/Notifications/ResetPasswordNotification.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace BookStack\Access\Notifications;
-
-use BookStack\App\MailNotification;
-use BookStack\Users\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class ResetPasswordNotification extends MailNotification
-{
-    public function __construct(
-        public string $token
-    ) {
-    }
-
-    public function toMail(User $notifiable): MailMessage
-    {
-        return $this->newMailMessage()
-            ->subject(trans('auth.email_reset_subject', ['appName' => setting('app-name')]))
-            ->line(trans('auth.email_reset_text'))
-            ->action(trans('auth.reset_password'), url('password/reset/' . $this->token))
-            ->line(trans('auth.email_reset_not_requested'));
-    }
-}

app/Access/Notifications/UserInviteNotification.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace BookStack\Access\Notifications;
-
-use BookStack\App\MailNotification;
-use BookStack\Users\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class UserInviteNotification extends MailNotification
-{
-    public function __construct(
-        public string $token
-    ) {
-    }
-
-    public function toMail(User $notifiable): MailMessage
-    {
-        $appName = ['appName' => setting('app-name')];
-        $locale = $notifiable->getLocale();
-
-        return $this->newMailMessage($locale)
-                ->subject($locale->trans('auth.user_invite_email_subject', $appName))
-                ->greeting($locale->trans('auth.user_invite_email_greeting', $appName))
-                ->line($locale->trans('auth.user_invite_email_text'))
-                ->action($locale->trans('auth.user_invite_email_action'), url('/register/invite/' . $this->token));
-    }
-}

app/Access/Oidc/OidcIdToken.php

@@ -1,89 +0,0 @@
-<?php
-
-namespace BookStack\Access\Oidc;
-
-class OidcIdToken extends OidcJwtWithClaims implements ProvidesClaims
-{
-    /**
-     * Validate all possible parts of the id token.
-     *
-     * @throws OidcInvalidTokenException
-     */
-    public function validate(string $clientId): bool
-    {
-        parent::validateCommonTokenDetails($clientId);
-        $this->validateTokenClaims($clientId);
-
-        return true;
-    }
-
-    /**
-     * 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.
-        // Already done in parent.
-
-        // 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.
-        // Partially done in parent.
-        $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');
-        }
-
-        // 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/Access/Oidc/OidcService.php

@@ -1,313 +0,0 @@
-<?php
-
-namespace BookStack\Access\Oidc;
-
-use BookStack\Access\GroupSyncService;
-use BookStack\Access\LoginService;
-use BookStack\Access\RegistrationService;
-use BookStack\Exceptions\JsonDebugException;
-use BookStack\Exceptions\StoppedAuthenticationException;
-use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Facades\Theme;
-use BookStack\Http\HttpRequestService;
-use BookStack\Theming\ThemeEvents;
-use BookStack\Users\Models\User;
-use Illuminate\Support\Facades\Cache;
-use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
-use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
-
-/**
- * Class OpenIdConnectService
- * Handles any app-specific OIDC tasks.
- */
-class OidcService
-{
-    public function __construct(
-        protected RegistrationService $registrationService,
-        protected LoginService $loginService,
-        protected HttpRequestService $http,
-        protected GroupSyncService $groupService
-    ) {
-    }
-
-    /**
-     * Initiate an authorization flow.
-     * Provides back an authorize redirect URL, in addition to other
-     * details which may be required for the auth flow.
-     *
-     * @throws OidcException
-     *
-     * @return array{url: string, state: string}
-     */
-    public function login(): array
-    {
-        $settings = $this->getProviderSettings();
-        $provider = $this->getProvider($settings);
-
-        $url = $provider->getAuthorizationUrl();
-        session()->put('oidc_pkce_code', $provider->getPkceCode() ?? '');
-
-        return [
-            'url'   => $url,
-            '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);
-
-        // Set PKCE code flashed at login
-        $pkceCode = session()->pull('oidc_pkce_code', '');
-        $provider->setPkceCode($pkceCode);
-
-        // 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'],
-            'authorizationEndpoint' => $config['authorization_endpoint'],
-            'tokenEndpoint'         => $config['token_endpoint'],
-            'endSessionEndpoint'    => is_string($config['end_session_endpoint']) ? $config['end_session_endpoint'] : null,
-            'userinfoEndpoint'      => $config['userinfo_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->http->buildClient(5), Cache::store(null), 15);
-            } catch (OidcIssuerDiscoveryException $exception) {
-                throw new OidcException('OIDC Discovery Error: ' . $exception->getMessage());
-            }
-        }
-
-        // Prevent use of RP-initiated logout if specifically disabled
-        // Or force use of a URL if specifically set.
-        if ($config['end_session_endpoint'] === false) {
-            $settings->endSessionEndpoint = null;
-        } else if (is_string($config['end_session_endpoint'])) {
-            $settings->endSessionEndpoint = $config['end_session_endpoint'];
-        }
-
-        $settings->validate();
-
-        return $settings;
-    }
-
-    /**
-     * Load the underlying OpenID Connect Provider.
-     */
-    protected function getProvider(OidcProviderSettings $settings): OidcOAuthProvider
-    {
-        $provider = new OidcOAuthProvider([
-            ...$settings->arrayForOAuthProvider(),
-            'redirectUri' => url('/oidc/callback'),
-        ], [
-            'httpClient'     => $this->http->buildClient(5),
-            'optionProvider' => new HttpBasicAuthOptionProvider(),
-        ]);
-
-        foreach ($this->getAdditionalScopes() as $scope) {
-            $provider->addScope($scope);
-        }
-
-        return $provider;
-    }
-
-    /**
-     * Get any user-defined addition/custom scopes to apply to the authentication request.
-     *
-     * @return string[]
-     */
-    protected function getAdditionalScopes(): array
-    {
-        $scopeConfig = $this->config()['additional_scopes'] ?: '';
-
-        $scopeArr = explode(',', $scopeConfig);
-        $scopeArr = array_map(fn (string $scope) => trim($scope), $scopeArr);
-
-        return array_filter($scopeArr);
-    }
-
-    /**
-     * 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,
-        );
-
-        session()->put("oidc_id_token", $idTokenText);
-
-        $returnClaims = Theme::dispatch(ThemeEvents::OIDC_ID_TOKEN_PRE_VALIDATE, $idToken->getAllClaims(), [
-            'access_token' => $accessToken->getToken(),
-            'expires_in' => $accessToken->getExpires(),
-            'refresh_token' => $accessToken->getRefreshToken(),
-        ]);
-
-        if (!is_null($returnClaims)) {
-            $idToken->replaceClaims($returnClaims);
-        }
-
-        if ($this->config()['dump_user_details']) {
-            throw new JsonDebugException($idToken->getAllClaims());
-        }
-
-        try {
-            $idToken->validate($settings->clientId);
-        } catch (OidcInvalidTokenException $exception) {
-            throw new OidcException("ID token validation failed with error: {$exception->getMessage()}");
-        }
-
-        $userDetails = $this->getUserDetailsFromToken($idToken, $accessToken, $settings);
-        if (empty($userDetails->email)) {
-            throw new OidcException(trans('errors.oidc_no_email_address'));
-        }
-        if (empty($userDetails->name)) {
-            $userDetails->name = $userDetails->externalId;
-        }
-
-        $isLoggedIn = auth()->check();
-        if ($isLoggedIn) {
-            throw new OidcException(trans('errors.oidc_already_logged_in'));
-        }
-
-        try {
-            $user = $this->registrationService->findOrRegister(
-                $userDetails->name,
-                $userDetails->email,
-                $userDetails->externalId
-            );
-        } catch (UserRegistrationException $exception) {
-            throw new OidcException($exception->getMessage());
-        }
-
-        if ($this->shouldSyncGroups()) {
-            $detachExisting = $this->config()['remove_from_groups'];
-            $this->groupService->syncUserWithFoundGroups($user, $userDetails->groups ?? [], $detachExisting);
-        }
-
-        $this->loginService->login($user, 'oidc');
-
-        return $user;
-    }
-
-    /**
-     * @throws OidcException
-     */
-    protected function getUserDetailsFromToken(OidcIdToken $idToken, OidcAccessToken $accessToken, OidcProviderSettings $settings): OidcUserDetails
-    {
-        $userDetails = new OidcUserDetails();
-        $userDetails->populate(
-            $idToken,
-            $this->config()['external_id_claim'],
-            $this->config()['display_name_claims'] ?? '',
-            $this->config()['groups_claim'] ?? ''
-        );
-
-        if (!$userDetails->isFullyPopulated($this->shouldSyncGroups()) && !empty($settings->userinfoEndpoint)) {
-            $provider = $this->getProvider($settings);
-            $request = $provider->getAuthenticatedRequest('GET', $settings->userinfoEndpoint, $accessToken->getToken());
-            $response = new OidcUserinfoResponse(
-                $provider->getResponse($request),
-                $settings->issuer,
-                $settings->keys,
-            );
-
-            try {
-                $response->validate($idToken->getClaim('sub'), $settings->clientId);
-            } catch (OidcInvalidTokenException $exception) {
-                throw new OidcException("Userinfo endpoint response validation failed with error: {$exception->getMessage()}");
-            }
-
-            $userDetails->populate(
-                $response,
-                $this->config()['external_id_claim'],
-                $this->config()['display_name_claims'] ?? '',
-                $this->config()['groups_claim'] ?? ''
-            );
-        }
-
-        return $userDetails;
-    }
-
-    /**
-     * Get the OIDC config from the application.
-     */
-    protected function config(): array
-    {
-        return config('oidc');
-    }
-
-    /**
-     * Check if groups should be synced.
-     */
-    protected function shouldSyncGroups(): bool
-    {
-        return $this->config()['user_to_groups'] !== false;
-    }
-
-    /**
-     * Start the RP-initiated logout flow if active, otherwise start a standard logout flow.
-     * Returns a post-app-logout redirect URL.
-     * Reference: https://openid.net/specs/openid-connect-rpinitiated-1_0.html
-     * @throws OidcException
-     */
-    public function logout(): string
-    {
-        $oidcToken = session()->pull("oidc_id_token");
-        $defaultLogoutUrl = url($this->loginService->logout());
-        $oidcSettings = $this->getProviderSettings();
-
-        if (!$oidcSettings->endSessionEndpoint) {
-            return $defaultLogoutUrl;
-        }
-
-        $endpointParams = [
-            'id_token_hint' => $oidcToken,
-            'post_logout_redirect_uri' => $defaultLogoutUrl,
-        ];
-
-        $joiner = str_contains($oidcSettings->endSessionEndpoint, '?') ? '&' : '?';
-
-        return $oidcSettings->endSessionEndpoint . $joiner . http_build_query($endpointParams);
-    }
-}

app/Access/Oidc/OidcUserDetails.php

@@ -1,75 +0,0 @@
-<?php
-
-namespace BookStack\Access\Oidc;
-
-use Illuminate\Support\Arr;
-
-class OidcUserDetails
-{
-    public function __construct(
-        public ?string $externalId = null,
-        public ?string $email = null,
-        public ?string $name = null,
-        public ?array $groups = null,
-    ) {
-    }
-
-    /**
-     * Check if the user details are fully populated for our usage.
-     */
-    public function isFullyPopulated(bool $groupSyncActive): bool
-    {
-        $hasEmpty = empty($this->externalId)
-            || empty($this->email)
-            || empty($this->name)
-            || ($groupSyncActive && $this->groups === null);
-
-        return !$hasEmpty;
-    }
-
-    /**
-     * Populate user details from the given claim data.
-     */
-    public function populate(
-        ProvidesClaims $claims,
-        string $idClaim,
-        string $displayNameClaims,
-        string $groupsClaim,
-    ): void {
-        $this->externalId = $claims->getClaim($idClaim) ?? $this->externalId;
-        $this->email = $claims->getClaim('email') ?? $this->email;
-        $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
-        $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;
-    }
-
-    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token): string
-    {
-        $displayNameClaimParts = explode('|', $displayNameClaims);
-
-        $displayName = [];
-        foreach ($displayNameClaimParts as $claim) {
-            $component = $token->getClaim(trim($claim)) ?? '';
-            if ($component !== '') {
-                $displayName[] = $component;
-            }
-        }
-
-        return implode(' ', $displayName);
-    }
-
-    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $token): ?array
-    {
-        if (empty($groupsClaim)) {
-            return null;
-        }
-
-        $groupsList = Arr::get($token->getAllClaims(), $groupsClaim);
-        if (!is_array($groupsList)) {
-            return null;
-        }
-
-        return array_values(array_filter($groupsList, function ($val) {
-            return is_string($val);
-        }));
-    }
-}

app/Access/Oidc/OidcUserinfoResponse.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace BookStack\Access\Oidc;
-
-use Psr\Http\Message\ResponseInterface;
-
-class OidcUserinfoResponse implements ProvidesClaims
-{
-    protected array $claims = [];
-    protected ?OidcJwtWithClaims $jwt = null;
-
-    public function __construct(ResponseInterface $response, string $issuer, array $keys)
-    {
-        $contentType = $response->getHeader('Content-Type')[0];
-        if ($contentType === 'application/json') {
-            $this->claims = json_decode($response->getBody()->getContents(), true);
-        }
-
-        if ($contentType === 'application/jwt') {
-            $this->jwt = new OidcJwtWithClaims($response->getBody()->getContents(), $issuer, $keys);
-            $this->claims = $this->jwt->getAllClaims();
-        }
-    }
-
-    /**
-     * @throws OidcInvalidTokenException
-     */
-    public function validate(string $idTokenSub, string $clientId): bool
-    {
-        if (!is_null($this->jwt)) {
-            $this->jwt->validateCommonTokenDetails($clientId);
-        }
-
-        $sub = $this->getClaim('sub');
-
-        // Spec: v1.0 5.3.2: The sub (subject) Claim MUST always be returned in the UserInfo Response.
-        if (!is_string($sub) || empty($sub)) {
-            throw new OidcInvalidTokenException("No valid subject value found in userinfo data");
-        }
-
-        // Spec: v1.0 5.3.2: The sub Claim in the UserInfo Response MUST be verified to exactly match the sub Claim in the ID Token;
-        // if they do not match, the UserInfo Response values MUST NOT be used.
-        if ($idTokenSub !== $sub) {
-            throw new OidcInvalidTokenException("Subject value provided in the userinfo endpoint does not match the provided ID token value");
-        }
-
-        // Spec v1.0 5.3.4 Defines the following:
-        // Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
-          // This is effectively done as part of the HTTP request we're making through CURLOPT_SSL_VERIFYHOST on the request.
-        // If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
-          // We don't currently support JWT encryption for OIDC
-        // If the response was signed, the Client SHOULD validate the signature according to JWS [JWS].
-          // This is done as part of the validateCommonClaims above.
-
-        return true;
-    }
-
-    public function getClaim(string $claim): mixed
-    {
-        return $this->claims[$claim] ?? null;
-    }
-
-    public function getAllClaims(): array
-    {
-        return $this->claims;
-    }
-}

app/Access/Oidc/ProvidesClaims.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace BookStack\Access\Oidc;
-
-interface ProvidesClaims
-{
-    /**
-     * Fetch a specific claim.
-     * Returns null if it is null or does not exist.
-     */
-    public function getClaim(string $claim): mixed;
-
-    /**
-     * Get all contained claims.
-     */
-    public function getAllClaims(): array;
-}

app/Access/SocialDriverManager.php

@@ -1,147 +0,0 @@
-<?php
-
-namespace BookStack\Access;
-
-use BookStack\Exceptions\SocialDriverNotConfigured;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Str;
-use SocialiteProviders\Manager\SocialiteWasCalled;
-
-class SocialDriverManager
-{
-    /**
-     * The default built-in social drivers we support.
-     *
-     * @var string[]
-     */
-    protected array $validDrivers = [
-        '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 array $configureForRedirectCallbacks = [];
-
-    /**
-     * Check if the current config for the given driver allows auto-registration.
-     */
-    public function isAutoRegisterEnabled(string $driver): bool
-    {
-        return $this->getDriverConfigProperty($driver, 'auto_register') === true;
-    }
-
-    /**
-     * Check if the current config for the given driver allow email address auto-confirmation.
-     */
-    public function isAutoConfirmEmailEnabled(string $driver): bool
-    {
-        return $this->getDriverConfigProperty($driver, 'auto_confirm') === true;
-    }
-
-    /**
-     * Gets the names of the active social drivers, keyed by driver id.
-     * @returns array<string, string>
-     */
-    public function getActive(): array
-    {
-        $activeDrivers = [];
-
-        foreach ($this->validDrivers as $driverKey) {
-            if ($this->checkDriverConfigured($driverKey)) {
-                $activeDrivers[$driverKey] = $this->getName($driverKey);
-            }
-        }
-
-        return $activeDrivers;
-    }
-
-    /**
-     * Get the configure-for-redirect callback for the given driver.
-     * This is a callable that allows modification of the driver at redirect time.
-     * Commonly used to perform custom dynamic configuration where required.
-     * The callback is passed a \Laravel\Socialite\Contracts\Provider instance.
-     */
-    public function getConfigureForRedirectCallback(string $driver): callable
-    {
-        return $this->configureForRedirectCallbacks[$driver] ?? (fn() => true);
-    }
-
-    /**
-     * Add a custom socialite driver to be used.
-     * Driver name should be lower_snake_case.
-     * Config array should mirror the structure of a service
-     * 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
-    ) {
-        $this->validDrivers[] = $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;
-        }
-    }
-
-    /**
-     * Get the presentational name for a driver.
-     */
-    protected function getName(string $driver): string
-    {
-        return $this->getDriverConfigProperty($driver, 'name') ?? '';
-    }
-
-    protected function getDriverConfigProperty(string $driver, string $property): mixed
-    {
-        return config("services.{$driver}.{$property}");
-    }
-
-    /**
-     * Ensure the social driver is correct and supported.
-     *
-     * @throws SocialDriverNotConfigured
-     */
-    public function ensureDriverActive(string $driverName): void
-    {
-        if (!in_array($driverName, $this->validDrivers)) {
-            abort(404, trans('errors.social_driver_not_found'));
-        }
-
-        if (!$this->checkDriverConfigured($driverName)) {
-            throw new SocialDriverNotConfigured(trans('errors.social_driver_not_configured', ['socialAccount' => Str::title($driverName)]));
-        }
-    }
-
-    /**
-     * Check a social driver has been configured correctly.
-     */
-    protected function checkDriverConfigured(string $driver): bool
-    {
-        $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);
-    }
-}

app/Actions/Activity.php

@@ -1,38 +1,35 @@
 <?php
 
-namespace BookStack\Activity\Models;
+namespace BookStack\Actions;
 
-use BookStack\App\Model;
+use BookStack\Auth\User;
 use BookStack\Entities\Models\Entity;
-use BookStack\Permissions\Models\JointPermission;
-use BookStack\Users\Models\User;
+use BookStack\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 
 /**
  * @property string $type
  * @property User   $user
- * @property Entity $loggable
+ * @property Entity $entity
  * @property string $detail
- * @property string $loggable_type
- * @property int    $loggable_id
+ * @property string $entity_type
+ * @property int    $entity_id
  * @property int    $user_id
- * @property Carbon $created_at
  */
 class Activity extends Model
 {
     /**
-     * Get the loggable model related to this activity.
-     * Currently only used for entities (previously entity_[id/type] columns).
-     * Could be used for others but will need an audit of uses where assumed
-     * to be entities.
+     * Get the entity for this activity.
      */
-    public function loggable(): MorphTo
+    public function entity(): MorphTo
     {
-        return $this->morphTo('loggable');
+        if ($this->entity_type === '') {
+            $this->entity_type = null;
+        }
+
+        return $this->morphTo('entity');
     }
 
     /**
@@ -43,12 +40,6 @@ class Activity extends Model
         return $this->belongsTo(User::class);
     }
 
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'loggable_id')
-            ->whereColumn('activities.loggable_type', '=', 'joint_permissions.entity_type');
-    }
-
     /**
      * Returns text from the language files, Looks up by using the activity key.
      */
@@ -72,6 +63,6 @@ class Activity extends Model
      */
     public function isSimilarTo(self $activityB): bool
     {
-        return [$this->type, $this->loggable_type, $this->loggable_id] === [$activityB->type, $activityB->loggable_type, $activityB->loggable_id];
+        return [$this->type, $this->entity_type, $this->entity_id] === [$activityB->type, $activityB->entity_type, $activityB->entity_id];
     }
 }

app/Actions/ActivityLogger.php

@@ -1,30 +1,28 @@
 <?php
 
-namespace BookStack\Activity\Tools;
+namespace BookStack\Actions;
 
-use BookStack\Activity\DispatchWebhookJob;
-use BookStack\Activity\Models\Activity;
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Models\Webhook;
-use BookStack\Activity\Notifications\NotificationManager;
+use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Entities\Models\Entity;
-use BookStack\Facades\Theme;
-use BookStack\Theming\ThemeEvents;
+use BookStack\Interfaces\Loggable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Log;
 
 class ActivityLogger
 {
-    public function __construct(
-        protected NotificationManager $notifications
-    ) {
-        $this->notifications->loadDefaultHandlers();
+    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, string|Loggable $detail = ''): void
+    public function add(string $type, $detail = '')
     {
         $detailToStore = ($detail instanceof Loggable) ? $detail->logDescriptor() : $detail;
 
@@ -32,16 +30,13 @@ class ActivityLogger
         $activity->detail = $detailToStore;
 
         if ($detail instanceof Entity) {
-            $activity->loggable_id = $detail->id;
-            $activity->loggable_type = $detail->getMorphClass();
+            $activity->entity_id = $detail->id;
+            $activity->entity_type = $detail->getMorphClass();
         }
 
         $activity->save();
-
         $this->setNotification($type);
         $this->dispatchWebhooks($type, $detail);
-        $this->notifications->handle($activity, $detail, user());
-        Theme::dispatch(ThemeEvents::ACTIVITY_LOGGED, $type, $detail);
     }
 
     /**
@@ -49,10 +44,12 @@ class ActivityLogger
      */
     protected function newActivityForUser(string $type): Activity
     {
+        $ip = request()->ip() ?? '';
+
         return (new Activity())->forceFill([
             'type'     => strtolower($type),
             'user_id'  => user()->id,
-            'ip'       => IpFormatter::fromCurrentRequest()->format(),
+            'ip'       => config('app.env') === 'demo' ? '127.0.0.1' : $ip,
         ]);
     }
 
@@ -61,12 +58,12 @@ class ActivityLogger
      * and instead uses the 'extra' field with the entities name.
      * Used when an entity is deleted.
      */
-    public function removeEntity(Entity $entity): void
+    public function removeEntity(Entity $entity)
     {
         $entity->activity()->update([
-            'detail'         => $entity->name,
-            'loggable_id'    => null,
-            'loggable_type'  => null,
+            'detail'       => $entity->name,
+            'entity_id'    => null,
+            'entity_type'  => null,
         ]);
     }
 
@@ -82,7 +79,10 @@ class ActivityLogger
         }
     }
 
-    protected function dispatchWebhooks(string $type, string|Loggable $detail): void
+    /**
+     * @param string|Loggable $detail
+     */
+    protected function dispatchWebhooks(string $type, $detail): void
     {
         $webhooks = Webhook::query()
             ->whereHas('trackedEvents', function (Builder $query) use ($type) {
@@ -101,7 +101,7 @@ class ActivityLogger
      * 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): void
+    public function logFailedLogin(string $username)
     {
         $message = config('logging.failed_login.message');
         if (!$message) {

app/Actions/ActivityQueries.php

@@ -1,24 +1,23 @@
 <?php
 
-namespace BookStack\Activity;
+namespace BookStack\Actions;
 
-use BookStack\Activity\Models\Activity;
+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 BookStack\Entities\Tools\MixedEntityListLoader;
-use BookStack\Permissions\PermissionApplicator;
-use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
 class ActivityQueries
 {
-    public function __construct(
-        protected PermissionApplicator $permissions,
-        protected MixedEntityListLoader $listLoader,
-    ) {
+    protected $permissionService;
+
+    public function __construct(PermissionService $permissionService)
+    {
+        $this->permissionService = $permissionService;
     }
 
     /**
@@ -26,16 +25,14 @@ class ActivityQueries
      */
     public function latest(int $count = 20, int $page = 0): array
     {
-        $activityList = $this->permissions
-            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')
+        $activityList = $this->permissionService
+            ->filterRestrictedEntityRelations(Activity::query(), 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')
-            ->with(['user'])
+            ->with(['user', 'entity'])
             ->skip($count * $page)
             ->take($count)
             ->get();
 
-        $this->listLoader->loadIntoRelations($activityList->all(), 'loggable', false);
-
         return $this->filterSimilar($activityList);
     }
 
@@ -59,14 +56,14 @@ class ActivityQueries
         $query->where(function (Builder $query) use ($queryIds) {
             foreach ($queryIds as $morphClass => $idArr) {
                 $query->orWhere(function (Builder $innerQuery) use ($morphClass, $idArr) {
-                    $innerQuery->where('loggable_type', '=', $morphClass)
-                        ->whereIn('loggable_id', $idArr);
+                    $innerQuery->where('entity_type', '=', $morphClass)
+                        ->whereIn('entity_id', $idArr);
                 });
             }
         });
 
         $activity = $query->orderBy('created_at', 'desc')
-            ->with(['loggable' => function (Relation $query) {
+            ->with(['entity' => function (Relation $query) {
                 $query->withTrashed();
             }, 'user.avatar'])
             ->skip($count * ($page - 1))
@@ -81,8 +78,8 @@ class ActivityQueries
      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
-        $activityList = $this->permissions
-            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')
+        $activityList = $this->permissionService
+            ->filterRestrictedEntityRelations(Activity::query(), 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')
             ->where('user_id', '=', $user->id)
             ->skip($count * $page)

app/Actions/ActivityType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Activity;
+namespace BookStack\Actions;
 
 class ActivityType
 {
@@ -16,26 +16,17 @@ class ActivityType
     const CHAPTER_MOVE = 'chapter_move';
 
     const BOOK_CREATE = 'book_create';
-    const BOOK_CREATE_FROM_CHAPTER = 'book_create_from_chapter';
     const BOOK_UPDATE = 'book_update';
     const BOOK_DELETE = 'book_delete';
     const BOOK_SORT = 'book_sort';
 
     const BOOKSHELF_CREATE = 'bookshelf_create';
-    const BOOKSHELF_CREATE_FROM_BOOK = 'bookshelf_create_from_book';
     const BOOKSHELF_UPDATE = 'bookshelf_update';
     const BOOKSHELF_DELETE = 'bookshelf_delete';
 
     const COMMENTED_ON = 'commented_on';
-    const COMMENT_CREATE = 'comment_create';
-    const COMMENT_UPDATE = 'comment_update';
-    const COMMENT_DELETE = 'comment_delete';
-
     const PERMISSIONS_UPDATE = 'permissions_update';
 
-    const REVISION_RESTORE = 'revision_restore';
-    const REVISION_DELETE = 'revision_delete';
-
     const SETTINGS_UPDATE = 'settings_update';
     const MAINTENANCE_ACTION_RUN = 'maintenance_action_run';
 

app/Actions/Comment.php

@@ -0,0 +1,60 @@
+<?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
+ */
+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.
+     */
+    public function entity(): MorphTo
+    {
+        return $this->morphTo('entity');
+    }
+
+    /**
+     * Check if a comment has been updated since creation.
+     */
+    public function isUpdated(): bool
+    {
+        return $this->updated_at->timestamp > $this->created_at->timestamp;
+    }
+
+    /**
+     * Get created date as a relative diff.
+     *
+     * @return mixed
+     */
+    public function getCreatedAttribute()
+    {
+        return $this->created_at->diffForHumans();
+    }
+
+    /**
+     * Get updated date as a relative diff.
+     *
+     * @return mixed
+     */
+    public function getUpdatedAttribute()
+    {
+        return $this->updated_at->diffForHumans();
+    }
+}

app/Actions/CommentRepo.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace BookStack\Actions;
+
+use BookStack\Entities\Models\Entity;
+use BookStack\Facades\Activity as ActivityService;
+use League\CommonMark\CommonMarkConverter;
+
+/**
+ * Class CommentRepo.
+ */
+class CommentRepo
+{
+    /**
+     * @var Comment
+     */
+    protected $comment;
+
+    public function __construct(Comment $comment)
+    {
+        $this->comment = $comment;
+    }
+
+    /**
+     * Get a comment by ID.
+     */
+    public function getById(int $id): Comment
+    {
+        return $this->comment->newQuery()->findOrFail($id);
+    }
+
+    /**
+     * Create a new comment on an entity.
+     */
+    public function create(Entity $entity, string $text, ?int $parent_id): Comment
+    {
+        $userId = user()->id;
+        $comment = $this->comment->newInstance();
+
+        $comment->text = $text;
+        $comment->html = $this->commentToHtml($text);
+        $comment->created_by = $userId;
+        $comment->updated_by = $userId;
+        $comment->local_id = $this->getNextLocalId($entity);
+        $comment->parent_id = $parent_id;
+
+        $entity->comments()->save($comment);
+        ActivityService::add(ActivityType::COMMENTED_ON, $entity);
+
+        return $comment;
+    }
+
+    /**
+     * Update an existing comment.
+     */
+    public function update(Comment $comment, string $text): Comment
+    {
+        $comment->updated_by = user()->id;
+        $comment->text = $text;
+        $comment->html = $this->commentToHtml($text);
+        $comment->save();
+
+        return $comment;
+    }
+
+    /**
+     * Delete a comment from the system.
+     */
+    public function delete(Comment $comment): void
+    {
+        $comment->delete();
+    }
+
+    /**
+     * Convert the given comment Markdown to HTML.
+     */
+    public function commentToHtml(string $commentText): string
+    {
+        $converter = new CommonMarkConverter([
+            'html_input'         => 'strip',
+            'max_nesting_level'  => 10,
+            'allow_unsafe_links' => false,
+        ]);
+
+        return $converter->convertToHtml($commentText);
+    }
+
+    /**
+     * Get the next local ID relative to the linked entity.
+     */
+    protected function getNextLocalId(Entity $entity): int
+    {
+        /** @var Comment $comment */
+        $comment = $entity->comments(false)->orderBy('local_id', 'desc')->first();
+
+        return ($comment->local_id ?? 0) + 1;
+    }
+}

app/Actions/DispatchWebhookJob.php

@@ -0,0 +1,82 @@
+<?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

@@ -0,0 +1,19 @@
+<?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,11 +1,9 @@
 <?php
 
-namespace BookStack\Activity\Models;
+namespace BookStack\Actions;
 
-use BookStack\App\Model;
-use BookStack\Permissions\Models\JointPermission;
+use BookStack\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
@@ -29,12 +27,6 @@ class Tag extends Model
         return $this->morphTo('entity');
     }
 
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'entity_id')
-            ->whereColumn('tags.entity_type', '=', 'joint_permissions.entity_type');
-    }
-
     /**
      * Get a full URL to start a tag name search for this tag name.
      */

app/Actions/TagRepo.php

@@ -1,33 +1,28 @@
 <?php
 
-namespace BookStack\Activity;
+namespace BookStack\Actions;
 
-use BookStack\Activity\Models\Tag;
+use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Entities\Models\Entity;
-use BookStack\Permissions\PermissionApplicator;
-use BookStack\Util\SimpleListOptions;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 class TagRepo
 {
-    public function __construct(
-        protected PermissionApplicator $permissions
-    ) {
+    protected $tag;
+    protected $permissionService;
+
+    public function __construct(PermissionService $ps)
+    {
+        $this->permissionService = $ps;
     }
 
     /**
      * Start a query against all tags in the system.
      */
-    public function queryWithTotals(SimpleListOptions $listOptions, string $nameFilter): Builder
+    public function queryWithTotals(string $searchTerm, string $nameFilter): Builder
     {
-        $searchTerm = $listOptions->getSearch();
-        $sort = $listOptions->getSort();
-        if ($sort === 'name' && $nameFilter) {
-            $sort = 'value';
-        }
-
         $query = Tag::query()
             ->select([
                 'name',
@@ -38,8 +33,7 @@ class TagRepo
                 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($sort, $listOptions->getOrder())
-            ->whereHas('entity');
+            ->orderBy($nameFilter ? 'value' : 'name');
 
         if ($nameFilter) {
             $query->where('name', '=', $nameFilter);
@@ -57,28 +51,28 @@ class TagRepo
             });
         }
 
-        return $this->permissions->restrictEntityRelationQuery($query, 'tags', 'entity_id', 'entity_type');
+        return $this->permissionService->filterRestrictedEntityRelations($query, 'tags', 'entity_id', 'entity_type');
     }
 
     /**
      * Get tag name suggestions from scanning existing tag names.
      * If no search term is given the 50 most popular tag names are provided.
      */
-    public function getNameSuggestions(string $searchTerm): Collection
+    public function getNameSuggestions(?string $searchTerm): Collection
     {
         $query = Tag::query()
             ->select('*', DB::raw('count(*) as count'))
             ->groupBy('name');
 
         if ($searchTerm) {
-            $query = $query->where('name', 'LIKE', $searchTerm . '%')->orderBy('name', 'asc');
+            $query = $query->where('name', 'LIKE', $searchTerm . '%')->orderBy('name', 'desc');
         } else {
             $query = $query->orderBy('count', 'desc')->take(50);
         }
 
-        $query = $this->permissions->restrictEntityRelationQuery($query, 'tags', 'entity_id', 'entity_type');
+        $query = $this->permissionService->filterRestrictedEntityRelations($query, 'tags', 'entity_id', 'entity_type');
 
-        return $query->pluck('name');
+        return $query->get(['name'])->pluck('name');
     }
 
     /**
@@ -86,11 +80,10 @@ class TagRepo
      * If no search is given the 50 most popular values are provided.
      * Passing a tagName will only find values for a tags with a particular name.
      */
-    public function getValueSuggestions(string $searchTerm, string $tagName): Collection
+    public function getValueSuggestions(?string $searchTerm, ?string $tagName): Collection
     {
         $query = Tag::query()
             ->select('*', DB::raw('count(*) as count'))
-            ->where('value', '!=', '')
             ->groupBy('value');
 
         if ($searchTerm) {
@@ -103,9 +96,9 @@ class TagRepo
             $query = $query->where('name', '=', $tagName);
         }
 
-        $query = $this->permissions->restrictEntityRelationQuery($query, 'tags', 'entity_id', 'entity_type');
+        $query = $this->permissionService->filterRestrictedEntityRelations($query, 'tags', 'entity_id', 'entity_type');
 
-        return $query->pluck('value');
+        return $query->get(['value'])->pluck('value');
     }
 
     /**

app/Actions/View.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace BookStack\Activity\Models;
+namespace BookStack\Actions;
 
-use BookStack\App\Model;
-use BookStack\Permissions\Models\JointPermission;
-use Illuminate\Database\Eloquent\Relations\HasMany;
+use BookStack\Interfaces\Viewable;
+use BookStack\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
@@ -29,19 +28,13 @@ class View extends Model
         return $this->morphTo();
     }
 
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'viewable_id')
-            ->whereColumn('views.viewable_type', '=', 'joint_permissions.entity_type');
-    }
-
     /**
      * Increment the current user's view count for the given viewable model.
      */
     public static function incrementFor(Viewable $viewable): int
     {
         $user = user();
-        if ($user->isGuest()) {
+        if (is_null($user) || $user->isDefault()) {
             return 0;
         }
 
@@ -54,4 +47,12 @@ class View extends Model
 
         return $view->views;
     }
+
+    /**
+     * Clear all views from the system.
+     */
+    public static function clearAll()
+    {
+        static::query()->truncate();
+    }
 }

app/Actions/Webhook.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Activity\Models;
+namespace BookStack\Actions;
 
-use BookStack\Activity\ActivityType;
+use BookStack\Interfaces\Loggable;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -22,10 +22,10 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  */
 class Webhook extends Model implements Loggable
 {
-    use HasFactory;
-
     protected $fillable = ['name', 'endpoint', 'timeout'];
 
+    use HasFactory;
+
     protected $casts = [
         'last_called_at'  => 'datetime',
         'last_errored_at' => 'datetime',

app/Actions/WebhookFormatter.php

@@ -1,14 +1,12 @@
 <?php
 
-namespace BookStack\Activity\Tools;
+namespace BookStack\Actions;
 
-use BookStack\Activity\ActivityType;
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Models\Webhook;
-use BookStack\App\Model;
+use BookStack\Auth\User;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
-use BookStack\Users\Models\User;
+use BookStack\Interfaces\Loggable;
+use BookStack\Model;
 use Illuminate\Support\Carbon;
 
 class WebhookFormatter
@@ -17,14 +15,18 @@ class WebhookFormatter
     protected string $event;
     protected User $initiator;
     protected int $initiatedTime;
-    protected string|Loggable $detail;
+
+    /**
+     * @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, string|Loggable $detail, User $initiator, int $initiatedTime)
+    public function __construct(string $event, Webhook $webhook, $detail, User $initiator, int $initiatedTime)
     {
         $this->webhook = $webhook;
         $this->event = $event;

app/Actions/WebhookTrackedEvent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Activity\Models;
+namespace BookStack\Actions;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
  */
 class WebhookTrackedEvent extends Model
 {
-    use HasFactory;
-
     protected $fillable = ['event'];
+
+    use HasFactory;
 }

app/Activity/CommentRepo.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace BookStack\Activity;
-
-use BookStack\Activity\Models\Comment;
-use BookStack\Entities\Models\Entity;
-use BookStack\Facades\Activity as ActivityService;
-use BookStack\Util\HtmlDescriptionFilter;
-
-class CommentRepo
-{
-    /**
-     * Get a comment by ID.
-     */
-    public function getById(int $id): Comment
-    {
-        return Comment::query()->findOrFail($id);
-    }
-
-    /**
-     * Create a new comment on an entity.
-     */
-    public function create(Entity $entity, string $html, ?int $parent_id): Comment
-    {
-        $userId = user()->id;
-        $comment = new Comment();
-
-        $comment->html = HtmlDescriptionFilter::filterFromString($html);
-        $comment->created_by = $userId;
-        $comment->updated_by = $userId;
-        $comment->local_id = $this->getNextLocalId($entity);
-        $comment->parent_id = $parent_id;
-
-        $entity->comments()->save($comment);
-        ActivityService::add(ActivityType::COMMENT_CREATE, $comment);
-        ActivityService::add(ActivityType::COMMENTED_ON, $entity);
-
-        return $comment;
-    }
-
-    /**
-     * Update an existing comment.
-     */
-    public function update(Comment $comment, string $html): Comment
-    {
-        $comment->updated_by = user()->id;
-        $comment->html = HtmlDescriptionFilter::filterFromString($html);
-        $comment->save();
-
-        ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
-
-        return $comment;
-    }
-
-    /**
-     * Delete a comment from the system.
-     */
-    public function delete(Comment $comment): void
-    {
-        $comment->delete();
-
-        ActivityService::add(ActivityType::COMMENT_DELETE, $comment);
-    }
-
-    /**
-     * Get the next local ID relative to the linked entity.
-     */
-    protected function getNextLocalId(Entity $entity): int
-    {
-        $currentMaxId = $entity->comments()->max('local_id');
-
-        return $currentMaxId + 1;
-    }
-}

app/Activity/Controllers/AuditLogApiController.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Controllers;
-
-use BookStack\Activity\Models\Activity;
-use BookStack\Http\ApiController;
-
-class AuditLogApiController extends ApiController
-{
-    /**
-     * Get a listing of audit log events in the system.
-     * The loggable relation fields currently only relates to core
-     * content types (page, book, bookshelf, chapter) but this may be
-     * used more in the future across other types.
-     * Requires permission to manage both users and system settings.
-     */
-    public function list()
-    {
-        $this->checkPermission('settings-manage');
-        $this->checkPermission('users-manage');
-
-        $query = Activity::query()->with(['user']);
-
-        return $this->apiListingResponse($query, [
-            'id', 'type', 'detail', 'user_id', 'loggable_id', 'loggable_type', 'ip', 'created_at',
-        ]);
-    }
-}

app/Activity/Controllers/AuditLogController.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Controllers;
-
-use BookStack\Activity\ActivityType;
-use BookStack\Activity\Models\Activity;
-use BookStack\Http\Controller;
-use BookStack\Util\SimpleListOptions;
-use Illuminate\Http\Request;
-
-class AuditLogController extends Controller
-{
-    public function index(Request $request)
-    {
-        $this->checkPermission('settings-manage');
-        $this->checkPermission('users-manage');
-
-        $sort = $request->get('sort', 'activity_date');
-        $order = $request->get('order', 'desc');
-        $listOptions = (new SimpleListOptions('', $sort, $order))->withSortOptions([
-            'created_at' => trans('settings.audit_table_date'),
-            'type' => trans('settings.audit_table_event'),
-        ]);
-
-        $filters = [
-            'event'     => $request->get('event', ''),
-            'date_from' => $request->get('date_from', ''),
-            'date_to'   => $request->get('date_to', ''),
-            'user'      => $request->get('user', ''),
-            'ip'        => $request->get('ip', ''),
-        ];
-
-        $query = Activity::query()
-            ->with([
-                'loggable' => fn ($query) => $query->withTrashed(),
-                'user',
-            ])
-            ->orderBy($listOptions->getSort(), $listOptions->getOrder());
-
-        if ($filters['event']) {
-            $query->where('type', '=', $filters['event']);
-        }
-        if ($filters['user']) {
-            $query->where('user_id', '=', $filters['user']);
-        }
-
-        if ($filters['date_from']) {
-            $query->where('created_at', '>=', $filters['date_from']);
-        }
-        if ($filters['date_to']) {
-            $query->where('created_at', '<=', $filters['date_to']);
-        }
-        if ($filters['ip']) {
-            $query->where('ip', 'like', $filters['ip'] . '%');
-        }
-
-        $activities = $query->paginate(100);
-        $activities->appends($request->all());
-
-        $types = ActivityType::all();
-        $this->setPageTitle(trans('settings.audit'));
-
-        return view('settings.audit', [
-            'activities'    => $activities,
-            'filters'       => $filters,
-            'listOptions'   => $listOptions,
-            'activityTypes' => $types,
-        ]);
-    }
-}

app/Activity/Controllers/FavouriteController.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Controllers;
-
-use BookStack\Entities\Queries\QueryTopFavourites;
-use BookStack\Entities\Tools\MixedEntityRequestHelper;
-use BookStack\Http\Controller;
-use Illuminate\Http\Request;
-
-class FavouriteController extends Controller
-{
-    public function __construct(
-        protected MixedEntityRequestHelper $entityHelper,
-    ) {
-    }
-
-    /**
-     * Show a listing of all favourite items for the current user.
-     */
-    public function index(Request $request, QueryTopFavourites $topFavourites)
-    {
-        $viewCount = 20;
-        $page = intval($request->get('page', 1));
-        $favourites = $topFavourites->run($viewCount + 1, (($page - 1) * $viewCount));
-
-        $hasMoreLink = ($favourites->count() > $viewCount) ? url('/favourites?page=' . ($page + 1)) : null;
-
-        $this->setPageTitle(trans('entities.my_favourites'));
-
-        return view('common.detailed-listing-with-more', [
-            'title'       => trans('entities.my_favourites'),
-            'entities'    => $favourites->slice(0, $viewCount),
-            'hasMoreLink' => $hasMoreLink,
-        ]);
-    }
-
-    /**
-     * Add a new item as a favourite.
-     */
-    public function add(Request $request)
-    {
-        $modelInfo = $this->validate($request, $this->entityHelper->validationRules());
-        $entity = $this->entityHelper->getVisibleEntityFromRequestData($modelInfo);
-        $entity->favourites()->firstOrCreate([
-            'user_id' => user()->id,
-        ]);
-
-        $this->showSuccessNotification(trans('activities.favourite_add_notification', [
-            'name' => $entity->name,
-        ]));
-
-        return redirect($entity->getUrl());
-    }
-
-    /**
-     * Remove an item as a favourite.
-     */
-    public function remove(Request $request)
-    {
-        $modelInfo = $this->validate($request, $this->entityHelper->validationRules());
-        $entity = $this->entityHelper->getVisibleEntityFromRequestData($modelInfo);
-        $entity->favourites()->where([
-            'user_id' => user()->id,
-        ])->delete();
-
-        $this->showSuccessNotification(trans('activities.favourite_remove_notification', [
-            'name' => $entity->name,
-        ]));
-
-        return redirect($entity->getUrl());
-    }
-}

app/Activity/Controllers/WatchController.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Controllers;
-
-use BookStack\Activity\Tools\UserEntityWatchOptions;
-use BookStack\Entities\Tools\MixedEntityRequestHelper;
-use BookStack\Http\Controller;
-use Illuminate\Http\Request;
-
-class WatchController extends Controller
-{
-    public function update(Request $request, MixedEntityRequestHelper $entityHelper)
-    {
-        $this->checkPermission('receive-notifications');
-        $this->preventGuestAccess();
-
-        $requestData = $this->validate($request, array_merge([
-            'level' => ['required', 'string'],
-        ], $entityHelper->validationRules()));
-
-        $watchable = $entityHelper->getVisibleEntityFromRequestData($requestData);
-        $watchOptions = new UserEntityWatchOptions(user(), $watchable);
-        $watchOptions->updateLevelByName($requestData['level']);
-
-        $this->showSuccessNotification(trans('activities.watch_update_level_notification'));
-
-        return redirect($watchable->getUrl());
-    }
-}

app/Activity/DispatchWebhookJob.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace BookStack\Activity;
-
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Models\Webhook;
-use BookStack\Activity\Tools\WebhookFormatter;
-use BookStack\Facades\Theme;
-use BookStack\Http\HttpRequestService;
-use BookStack\Theming\ThemeEvents;
-use BookStack\Users\Models\User;
-use BookStack\Util\SsrUrlValidator;
-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\Log;
-
-class DispatchWebhookJob implements ShouldQueue
-{
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    protected Webhook $webhook;
-    protected User $initiator;
-    protected int $initiatedTime;
-    protected array $webhookData;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(Webhook $webhook, string $event, Loggable|string $detail)
-    {
-        $this->webhook = $webhook;
-        $this->initiator = user();
-        $this->initiatedTime = time();
-
-        $themeResponse = Theme::dispatch(ThemeEvents::WEBHOOK_CALL_BEFORE, $event, $this->webhook, $detail, $this->initiator, $this->initiatedTime);
-        $this->webhookData =  $themeResponse ?? WebhookFormatter::getDefault($event, $this->webhook, $detail, $this->initiator, $this->initiatedTime)->format();
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle(HttpRequestService $http)
-    {
-        $lastError = null;
-
-        try {
-            (new SsrUrlValidator())->ensureAllowed($this->webhook->endpoint);
-
-            $client = $http->buildClient($this->webhook->timeout, [
-                'connect_timeout' => 10,
-                'allow_redirects' => ['strict' => true],
-            ]);
-
-            $response = $client->sendRequest($http->jsonRequest('POST', $this->webhook->endpoint, $this->webhookData));
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode >= 400) {
-                $lastError = "Response status from endpoint was {$statusCode}";
-                Log::error("Webhook call to endpoint {$this->webhook->endpoint} failed with status {$statusCode}");
-            }
-        } catch (\Exception $error) {
-            $lastError = $error->getMessage();
-            Log::error("Webhook call to endpoint {$this->webhook->endpoint} failed with error \"{$lastError}\"");
-        }
-
-        $this->webhook->last_called_at = now();
-        if ($lastError) {
-            $this->webhook->last_errored_at = now();
-            $this->webhook->last_error = $lastError;
-        }
-
-        $this->webhook->save();
-    }
-}

app/Activity/Models/Comment.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Models;
-
-use BookStack\App\Model;
-use BookStack\Users\Models\HasCreatorAndUpdater;
-use BookStack\Util\HtmlContentFilter;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
-
-/**
- * @property int      $id
- * @property string   $text - Deprecated & now unused (#4821)
- * @property string   $html
- * @property int|null $parent_id  - Relates to local_id, not id
- * @property int      $local_id
- * @property string   $entity_type
- * @property int      $entity_id
- * @property int      $created_by
- * @property int      $updated_by
- */
-class Comment extends Model implements Loggable
-{
-    use HasFactory;
-    use HasCreatorAndUpdater;
-
-    protected $fillable = ['parent_id'];
-    protected $appends = ['created', 'updated'];
-
-    /**
-     * Get the entity that this comment belongs to.
-     */
-    public function entity(): MorphTo
-    {
-        return $this->morphTo('entity');
-    }
-
-    /**
-     * Get the parent comment this is in reply to (if existing).
-     */
-    public function parent(): BelongsTo
-    {
-        return $this->belongsTo(Comment::class, 'parent_id', 'local_id', 'parent')
-            ->where('entity_type', '=', $this->entity_type)
-            ->where('entity_id', '=', $this->entity_id);
-    }
-
-    /**
-     * Check if a comment has been updated since creation.
-     */
-    public function isUpdated(): bool
-    {
-        return $this->updated_at->timestamp > $this->created_at->timestamp;
-    }
-
-    /**
-     * Get created date as a relative diff.
-     */
-    public function getCreatedAttribute(): string
-    {
-        return $this->created_at->diffForHumans();
-    }
-
-    /**
-     * Get updated date as a relative diff.
-     */
-    public function getUpdatedAttribute(): string
-    {
-        return $this->updated_at->diffForHumans();
-    }
-
-    public function logDescriptor(): string
-    {
-        return "Comment #{$this->local_id} (ID: {$this->id}) for {$this->entity_type} (ID: {$this->entity_id})";
-    }
-
-    public function safeHtml(): string
-    {
-        return HtmlContentFilter::removeScriptsFromHtmlString($this->html ?? '');
-    }
-}

app/Activity/Models/Favourite.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Models;
-
-use BookStack\App\Model;
-use BookStack\Permissions\Models\JointPermission;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-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();
-    }
-
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'favouritable_id')
-            ->whereColumn('favourites.favouritable_type', '=', 'joint_permissions.entity_type');
-    }
-}

app/Activity/Models/Watch.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Models;
-
-use BookStack\Activity\WatchLevels;
-use BookStack\Permissions\Models\JointPermission;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
-
-/**
- * @property int $id
- * @property int $user_id
- * @property int $watchable_id
- * @property string $watchable_type
- * @property int $level
- * @property Carbon $created_at
- * @property Carbon $updated_at
- */
-class Watch extends Model
-{
-    protected $guarded = [];
-
-    public function watchable(): MorphTo
-    {
-        return $this->morphTo();
-    }
-
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'watchable_id')
-            ->whereColumn('watches.watchable_type', '=', 'joint_permissions.entity_type');
-    }
-
-    public function getLevelName(): string
-    {
-        return WatchLevels::levelValueToName($this->level);
-    }
-
-    public function ignoring(): bool
-    {
-        return $this->level === WatchLevels::IGNORE;
-    }
-}

app/Activity/Notifications/Handlers/BaseNotificationHandler.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Handlers;
-
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Notifications\Messages\BaseActivityNotification;
-use BookStack\Entities\Models\Entity;
-use BookStack\Permissions\PermissionApplicator;
-use BookStack\Users\Models\User;
-
-abstract class BaseNotificationHandler implements NotificationHandler
-{
-    /**
-     * @param class-string<BaseActivityNotification> $notification
-     * @param int[] $userIds
-     */
-    protected function sendNotificationToUserIds(string $notification, array $userIds, User $initiator, string|Loggable $detail, Entity $relatedModel): void
-    {
-        $users = User::query()->whereIn('id', array_unique($userIds))->get();
-
-        foreach ($users as $user) {
-            // Prevent sending to the user that initiated the activity
-            if ($user->id === $initiator->id) {
-                continue;
-            }
-
-            // Prevent sending of the user does not have notification permissions
-            if (!$user->can('receive-notifications')) {
-                continue;
-            }
-
-            // Prevent sending if the user does not have access to the related content
-            $permissions = new PermissionApplicator($user);
-            if (!$permissions->checkOwnableUserAccess($relatedModel, 'view')) {
-                continue;
-            }
-
-            // Send the notification
-            $user->notify(new $notification($detail, $initiator));
-        }
-    }
-}

app/Activity/Notifications/Handlers/CommentCreationNotificationHandler.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Handlers;
-
-use BookStack\Activity\Models\Activity;
-use BookStack\Activity\Models\Comment;
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Notifications\Messages\CommentCreationNotification;
-use BookStack\Activity\Tools\EntityWatchers;
-use BookStack\Activity\WatchLevels;
-use BookStack\Entities\Models\Page;
-use BookStack\Settings\UserNotificationPreferences;
-use BookStack\Users\Models\User;
-
-class CommentCreationNotificationHandler extends BaseNotificationHandler
-{
-    public function handle(Activity $activity, Loggable|string $detail, User $user): void
-    {
-        if (!($detail instanceof Comment)) {
-            throw new \InvalidArgumentException("Detail for comment creation notifications must be a comment");
-        }
-
-        // Main watchers
-        /** @var Page $page */
-        $page = $detail->entity;
-        $watchers = new EntityWatchers($page, WatchLevels::COMMENTS);
-        $watcherIds = $watchers->getWatcherUserIds();
-
-        // Page owner if user preferences allow
-        if (!$watchers->isUserIgnoring($page->owned_by) && $page->ownedBy) {
-            $userNotificationPrefs = new UserNotificationPreferences($page->ownedBy);
-            if ($userNotificationPrefs->notifyOnOwnPageComments()) {
-                $watcherIds[] = $page->owned_by;
-            }
-        }
-
-        // Parent comment creator if preferences allow
-        $parentComment = $detail->parent()->first();
-        if ($parentComment && !$watchers->isUserIgnoring($parentComment->created_by) && $parentComment->createdBy) {
-            $parentCommenterNotificationsPrefs = new UserNotificationPreferences($parentComment->createdBy);
-            if ($parentCommenterNotificationsPrefs->notifyOnCommentReplies()) {
-                $watcherIds[] = $parentComment->created_by;
-            }
-        }
-
-        $this->sendNotificationToUserIds(CommentCreationNotification::class, $watcherIds, $user, $detail, $page);
-    }
-}

app/Activity/Notifications/Handlers/NotificationHandler.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Handlers;
-
-use BookStack\Activity\Models\Activity;
-use BookStack\Activity\Models\Loggable;
-use BookStack\Users\Models\User;
-
-interface NotificationHandler
-{
-    /**
-     * Run this handler.
-     * Provides the activity, related activity detail/model
-     * along with the user that triggered the activity.
-     */
-    public function handle(Activity $activity, string|Loggable $detail, User $user): void;
-}

app/Activity/Notifications/Handlers/PageCreationNotificationHandler.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Handlers;
-
-use BookStack\Activity\Models\Activity;
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Notifications\Messages\PageCreationNotification;
-use BookStack\Activity\Tools\EntityWatchers;
-use BookStack\Activity\WatchLevels;
-use BookStack\Entities\Models\Page;
-use BookStack\Users\Models\User;
-
-class PageCreationNotificationHandler extends BaseNotificationHandler
-{
-    public function handle(Activity $activity, Loggable|string $detail, User $user): void
-    {
-        if (!($detail instanceof Page)) {
-            throw new \InvalidArgumentException("Detail for page create notifications must be a page");
-        }
-
-        $watchers = new EntityWatchers($detail, WatchLevels::NEW);
-        $this->sendNotificationToUserIds(PageCreationNotification::class, $watchers->getWatcherUserIds(), $user, $detail, $detail);
-    }
-}

app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Handlers;
-
-use BookStack\Activity\ActivityType;
-use BookStack\Activity\Models\Activity;
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Notifications\Messages\PageUpdateNotification;
-use BookStack\Activity\Tools\EntityWatchers;
-use BookStack\Activity\WatchLevels;
-use BookStack\Entities\Models\Page;
-use BookStack\Settings\UserNotificationPreferences;
-use BookStack\Users\Models\User;
-
-class PageUpdateNotificationHandler extends BaseNotificationHandler
-{
-    public function handle(Activity $activity, Loggable|string $detail, User $user): void
-    {
-        if (!($detail instanceof Page)) {
-            throw new \InvalidArgumentException("Detail for page update notifications must be a page");
-        }
-
-        // Get last update from activity
-        $lastUpdate = $detail->activity()
-            ->where('type', '=', ActivityType::PAGE_UPDATE)
-            ->where('id', '!=', $activity->id)
-            ->latest('created_at')
-            ->first();
-
-        // Return if the same user has already updated the page in the last 15 mins
-        if ($lastUpdate && $lastUpdate->user_id === $user->id) {
-            if ($lastUpdate->created_at->gt(now()->subMinutes(15))) {
-                return;
-            }
-        }
-
-        // Get active watchers
-        $watchers = new EntityWatchers($detail, WatchLevels::UPDATES);
-        $watcherIds = $watchers->getWatcherUserIds();
-
-        // Add page owner if preferences allow
-        if (!$watchers->isUserIgnoring($detail->owned_by) && $detail->ownedBy) {
-            $userNotificationPrefs = new UserNotificationPreferences($detail->ownedBy);
-            if ($userNotificationPrefs->notifyOnOwnPageChanges()) {
-                $watcherIds[] = $detail->owned_by;
-            }
-        }
-
-        $this->sendNotificationToUserIds(PageUpdateNotification::class, $watcherIds, $user, $detail, $detail);
-    }
-}

app/Activity/Notifications/MessageParts/EntityLinkMessageLine.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\MessageParts;
-
-use BookStack\Entities\Models\Entity;
-use Illuminate\Contracts\Support\Htmlable;
-use Stringable;
-
-/**
- * A link to a specific entity in the system, with the text showing its name.
- */
-class EntityLinkMessageLine implements Htmlable, Stringable
-{
-    public function __construct(
-        protected Entity $entity,
-        protected int $nameLength = 120,
-    ) {
-    }
-
-    public function toHtml(): string
-    {
-        return '<a href="' . e($this->entity->getUrl()) . '">' . e($this->entity->getShortName($this->nameLength)) . '</a>';
-    }
-
-    public function __toString(): string
-    {
-        return "{$this->entity->getShortName($this->nameLength)} ({$this->entity->getUrl()})";
-    }
-}

app/Activity/Notifications/MessageParts/EntityPathMessageLine.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\MessageParts;
-
-use BookStack\Entities\Models\Entity;
-use Illuminate\Contracts\Support\Htmlable;
-use Stringable;
-
-/**
- * A link to a specific entity in the system, with the text showing its name.
- */
-class EntityPathMessageLine implements Htmlable, Stringable
-{
-    /**
-     * @var EntityLinkMessageLine[]
-     */
-    protected array $entityLinks;
-
-    public function __construct(
-        protected array $entities
-    ) {
-        $this->entityLinks = array_map(fn (Entity $entity) => new EntityLinkMessageLine($entity, 24), $this->entities);
-    }
-
-    public function toHtml(): string
-    {
-        $entityHtmls = array_map(fn (EntityLinkMessageLine $line) => $line->toHtml(), $this->entityLinks);
-        return implode(' &gt; ', $entityHtmls);
-    }
-
-    public function __toString(): string
-    {
-        return implode(' > ', $this->entityLinks);
-    }
-}

app/Activity/Notifications/MessageParts/LinkedMailMessageLine.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\MessageParts;
-
-use Illuminate\Contracts\Support\Htmlable;
-use Stringable;
-
-/**
- * A line of text with linked text included, intended for use
- * in MailMessages. The line should have a ':link' placeholder for
- * where the link should be inserted within the line.
- */
-class LinkedMailMessageLine implements Htmlable, Stringable
-{
-    public function __construct(
-        protected string $url,
-        protected string $line,
-        protected string $linkText,
-    ) {
-    }
-
-    public function toHtml(): string
-    {
-        $link = '<a href="' . e($this->url) . '">' . e($this->linkText) . '</a>';
-        return str_replace(':link', $link, e($this->line));
-    }
-
-    public function __toString(): string
-    {
-        $link = "{$this->linkText} ({$this->url})";
-        return str_replace(':link', $link, $this->line);
-    }
-}

app/Activity/Notifications/MessageParts/ListMessageLine.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\MessageParts;
-
-use Illuminate\Contracts\Support\Htmlable;
-use Stringable;
-
-/**
- * A bullet point list of content, where the keys of the given list array
- * are bolded header elements, and the values follow.
- */
-class ListMessageLine implements Htmlable, Stringable
-{
-    public function __construct(
-        protected array $list
-    ) {
-    }
-
-    public function toHtml(): string
-    {
-        $list = [];
-        foreach ($this->list as $header => $content) {
-            $list[] = '<strong>' . e($header) . '</strong> ' . e($content);
-        }
-        return implode("<br>\n", $list);
-    }
-
-    public function __toString(): string
-    {
-        $list = [];
-        foreach ($this->list as $header => $content) {
-            $list[] = $header . ' ' . $content;
-        }
-        return implode("\n", $list);
-    }
-}

app/Activity/Notifications/Messages/BaseActivityNotification.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Messages;
-
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Notifications\MessageParts\EntityPathMessageLine;
-use BookStack\Activity\Notifications\MessageParts\LinkedMailMessageLine;
-use BookStack\App\MailNotification;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use BookStack\Permissions\PermissionApplicator;
-use BookStack\Translation\LocaleDefinition;
-use BookStack\Users\Models\User;
-use Illuminate\Bus\Queueable;
-
-abstract class BaseActivityNotification extends MailNotification
-{
-    use Queueable;
-
-    public function __construct(
-        protected Loggable|string $detail,
-        protected User $user,
-    ) {
-    }
-
-    /**
-     * Get the array representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function toArray($notifiable)
-    {
-        return [
-            'activity_detail' => $this->detail,
-            'activity_creator' => $this->user,
-        ];
-    }
-
-    /**
-     * Build the common reason footer line used in mail messages.
-     */
-    protected function buildReasonFooterLine(LocaleDefinition $locale): LinkedMailMessageLine
-    {
-        return new LinkedMailMessageLine(
-            url('/my-account/notifications'),
-            $locale->trans('notifications.footer_reason'),
-            $locale->trans('notifications.footer_reason_link'),
-        );
-    }
-
-    /**
-     * Build a line which provides the book > chapter path to a page.
-     * Takes into account visibility of these parent items.
-     * Returns null if no path items can be used.
-     */
-    protected function buildPagePathLine(Page $page, User $notifiable): ?EntityPathMessageLine
-    {
-        $permissions = new PermissionApplicator($notifiable);
-
-        $path = array_filter([$page->book, $page->chapter], function (?Entity $entity) use ($permissions) {
-            return !is_null($entity) && $permissions->checkOwnableUserAccess($entity, 'view');
-        });
-
-        return empty($path) ? null : new EntityPathMessageLine($path);
-    }
-}

app/Activity/Notifications/Messages/CommentCreationNotification.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Messages;
-
-use BookStack\Activity\Models\Comment;
-use BookStack\Activity\Notifications\MessageParts\EntityLinkMessageLine;
-use BookStack\Activity\Notifications\MessageParts\ListMessageLine;
-use BookStack\Entities\Models\Page;
-use BookStack\Users\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class CommentCreationNotification extends BaseActivityNotification
-{
-    public function toMail(User $notifiable): MailMessage
-    {
-        /** @var Comment $comment */
-        $comment = $this->detail;
-        /** @var Page $page */
-        $page = $comment->entity;
-
-        $locale = $notifiable->getLocale();
-
-        $listLines = array_filter([
-            $locale->trans('notifications.detail_page_name') => new EntityLinkMessageLine($page),
-            $locale->trans('notifications.detail_page_path') => $this->buildPagePathLine($page, $notifiable),
-            $locale->trans('notifications.detail_commenter') => $this->user->name,
-            $locale->trans('notifications.detail_comment') => strip_tags($comment->html),
-        ]);
-
-        return $this->newMailMessage($locale)
-            ->subject($locale->trans('notifications.new_comment_subject', ['pageName' => $page->getShortName()]))
-            ->line($locale->trans('notifications.new_comment_intro', ['appName' => setting('app-name')]))
-            ->line(new ListMessageLine($listLines))
-            ->action($locale->trans('notifications.action_view_comment'), $page->getUrl('#comment' . $comment->local_id))
-            ->line($this->buildReasonFooterLine($locale));
-    }
-}

app/Activity/Notifications/Messages/PageCreationNotification.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Messages;
-
-use BookStack\Activity\Notifications\MessageParts\EntityLinkMessageLine;
-use BookStack\Activity\Notifications\MessageParts\ListMessageLine;
-use BookStack\Entities\Models\Page;
-use BookStack\Users\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class PageCreationNotification extends BaseActivityNotification
-{
-    public function toMail(User $notifiable): MailMessage
-    {
-        /** @var Page $page */
-        $page = $this->detail;
-
-        $locale = $notifiable->getLocale();
-
-        $listLines = array_filter([
-            $locale->trans('notifications.detail_page_name') => new EntityLinkMessageLine($page),
-            $locale->trans('notifications.detail_page_path') => $this->buildPagePathLine($page, $notifiable),
-            $locale->trans('notifications.detail_created_by') => $this->user->name,
-        ]);
-
-        return $this->newMailMessage($locale)
-            ->subject($locale->trans('notifications.new_page_subject', ['pageName' => $page->getShortName()]))
-            ->line($locale->trans('notifications.new_page_intro', ['appName' => setting('app-name')]))
-            ->line(new ListMessageLine($listLines))
-            ->action($locale->trans('notifications.action_view_page'), $page->getUrl())
-            ->line($this->buildReasonFooterLine($locale));
-    }
-}

app/Activity/Notifications/Messages/PageUpdateNotification.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications\Messages;
-
-use BookStack\Activity\Notifications\MessageParts\EntityLinkMessageLine;
-use BookStack\Activity\Notifications\MessageParts\ListMessageLine;
-use BookStack\Entities\Models\Page;
-use BookStack\Users\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class PageUpdateNotification extends BaseActivityNotification
-{
-    public function toMail(User $notifiable): MailMessage
-    {
-        /** @var Page $page */
-        $page = $this->detail;
-
-        $locale = $notifiable->getLocale();
-
-        $listLines = array_filter([
-            $locale->trans('notifications.detail_page_name') => new EntityLinkMessageLine($page),
-            $locale->trans('notifications.detail_page_path') => $this->buildPagePathLine($page, $notifiable),
-            $locale->trans('notifications.detail_updated_by') => $this->user->name,
-        ]);
-
-        return $this->newMailMessage($locale)
-            ->subject($locale->trans('notifications.updated_page_subject', ['pageName' => $page->getShortName()]))
-            ->line($locale->trans('notifications.updated_page_intro', ['appName' => setting('app-name')]))
-            ->line(new ListMessageLine($listLines))
-            ->line($locale->trans('notifications.updated_page_debounce'))
-            ->action($locale->trans('notifications.action_view_page'), $page->getUrl())
-            ->line($this->buildReasonFooterLine($locale));
-    }
-}

app/Activity/Notifications/NotificationManager.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Notifications;
-
-use BookStack\Activity\ActivityType;
-use BookStack\Activity\Models\Activity;
-use BookStack\Activity\Models\Loggable;
-use BookStack\Activity\Notifications\Handlers\CommentCreationNotificationHandler;
-use BookStack\Activity\Notifications\Handlers\NotificationHandler;
-use BookStack\Activity\Notifications\Handlers\PageCreationNotificationHandler;
-use BookStack\Activity\Notifications\Handlers\PageUpdateNotificationHandler;
-use BookStack\Users\Models\User;
-
-class NotificationManager
-{
-    /**
-     * @var class-string<NotificationHandler>[]
-     */
-    protected array $handlers = [];
-
-    public function handle(Activity $activity, string|Loggable $detail, User $user): void
-    {
-        $activityType = $activity->type;
-        $handlersToRun = $this->handlers[$activityType] ?? [];
-        foreach ($handlersToRun as $handlerClass) {
-            /** @var NotificationHandler $handler */
-            $handler = new $handlerClass();
-            $handler->handle($activity, $detail, $user);
-        }
-    }
-
-    /**
-     * @param class-string<NotificationHandler> $handlerClass
-     */
-    public function registerHandler(string $activityType, string $handlerClass): void
-    {
-        if (!isset($this->handlers[$activityType])) {
-            $this->handlers[$activityType] = [];
-        }
-
-        if (!in_array($handlerClass, $this->handlers[$activityType])) {
-            $this->handlers[$activityType][] = $handlerClass;
-        }
-    }
-
-    public function loadDefaultHandlers(): void
-    {
-        $this->registerHandler(ActivityType::PAGE_CREATE, PageCreationNotificationHandler::class);
-        $this->registerHandler(ActivityType::PAGE_UPDATE, PageUpdateNotificationHandler::class);
-        $this->registerHandler(ActivityType::COMMENT_CREATE, CommentCreationNotificationHandler::class);
-    }
-}

app/Activity/Queries/WebhooksAllPaginatedAndSorted.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Queries;
-
-use BookStack\Activity\Models\Webhook;
-use BookStack\Util\SimpleListOptions;
-use Illuminate\Pagination\LengthAwarePaginator;
-
-/**
- * Get all the webhooks in the system in a paginated format.
- */
-class WebhooksAllPaginatedAndSorted
-{
-    public function run(int $count, SimpleListOptions $listOptions): LengthAwarePaginator
-    {
-        $query = Webhook::query()->select(['*'])
-            ->withCount(['trackedEvents'])
-            ->orderBy($listOptions->getSort(), $listOptions->getOrder());
-
-        if ($listOptions->getSearch()) {
-            $term = '%' . $listOptions->getSearch() . '%';
-            $query->where(function ($query) use ($term) {
-                $query->where('name', 'like', $term)
-                    ->orWhere('endpoint', 'like', $term);
-            });
-        }
-
-        return $query->paginate($count);
-    }
-}

app/Activity/Tools/CommentTree.php

@@ -1,113 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Tools;
-
-use BookStack\Activity\Models\Comment;
-use BookStack\Entities\Models\Page;
-
-class CommentTree
-{
-    /**
-     * The built nested tree structure array.
-     * @var array{comment: Comment, depth: int, children: array}[]
-     */
-    protected array $tree;
-    protected array $comments;
-
-    public function __construct(
-        protected Page $page
-    ) {
-        $this->comments = $this->loadComments();
-        $this->tree = $this->createTree($this->comments);
-    }
-
-    public function enabled(): bool
-    {
-        return !setting('app-disable-comments');
-    }
-
-    public function empty(): bool
-    {
-        return count($this->tree) === 0;
-    }
-
-    public function count(): int
-    {
-        return count($this->comments);
-    }
-
-    public function get(): array
-    {
-        return $this->tree;
-    }
-
-    public function canUpdateAny(): bool
-    {
-        foreach ($this->comments as $comment) {
-            if (userCan('comment-update', $comment)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param Comment[] $comments
-     */
-    protected function createTree(array $comments): array
-    {
-        $byId = [];
-        foreach ($comments as $comment) {
-            $byId[$comment->local_id] = $comment;
-        }
-
-        $childMap = [];
-        foreach ($comments as $comment) {
-            $parent = $comment->parent_id;
-            if (is_null($parent) || !isset($byId[$parent])) {
-                $parent = 0;
-            }
-
-            if (!isset($childMap[$parent])) {
-                $childMap[$parent] = [];
-            }
-            $childMap[$parent][] = $comment->local_id;
-        }
-
-        $tree = [];
-        foreach ($childMap[0] ?? [] as $childId) {
-            $tree[] = $this->createTreeForId($childId, 0, $byId, $childMap);
-        }
-
-        return $tree;
-    }
-
-    protected function createTreeForId(int $id, int $depth, array &$byId, array &$childMap): array
-    {
-        $childIds = $childMap[$id] ?? [];
-        $children = [];
-
-        foreach ($childIds as $childId) {
-            $children[] = $this->createTreeForId($childId, $depth + 1, $byId, $childMap);
-        }
-
-        return [
-            'comment' => $byId[$id],
-            'depth' => $depth,
-            'children' => $children,
-        ];
-    }
-
-    protected function loadComments(): array
-    {
-        if (!$this->enabled()) {
-            return [];
-        }
-
-        return $this->page->comments()
-            ->with('createdBy')
-            ->get()
-            ->all();
-    }
-}

app/Activity/Tools/EntityWatchers.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Tools;
-
-use BookStack\Activity\Models\Watch;
-use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use Illuminate\Database\Eloquent\Builder;
-
-class EntityWatchers
-{
-    /**
-     * @var int[]
-     */
-    protected array $watchers = [];
-
-    /**
-     * @var int[]
-     */
-    protected array $ignorers = [];
-
-    public function __construct(
-        protected Entity $entity,
-        protected int $watchLevel,
-    ) {
-        $this->build();
-    }
-
-    public function getWatcherUserIds(): array
-    {
-        return $this->watchers;
-    }
-
-    public function isUserIgnoring(int $userId): bool
-    {
-        return in_array($userId, $this->ignorers);
-    }
-
-    protected function build(): void
-    {
-        $watches = $this->getRelevantWatches();
-
-        // Sort before de-duping, so that the order looped below follows book -> chapter -> page ordering
-        usort($watches, function (Watch $watchA, Watch $watchB) {
-            $entityTypeDiff = $watchA->watchable_type <=> $watchB->watchable_type;
-            return $entityTypeDiff === 0 ? ($watchA->user_id <=> $watchB->user_id) : $entityTypeDiff;
-        });
-
-        // De-dupe by user id to get their most relevant level
-        $levelByUserId = [];
-        foreach ($watches as $watch) {
-            $levelByUserId[$watch->user_id] = $watch->level;
-        }
-
-        // Populate the class arrays
-        $this->watchers = array_keys(array_filter($levelByUserId, fn(int $level) => $level >= $this->watchLevel));
-        $this->ignorers = array_keys(array_filter($levelByUserId, fn(int $level) => $level === 0));
-    }
-
-    /**
-     * @return Watch[]
-     */
-    protected function getRelevantWatches(): array
-    {
-        /** @var Entity[] $entitiesInvolved */
-        $entitiesInvolved = array_filter([
-            $this->entity,
-            $this->entity instanceof BookChild ? $this->entity->book : null,
-            $this->entity instanceof Page ? $this->entity->chapter : null,
-        ]);
-
-        $query = Watch::query()->where(function (Builder $query) use ($entitiesInvolved) {
-            foreach ($entitiesInvolved as $entity) {
-                $query->orWhere(function (Builder $query) use ($entity) {
-                    $query->where('watchable_type', '=', $entity->getMorphClass())
-                        ->where('watchable_id', '=', $entity->id);
-                });
-            }
-        });
-
-        return $query->get([
-            'level', 'watchable_id', 'watchable_type', 'user_id'
-        ])->all();
-    }
-}

app/Activity/Tools/IpFormatter.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Tools;
-
-class IpFormatter
-{
-    protected string $ip;
-    protected int $precision;
-
-    public function __construct(string $ip, int $precision)
-    {
-        $this->ip = trim($ip);
-        $this->precision = max(0, min($precision, 4));
-    }
-
-    public function format(): string
-    {
-        if (empty($this->ip) || $this->precision === 4) {
-            return $this->ip;
-        }
-
-        return $this->isIpv6() ? $this->maskIpv6() : $this->maskIpv4();
-    }
-
-    protected function maskIpv4(): string
-    {
-        $exploded = $this->explodeAndExpandIp('.', 4);
-        $maskGroupCount = min(4 - $this->precision, count($exploded));
-
-        for ($i = 0; $i < $maskGroupCount; $i++) {
-            $exploded[3 - $i] = 'x';
-        }
-
-        return implode('.', $exploded);
-    }
-
-    protected function maskIpv6(): string
-    {
-        $exploded = $this->explodeAndExpandIp(':', 8);
-        $maskGroupCount = min(8 - ($this->precision * 2), count($exploded));
-
-        for ($i = 0; $i < $maskGroupCount; $i++) {
-            $exploded[7 - $i] = 'x';
-        }
-
-        return implode(':', $exploded);
-    }
-
-    protected function isIpv6(): bool
-    {
-        return strpos($this->ip, ':') !== false;
-    }
-
-    protected function explodeAndExpandIp(string $separator, int $targetLength): array
-    {
-        $exploded = explode($separator, $this->ip);
-
-        while (count($exploded) < $targetLength) {
-            $emptyIndex = array_search('', $exploded) ?: count($exploded) - 1;
-            array_splice($exploded, $emptyIndex, 0, '0');
-        }
-
-        $emptyIndex = array_search('', $exploded);
-        if ($emptyIndex !== false) {
-            $exploded[$emptyIndex] = '0';
-        }
-
-        return $exploded;
-    }
-
-    public static function fromCurrentRequest(): self
-    {
-        $ip = request()->ip() ?? '';
-
-        if (config('app.env') === 'demo') {
-            $ip = '127.0.0.1';
-        }
-
-        return new self($ip, config('app.ip_address_precision'));
-    }
-}

app/Activity/Tools/TagClassGenerator.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Tools;
-
-use BookStack\Activity\Models\Tag;
-
-class TagClassGenerator
-{
-    protected array $tags;
-
-    /**
-     * @param Tag[] $tags
-     */
-    public function __construct(array $tags)
-    {
-        $this->tags = $tags;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function generate(): array
-    {
-        $classes = [];
-
-        foreach ($this->tags as $tag) {
-            $name = $this->normalizeTagClassString($tag->name);
-            $value = $this->normalizeTagClassString($tag->value);
-            $classes[] = 'tag-name-' . $name;
-            if ($value) {
-                $classes[] = 'tag-value-' . $value;
-                $classes[] = 'tag-pair-' . $name . '-' . $value;
-            }
-        }
-
-        return array_unique($classes);
-    }
-
-    public function generateAsString(): string
-    {
-        return implode(' ', $this->generate());
-    }
-
-    protected function normalizeTagClassString(string $value): string
-    {
-        $value = str_replace(' ', '', strtolower($value));
-        $value = str_replace('-', '', strtolower($value));
-
-        return $value;
-    }
-}

app/Activity/Tools/UserEntityWatchOptions.php

@@ -1,131 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Tools;
-
-use BookStack\Activity\Models\Watch;
-use BookStack\Activity\WatchLevels;
-use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use BookStack\Users\Models\User;
-use Illuminate\Database\Eloquent\Builder;
-
-class UserEntityWatchOptions
-{
-    protected ?array $watchMap = null;
-
-    public function __construct(
-        protected User $user,
-        protected Entity $entity,
-    ) {
-    }
-
-    public function canWatch(): bool
-    {
-        return $this->user->can('receive-notifications') && !$this->user->isGuest();
-    }
-
-    public function getWatchLevel(): string
-    {
-        return WatchLevels::levelValueToName($this->getWatchLevelValue());
-    }
-
-    public function isWatching(): bool
-    {
-        return $this->getWatchLevelValue() !== WatchLevels::DEFAULT;
-    }
-
-    public function getWatchedParent(): ?WatchedParentDetails
-    {
-        $watchMap = $this->getWatchMap();
-        unset($watchMap[$this->entity->getMorphClass()]);
-
-        if (isset($watchMap['chapter'])) {
-            return new WatchedParentDetails('chapter', $watchMap['chapter']);
-        }
-
-        if (isset($watchMap['book'])) {
-            return new WatchedParentDetails('book', $watchMap['book']);
-        }
-
-        return null;
-    }
-
-    public function updateLevelByName(string $level): void
-    {
-        $levelValue = WatchLevels::levelNameToValue($level);
-        $this->updateLevelByValue($levelValue);
-    }
-
-    public function updateLevelByValue(int $level): void
-    {
-        if ($level < 0) {
-            $this->remove();
-            return;
-        }
-
-        $this->updateLevel($level);
-    }
-
-    public function getWatchMap(): array
-    {
-        if (!is_null($this->watchMap)) {
-            return $this->watchMap;
-        }
-
-        $entities = [$this->entity];
-        if ($this->entity instanceof BookChild) {
-            $entities[] = $this->entity->book;
-        }
-        if ($this->entity instanceof Page && $this->entity->chapter) {
-            $entities[] = $this->entity->chapter;
-        }
-
-        $query = Watch::query()
-            ->where('user_id', '=', $this->user->id)
-            ->where(function (Builder $subQuery) use ($entities) {
-                foreach ($entities as $entity) {
-                    $subQuery->orWhere(function (Builder $whereQuery) use ($entity) {
-                        $whereQuery->where('watchable_type', '=', $entity->getMorphClass())
-                        ->where('watchable_id', '=', $entity->id);
-                    });
-                }
-            });
-
-        $this->watchMap = $query->get(['watchable_type', 'level'])
-            ->pluck('level', 'watchable_type')
-            ->toArray();
-
-        return $this->watchMap;
-    }
-
-    protected function getWatchLevelValue()
-    {
-        return $this->getWatchMap()[$this->entity->getMorphClass()] ?? WatchLevels::DEFAULT;
-    }
-
-    protected function updateLevel(int $levelValue): void
-    {
-        Watch::query()->updateOrCreate([
-            'watchable_id' => $this->entity->id,
-            'watchable_type' => $this->entity->getMorphClass(),
-            'user_id' => $this->user->id,
-        ], [
-            'level' => $levelValue,
-        ]);
-        $this->watchMap = null;
-    }
-
-    protected function remove(): void
-    {
-        $this->entityQuery()->delete();
-        $this->watchMap = null;
-    }
-
-    protected function entityQuery(): Builder
-    {
-        return Watch::query()->where('watchable_id', '=', $this->entity->id)
-            ->where('watchable_type', '=', $this->entity->getMorphClass())
-            ->where('user_id', '=', $this->user->id);
-    }
-}

app/Activity/Tools/WatchedParentDetails.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace BookStack\Activity\Tools;
-
-use BookStack\Activity\WatchLevels;
-
-class WatchedParentDetails
-{
-    public function __construct(
-        public string $type,
-        public int $level,
-    ) {
-    }
-
-    public function ignoring(): bool
-    {
-        return $this->level === WatchLevels::IGNORE;
-    }
-}

app/Activity/WatchLevels.php

@@ -1,91 +0,0 @@
-<?php
-
-namespace BookStack\Activity;
-
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-
-class WatchLevels
-{
-    /**
-     * Default level, No specific option set
-     * Typically not a stored status
-     */
-    const DEFAULT = -1;
-
-    /**
-     * Ignore all notifications.
-     */
-    const IGNORE = 0;
-
-    /**
-     * Watch for new content.
-     */
-    const NEW = 1;
-
-    /**
-     * Watch for updates and new content
-     */
-    const UPDATES = 2;
-
-    /**
-     * Watch for comments, updates and new content.
-     */
-    const COMMENTS = 3;
-
-    /**
-     * Get all the possible values as an option_name => value array.
-     * @returns array<string, int>
-     */
-    public static function all(): array
-    {
-        $options = [];
-        foreach ((new \ReflectionClass(static::class))->getConstants() as $name => $value) {
-            $options[strtolower($name)] = $value;
-        }
-
-        return $options;
-    }
-
-    /**
-     * Get the watch options suited for the given entity.
-     * @returns array<string, int>
-     */
-    public static function allSuitedFor(Entity $entity): array
-    {
-        $options = static::all();
-
-        if ($entity instanceof Page) {
-            unset($options['new']);
-        } elseif ($entity instanceof Bookshelf) {
-            return [];
-        }
-
-        return $options;
-    }
-
-    /**
-     * Convert the given name to a level value.
-     * Defaults to default value if the level does not exist.
-     */
-    public static function levelNameToValue(string $level): int
-    {
-        return static::all()[$level] ?? static::DEFAULT;
-    }
-
-    /**
-     * Convert the given int level value to a level name.
-     * Defaults to 'default' level name if not existing.
-     */
-    public static function levelValueToName(int $level): string
-    {
-        foreach (static::all() as $name => $value) {
-            if ($level === $value) {
-                return $name;
-            }
-        }
-
-        return 'default';
-    }
-}

app/Api/ApiDocsGenerator.php

@@ -2,7 +2,7 @@
 
 namespace BookStack\Api;
 
-use BookStack\Http\ApiController;
+use BookStack\Http\Controllers\Api\ApiController;
 use Exception;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Collection;
@@ -16,8 +16,8 @@ use ReflectionMethod;
 
 class ApiDocsGenerator
 {
-    protected array $reflectionClasses = [];
-    protected array $controllerClasses = [];
+    protected $reflectionClasses = [];
+    protected $controllerClasses = [];
 
     /**
      * Load the docs form the cache if existing
@@ -27,16 +27,13 @@ class ApiDocsGenerator
     {
         $appVersion = trim(file_get_contents(base_path('version')));
         $cacheKey = 'api-docs::' . $appVersion;
-        $isProduction = config('app.env') === 'production';
-        $cacheVal = $isProduction ? Cache::get($cacheKey) : null;
-
-        if (!is_null($cacheVal)) {
-            return $cacheVal;
+        if (Cache::has($cacheKey) && config('app.env') === 'production') {
+            $docs = Cache::get($cacheKey);
+        } else {
+            $docs = (new ApiDocsGenerator())->generate();
+            Cache::put($cacheKey, $docs, 60 * 24);
         }
 
-        $docs = (new ApiDocsGenerator())->generate();
-        Cache::put($cacheKey, $docs, 60 * 24);
-
         return $docs;
     }
 
@@ -142,10 +139,9 @@ class ApiDocsGenerator
     protected function parseDescriptionFromMethodComment(string $comment): string
     {
         $matches = [];
-        preg_match_all('/^\s*?\*\s?($|((?![\/@\s]).*?))$/m', $comment, $matches);
+        preg_match_all('/^\s*?\*\s((?![@\s]).*?)$/m', $comment, $matches);
 
-        $text = implode(' ', $matches[1] ?? []);
-        return str_replace('  ', "\n", $text);
+        return implode(' ', $matches[1] ?? []);
     }
 
     /**

app/Api/ApiEntityListFormatter.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace BookStack\Api;
-
-use BookStack\Entities\Models\Entity;
-
-class ApiEntityListFormatter
-{
-    /**
-     * The list to be formatted.
-     * @var Entity[]
-     */
-    protected array $list = [];
-
-    /**
-     * The fields to show in the formatted data.
-     * Can be a plain string array item for a direct model field (If existing on model).
-     * If the key is a string, with a callable value, the return value of the callable
-     * will be used for the resultant value. A null return value will omit the property.
-     * @var array<string|int, string|callable>
-     */
-    protected array $fields = [
-        'id', 'name', 'slug', 'book_id', 'chapter_id', 'draft',
-        'template', 'priority', 'created_at', 'updated_at',
-    ];
-
-    public function __construct(array $list)
-    {
-        $this->list = $list;
-
-        // Default dynamic fields
-        $this->withField('url', fn(Entity $entity) => $entity->getUrl());
-    }
-
-    /**
-     * Add a field to be used in the formatter, with the property using the given
-     * name and value being the return type of the given callback.
-     */
-    public function withField(string $property, callable $callback): self
-    {
-        $this->fields[$property] = $callback;
-        return $this;
-    }
-
-    /**
-     * Show the 'type' property in the response reflecting the entity type.
-     * EG: page, chapter, bookshelf, book
-     * To be included in results with non-pre-determined types.
-     */
-    public function withType(): self
-    {
-        $this->withField('type', fn(Entity $entity) => $entity->getType());
-        return $this;
-    }
-
-    /**
-     * Include tags in the formatted data.
-     */
-    public function withTags(): self
-    {
-        $this->withField('tags', fn(Entity $entity) => $entity->tags);
-        return $this;
-    }
-
-    /**
-     * Format the data and return an array of formatted content.
-     * @return array[]
-     */
-    public function format(): array
-    {
-        $results = [];
-
-        foreach ($this->list as $item) {
-            $results[] = $this->formatSingle($item);
-        }
-
-        return $results;
-    }
-
-    /**
-     * Format a single entity item to a plain array.
-     */
-    protected function formatSingle(Entity $entity): array
-    {
-        $result = [];
-        $values = (clone $entity)->toArray();
-
-        foreach ($this->fields as $field => $callback) {
-            if (is_string($callback)) {
-                $field = $callback;
-                if (!isset($values[$field])) {
-                    continue;
-                }
-                $value = $values[$field];
-            } else {
-                $value = $callback($entity);
-                if (is_null($value)) {
-                    continue;
-                }
-            }
-
-            $result[$field] = $value;
-        }
-
-        return $result;
-    }
-}

app/Api/ApiToken.php

@@ -2,9 +2,8 @@
 
 namespace BookStack\Api;
 
-use BookStack\Activity\Models\Loggable;
-use BookStack\Users\Models\User;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use BookStack\Auth\User;
+use BookStack\Interfaces\Loggable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
@@ -21,8 +20,6 @@ use Illuminate\Support\Carbon;
  */
 class ApiToken extends Model implements Loggable
 {
-    use HasFactory;
-
     protected $fillable = ['name', 'expires_at'];
     protected $casts = [
         'expires_at' => 'date:Y-m-d',
@@ -52,12 +49,4 @@ class ApiToken extends Model implements Loggable
     {
         return "({$this->id}) {$this->name}; User: {$this->user->logDescriptor()}";
     }
-
-    /**
-     * Get the URL for managing this token.
-     */
-    public function getUrl(string $path = ''): string
-    {
-        return url("/api-tokens/{$this->user_id}/{$this->id}/" . trim($path, '/'));
-    }
 }

app/Api/ApiTokenGuard.php

@@ -2,7 +2,7 @@
 
 namespace BookStack\Api;
 
-use BookStack\Access\LoginService;
+use BookStack\Auth\Access\LoginService;
 use BookStack\Exceptions\ApiAuthException;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable;

app/Api/ListingResponseBuilder.php

@@ -2,31 +2,24 @@
 
 namespace BookStack\Api;
 
+use BookStack\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class ListingResponseBuilder
 {
-    protected Builder $query;
-    protected Request $request;
-
-    /**
-     * @var string[]
-     */
-    protected array $fields;
+    protected $query;
+    protected $request;
+    protected $fields;
 
     /**
      * @var array<callable>
      */
-    protected array $resultModifiers = [];
+    protected $resultModifiers = [];
 
-    /**
-     * @var array<string, string>
-     */
-    protected array $filterOperators = [
+    protected $filterOperators = [
         'eq'   => '=',
         'ne'   => '!=',
         'gt'   => '>',
@@ -70,9 +63,9 @@ class ListingResponseBuilder
     /**
      * Add a callback to modify each element of the results.
      *
-     * @param (callable(Model): void) $modifier
+     * @param (callable(Model)) $modifier
      */
-    public function modifyResults(callable $modifier): void
+    public function modifyResults($modifier): void
     {
         $this->resultModifiers[] = $modifier;
     }

app/App/MetaController.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace BookStack\App;
-
-use BookStack\Http\Controller;
-use BookStack\Uploads\FaviconHandler;
-
-class MetaController extends Controller
-{
-    /**
-     * Show the view for /robots.txt.
-     */
-    public function robots()
-    {
-        $sitePublic = setting('app-public', false);
-        $allowRobots = config('app.allow_robots');
-
-        if ($allowRobots === null) {
-            $allowRobots = $sitePublic;
-        }
-
-        return response()
-            ->view('misc.robots', ['allowRobots' => $allowRobots])
-            ->header('Content-Type', 'text/plain');
-    }
-
-    /**
-     * Show the route for 404 responses.
-     */
-    public function notFound()
-    {
-        return response()->view('errors.404', [], 404);
-    }
-
-    /**
-     * Serve the application favicon.
-     * Ensures a 'favicon.ico' file exists at the web root location (if writable) to be served
-     * directly by the webserver in the future.
-     */
-    public function favicon(FaviconHandler $favicons)
-    {
-        $exists = $favicons->restoreOriginalIfNotExists();
-        return response()->file($exists ? $favicons->getPath() : $favicons->getOriginalPath());
-    }
-
-    /**
-     * Serve a PWA application manifest.
-     */
-    public function pwaManifest(PwaManifestBuilder $manifestBuilder)
-    {
-        return response()->json($manifestBuilder->build());
-    }
-
-    /**
-     * Show license information for the application.
-     */
-    public function licenses()
-    {
-        $this->setPageTitle(trans('settings.licenses'));
-
-        return view('help.licenses', [
-            'license' => file_get_contents(base_path('LICENSE')),
-            'phpLibData' => file_get_contents(base_path('dev/licensing/php-library-licenses.txt')),
-            'jsLibData' => file_get_contents(base_path('dev/licensing/js-library-licenses.txt')),
-        ]);
-    }
-}

app/App/Providers/AppServiceProvider.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace BookStack\App\Providers;
-
-use BookStack\Access\SocialDriverManager;
-use BookStack\Activity\Tools\ActivityLogger;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
-use BookStack\Exceptions\BookStackExceptionHandlerPage;
-use BookStack\Http\HttpRequestService;
-use BookStack\Permissions\PermissionApplicator;
-use BookStack\Settings\SettingService;
-use BookStack\Util\CspService;
-use Illuminate\Contracts\Foundation\ExceptionRenderer;
-use Illuminate\Database\Eloquent\Relations\Relation;
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Support\Facades\URL;
-use Illuminate\Support\ServiceProvider;
-
-class AppServiceProvider extends ServiceProvider
-{
-    /**
-     * Custom container bindings to register.
-     * @var string[]
-     */
-    public array $bindings = [
-        ExceptionRenderer::class => BookStackExceptionHandlerPage::class,
-    ];
-
-    /**
-     * Custom singleton bindings to register.
-     * @var string[]
-     */
-    public array $singletons = [
-        'activity' => ActivityLogger::class,
-        SettingService::class => SettingService::class,
-        SocialDriverManager::class => SocialDriverManager::class,
-        CspService::class => CspService::class,
-        HttpRequestService::class => HttpRequestService::class,
-    ];
-
-    /**
-     * Register any application services.
-     */
-    public function register(): void
-    {
-        $this->app->singleton(PermissionApplicator::class, function ($app) {
-            return new PermissionApplicator(null);
-        });
-    }
-
-    /**
-     * Bootstrap any application services.
-     */
-    public function boot(): void
-    {
-        // Set root URL
-        $appUrl = config('app.url');
-        if ($appUrl) {
-            $isHttps = str_starts_with($appUrl, 'https://');
-            URL::forceRootUrl($appUrl);
-            URL::forceScheme($isHttps ? 'https' : 'http');
-        }
-
-        // Allow longer string lengths after upgrade to utf8mb4
-        Schema::defaultStringLength(191);
-
-        // Set morph-map for our relations to friendlier aliases
-        Relation::enforceMorphMap([
-            'bookshelf' => Bookshelf::class,
-            'book'      => Book::class,
-            'chapter'   => Chapter::class,
-            'page'      => Page::class,
-        ]);
-    }
-}

app/App/Providers/EventServiceProvider.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace BookStack\App\Providers;
-
-use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use SocialiteProviders\Azure\AzureExtendSocialite;
-use SocialiteProviders\Discord\DiscordExtendSocialite;
-use SocialiteProviders\GitLab\GitLabExtendSocialite;
-use SocialiteProviders\Manager\SocialiteWasCalled;
-use SocialiteProviders\Okta\OktaExtendSocialite;
-use SocialiteProviders\Twitch\TwitchExtendSocialite;
-
-class EventServiceProvider extends ServiceProvider
-{
-    /**
-     * The event listener mappings for the application.
-     *
-     * @var array<class-string, array<int, class-string>>
-     */
-    protected $listen = [
-        SocialiteWasCalled::class => [
-            AzureExtendSocialite::class . '@handle',
-            OktaExtendSocialite::class . '@handle',
-            GitLabExtendSocialite::class . '@handle',
-            TwitchExtendSocialite::class . '@handle',
-            DiscordExtendSocialite::class . '@handle',
-        ],
-    ];
-
-    /**
-     * Register any events for your application.
-     */
-    public function boot(): void
-    {
-        //
-    }
-
-    /**
-     * Determine if events and listeners should be automatically discovered.
-     */
-    public function shouldDiscoverEvents(): bool
-    {
-        return false;
-    }
-}

app/App/Providers/TranslationServiceProvider.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace BookStack\App\Providers;
-
-use BookStack\Translation\FileLoader;
-use BookStack\Translation\MessageSelector;
-use Illuminate\Translation\TranslationServiceProvider as BaseProvider;
-use Illuminate\Translation\Translator;
-
-class TranslationServiceProvider extends BaseProvider
-{
-    /**
-     * Register the service provider.
-     */
-    public function register(): void
-    {
-        $this->registerLoader();
-
-        // This is a tweak upon Laravel's based translation service registration to allow
-        // usage of a custom MessageSelector class
-        $this->app->singleton('translator', function ($app) {
-            $loader = $app['translation.loader'];
-
-            // When registering the translator component, we'll need to set the default
-            // locale as well as the fallback locale. So, we'll grab the application
-            // configuration so we can easily get both of these values from there.
-            $locale = $app['config']['app.locale'];
-
-            $trans = new Translator($loader, $locale);
-            $trans->setFallback($app['config']['app.fallback_locale']);
-            $trans->setSelector(new MessageSelector());
-
-            return $trans;
-        });
-    }
-
-
-
-    /**
-     * Register the translation line loader.
-     * Overrides the default register action from Laravel so a custom loader can be used.
-     */
-    protected function registerLoader(): void
-    {
-        $this->app->singleton('translation.loader', function ($app) {
-            return new FileLoader($app['files'], $app['path.lang']);
-        });
-    }
-}

app/App/Providers/ViewTweaksServiceProvider.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace BookStack\App\Providers;
-
-use BookStack\Entities\BreadcrumbsViewComposer;
-use Illuminate\Pagination\Paginator;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\View;
-use Illuminate\Support\ServiceProvider;
-
-class ViewTweaksServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap services.
-     */
-    public function boot(): void
-    {
-        // Set paginator to use bootstrap-style pagination
-        Paginator::useBootstrap();
-
-        // View Composers
-        View::composer('entities.breadcrumbs', BreadcrumbsViewComposer::class);
-
-        // Custom blade view directives
-        Blade::directive('icon', function ($expression) {
-            return "<?php echo (new \BookStack\Util\SvgIcon($expression))->toHtml(); ?>";
-        });
-    }
-}

app/App/PwaManifestBuilder.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace BookStack\App;
-
-class PwaManifestBuilder
-{
-    public function build(): array
-    {
-        // Note, while we attempt to use the user's preference here, the request to the manifest
-        // does not start a session, so we won't have current user context.
-        // This was attempted but removed since manifest calls could affect user session
-        // history tracking and back redirection.
-        // Context: https://github.com/BookStackApp/BookStack/issues/4649
-        $darkMode = (bool) setting()->getForCurrentUser('dark-mode-enabled');
-        $appName = setting('app-name');
-
-        return [
-            "name" => $appName,
-            "short_name" => $appName,
-            "start_url" => "./",
-            "scope" => "/",
-            "display" => "standalone",
-            "background_color" => $darkMode ? '#111111' : '#F2F2F2',
-            "description" => $appName,
-            "theme_color" => ($darkMode ? setting('app-color-dark') : setting('app-color')),
-            "launch_handler" => [
-                "client_mode" => "focus-existing"
-            ],
-            "orientation" => "any",
-            "icons" => [
-                [
-                    "src" => setting('app-icon-32') ?: url('/icon-32.png'),
-                    "sizes" => "32x32",
-                    "type" => "image/png"
-                ],
-                [
-                    "src" => setting('app-icon-64') ?: url('/icon-64.png'),
-                    "sizes" => "64x64",
-                    "type" => "image/png"
-                ],
-                [
-                    "src" => setting('app-icon-128') ?: url('/icon-128.png'),
-                    "sizes" => "128x128",
-                    "type" => "image/png"
-                ],
-                [
-                    "src" => setting('app-icon-180') ?: url('/icon-180.png'),
-                    "sizes" => "180x180",
-                    "type" => "image/png"
-                ],
-                [
-                    "src" => setting('app-icon') ?: url('/icon.png'),
-                    "sizes" => "256x256",
-                    "type" => "image/png"
-                ],
-                [
-                    "src" => url('favicon.ico'),
-                    "sizes" => "48x48",
-                    "type" => "image/vnd.microsoft.icon"
-                ],
-            ],
-        ];
-    }
-}

app/Application.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\App;
+namespace BookStack;
 
 class Application extends \Illuminate\Foundation\Application
 {

app/Auth/Access/EmailConfirmationService.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\Access;
+namespace BookStack\Auth\Access;
 
-use BookStack\Access\Notifications\ConfirmEmailNotification;
+use BookStack\Auth\User;
 use BookStack\Exceptions\ConfirmationEmailException;
-use BookStack\Users\Models\User;
+use BookStack\Notifications\ConfirmEmail;
 
 class EmailConfirmationService extends UserTokenService
 {
-    protected string $tokenTable = 'email_confirmations';
-    protected int $expiryTime = 24;
+    protected $tokenTable = 'email_confirmations';
+    protected $expiryTime = 24;
 
     /**
      * Create new confirmation for a user,
@@ -17,7 +17,7 @@ class EmailConfirmationService extends UserTokenService
      *
      * @throws ConfirmationEmailException
      */
-    public function sendConfirmation(User $user): void
+    public function sendConfirmation(User $user)
     {
         if ($user->email_confirmed) {
             throw new ConfirmationEmailException(trans('errors.email_already_confirmed'), '/login');
@@ -26,7 +26,7 @@ class EmailConfirmationService extends UserTokenService
         $this->deleteByUser($user);
         $token = $this->createTokenForUser($user);
 
-        $user->notify(new ConfirmEmailNotification($token));
+        $user->notify(new ConfirmEmail($token));
     }
 
     /**

app/Auth/Access/ExternalBaseUserProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Access;
+namespace BookStack\Auth\Access;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;

app/Auth/Access/GroupSyncService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Access;
+namespace BookStack\Auth\Access;
 
-use BookStack\Users\Models\Role;
-use BookStack\Users\Models\User;
+use BookStack\Auth\Role;
+use BookStack\Auth\User;
 use Illuminate\Support\Collection;
 
 class GroupSyncService
@@ -28,8 +28,10 @@ class GroupSyncService
      */
     protected function externalIdMatchesGroupNames(string $externalId, array $groupNames): bool
     {
-        foreach ($this->parseRoleExternalAuthId($externalId) as $externalAuthId) {
-            if (in_array($externalAuthId, $groupNames)) {
+        $externalAuthIds = explode(',', strtolower($externalId));
+
+        foreach ($externalAuthIds as $externalAuthId) {
+            if (in_array(trim($externalAuthId), $groupNames)) {
                 return true;
             }
         }
@@ -37,18 +39,6 @@ class GroupSyncService
         return false;
     }
 
-    protected function parseRoleExternalAuthId(string $externalId): array
-    {
-        $inputIds = preg_split('/(?<!\\\),/', strtolower($externalId));
-        $cleanIds = [];
-
-        foreach ($inputIds as $inputId) {
-            $cleanIds[] = str_replace('\,', ',', trim($inputId));
-        }
-
-        return $cleanIds;
-    }
-
     /**
      * Match an array of group names to BookStack system roles.
      * Formats group names to be lower-case and hyphenated.

app/Auth/Access/Guards/AsyncExternalBaseSessionGuard.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Access\Guards;
+namespace BookStack\Auth\Access\Guards;
 
 /**
  * Saml2 Session Guard.

app/Auth/Access/Guards/ExternalBaseSessionGuard.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Access\Guards;
+namespace BookStack\Auth\Access\Guards;
 
-use BookStack\Access\RegistrationService;
+use BookStack\Auth\Access\RegistrationService;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\StatefulGuard;

app/Auth/Access/Guards/LdapSessionGuard.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\Access\Guards;
+namespace BookStack\Auth\Access\Guards;
 
-use BookStack\Access\LdapService;
-use BookStack\Access\RegistrationService;
+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\UserRegistrationException;
-use BookStack\Users\Models\User;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Support\Str;

app/Auth/Access/Ldap.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace BookStack\Auth\Access;
+
+/**
+ * Class Ldap
+ * An object-orientated thin abstraction wrapper for common PHP LDAP functions.
+ * Allows the standard LDAP functions to be mocked for testing.
+ */
+class Ldap
+{
+    /**
+     * Connect to an LDAP server.
+     *
+     * @return resource
+     */
+    public function connect(string $hostName, int $port)
+    {
+        return ldap_connect($hostName, $port);
+    }
+
+    /**
+     * Set the value of a LDAP option for the given connection.
+     *
+     * @param resource $ldapConnection
+     * @param mixed    $value
+     */
+    public function setOption($ldapConnection, int $option, $value): bool
+    {
+        return ldap_set_option($ldapConnection, $option, $value);
+    }
+
+    /**
+     * Start TLS on the given LDAP connection.
+     */
+    public function startTls($ldapConnection): bool
+    {
+        return ldap_start_tls($ldapConnection);
+    }
+
+    /**
+     * Set the version number for the given ldap connection.
+     *
+     * @param resource $ldapConnection
+     */
+    public function setVersion($ldapConnection, int $version): bool
+    {
+        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)
+    {
+        return ldap_search($ldapConnection, $baseDn, $filter, $attributes);
+    }
+
+    /**
+     * Get entries from an ldap search result.
+     *
+     * @param resource $ldapConnection
+     * @param resource $ldapSearchResult
+     *
+     * @return array
+     */
+    public function getEntries($ldapConnection, $ldapSearchResult)
+    {
+        return ldap_get_entries($ldapConnection, $ldapSearchResult);
+    }
+
+    /**
+     * 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)
+    {
+        return ldap_bind($ldapConnection, $bindRdn, $bindPassword);
+    }
+
+    /**
+     * Explode a LDAP dn string into an array of components.
+     *
+     * @param string $dn
+     * @param int    $withAttrib
+     *
+     * @return array
+     */
+    public function explodeDn(string $dn, int $withAttrib)
+    {
+        return ldap_explode_dn($dn, $withAttrib);
+    }
+
+    /**
+     * Escape a string for use in an LDAP filter.
+     *
+     * @param string $value
+     * @param string $ignore
+     * @param int    $flags
+     *
+     * @return string
+     */
+    public function escape(string $value, string $ignore = '', int $flags = 0)
+    {
+        return ldap_escape($value, $ignore, $flags);
+    }
+}

app/Auth/Access/LdapService.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\Access;
+namespace BookStack\Auth\Access;
 
+use BookStack\Auth\User;
 use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\LdapException;
 use BookStack\Uploads\UserAvatars;
-use BookStack\Users\Models\User;
 use ErrorException;
 use Illuminate\Support\Facades\Log;
 
@@ -15,19 +15,26 @@ use Illuminate\Support\Facades\Log;
  */
 class LdapService
 {
+    protected Ldap $ldap;
+    protected GroupSyncService $groupSyncService;
+    protected UserAvatars $userAvatars;
+
     /**
-     * @var resource|\LDAP\Connection
+     * @var resource
      */
     protected $ldapConnection;
 
     protected array $config;
     protected bool $enabled;
 
-    public function __construct(
-        protected Ldap $ldap,
-        protected UserAvatars $userAvatars,
-        protected GroupSyncService $groupSyncService
-    ) {
+    /**
+     * LdapService constructor.
+     */
+    public function __construct(Ldap $ldap, UserAvatars $userAvatars, GroupSyncService $groupSyncService)
+    {
+        $this->ldap = $ldap;
+        $this->userAvatars = $userAvatars;
+        $this->groupSyncService = $groupSyncService;
         $this->config = config('services.ldap');
         $this->enabled = config('auth.method') === 'ldap';
     }
@@ -52,7 +59,7 @@ class LdapService
 
         // Clean attributes
         foreach ($attributes as $index => $attribute) {
-            if (str_starts_with($attribute, 'BIN;')) {
+            if (strpos($attribute, 'BIN;') === 0) {
                 $attributes[$index] = substr($attribute, strlen('BIN;'));
             }
         }
@@ -75,7 +82,7 @@ class LdapService
      * Get the details of a user from LDAP using the given username.
      * User found via configurable user filter.
      *
-     * @throws LdapException|JsonDebugException
+     * @throws LdapException
      */
     public function getUserDetails(string $userName): ?array
     {
@@ -98,7 +105,7 @@ class LdapService
             'name'  => $this->getUserResponseProperty($user, $displayNameAttr, $userCn),
             'dn'    => $user['dn'],
             'email' => $this->getUserResponseProperty($user, $emailAttr, null),
-            'avatar' => $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
+            'avatar'=> $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
         ];
 
         if ($this->config['dump_user_details']) {
@@ -119,7 +126,7 @@ class LdapService
      */
     protected function getUserResponseProperty(array $userDetails, string $propertyKey, $defaultValue)
     {
-        $isBinary = str_starts_with($propertyKey, 'BIN;');
+        $isBinary = strpos($propertyKey, 'BIN;') === 0;
         $propertyKey = strtolower($propertyKey);
         $value = $defaultValue;
 
@@ -163,11 +170,11 @@ class LdapService
      * Bind the system user to the LDAP connection using the given credentials
      * otherwise anonymous access is attempted.
      *
-     * @param resource|\LDAP\Connection $connection
+     * @param resource $connection
      *
      * @throws LdapException
      */
-    protected function bindSystemUser($connection): void
+    protected function bindSystemUser($connection)
     {
         $ldapDn = $this->config['dn'];
         $ldapPass = $this->config['pass'];
@@ -190,7 +197,7 @@ class LdapService
      *
      * @throws LdapException
      *
-     * @return resource|\LDAP\Connection
+     * @return resource
      */
     protected function getConnection()
     {
@@ -209,14 +216,8 @@ class LdapService
             $this->ldap->setOption(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
         }
 
-        // Configure any user-provided CA cert files for LDAP.
-        // This option works globally and must be set before a connection is created.
-        if ($this->config['tls_ca_cert']) {
-            $this->configureTlsCaCerts($this->config['tls_ca_cert']);
-        }
-
-        $ldapHost = $this->parseServerString($this->config['server']);
-        $ldapConnection = $this->ldap->connect($ldapHost);
+        $serverDetails = $this->parseServerString($this->config['server']);
+        $ldapConnection = $this->ldap->connect($serverDetails['host'], $serverDetails['port']);
 
         if ($ldapConnection === false) {
             throw new LdapException(trans('errors.ldap_cannot_connect'));
@@ -229,14 +230,7 @@ class LdapService
 
         // Start and verify TLS if it's enabled
         if ($this->config['start_tls']) {
-            try {
-                $started = $this->ldap->startTls($ldapConnection);
-            } catch (\Exception $exception) {
-                $error = $exception->getMessage() . ' :: ' . ldap_error($ldapConnection);
-                ldap_get_option($ldapConnection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detail);
-                Log::info("LDAP STARTTLS failure: {$error} {$detail}");
-                throw new LdapException('Could not start TLS connection. Further details in the application log.');
-            }
+            $started = $this->ldap->startTls($ldapConnection);
             if (!$started) {
                 throw new LdapException('Could not start TLS connection');
             }
@@ -248,59 +242,34 @@ class LdapService
     }
 
     /**
-     * Configure TLS CA certs globally for ldap use.
-     * This will detect if the given path is a directory or file, and set the relevant
-     * LDAP TLS options appropriately otherwise throw an exception if no file/folder found.
-     *
-     * Note: When using a folder, certificates are expected to be correctly named by hash
-     * which can be done via the c_rehash utility.
-     *
-     * @throws LdapException
-     */
-    protected function configureTlsCaCerts(string $caCertPath): void
-    {
-        $errMessage = "Provided path [{$caCertPath}] for LDAP TLS CA certs could not be resolved to an existing location";
-        $path = realpath($caCertPath);
-        if ($path === false) {
-            throw new LdapException($errMessage);
-        }
-
-        if (is_dir($path)) {
-            $this->ldap->setOption(null, LDAP_OPT_X_TLS_CACERTDIR, $path);
-        } else if (is_file($path)) {
-            $this->ldap->setOption(null, LDAP_OPT_X_TLS_CACERTFILE, $path);
-        } else {
-            throw new LdapException($errMessage);
-        }
-    }
-
-    /**
-     * Parse an LDAP server string and return the host suitable for a connection.
+     * Parse a LDAP server string and return the host and port for a connection.
      * Is flexible to formats such as 'ldap.example.com:8069' or 'ldaps://ldap.example.com'.
      */
-    protected function parseServerString(string $serverString): string
+    protected function parseServerString(string $serverString): array
     {
-        if (str_starts_with($serverString, 'ldaps://') || str_starts_with($serverString, 'ldap://')) {
-            return $serverString;
+        $serverNameParts = explode(':', $serverString);
+
+        // If we have a protocol just return the full string since PHP will ignore a separate port.
+        if ($serverNameParts[0] === 'ldaps' || $serverNameParts[0] === 'ldap') {
+            return ['host' => $serverString, 'port' => 389];
         }
 
-        return "ldap://{$serverString}";
+        // Otherwise, extract the port out
+        $hostName = $serverNameParts[0];
+        $ldapPort = (count($serverNameParts) > 1) ? intval($serverNameParts[1]) : 389;
+
+        return ['host' => $hostName, 'port' => $ldapPort];
     }
 
     /**
      * Build a filter string by injecting common variables.
-     * Both "${var}" and "{var}" style placeholders are supported.
-     * Dollar based are old format but supported for compatibility.
      */
     protected function buildFilter(string $filterString, array $attrs): string
     {
         $newAttrs = [];
         foreach ($attrs as $key => $attrText) {
-            $escapedText = $this->ldap->escape($attrText);
-            $oldVarKey = '${' . $key . '}';
-            $newVarKey = '{' . $key . '}';
-            $newAttrs[$oldVarKey] = $escapedText;
-            $newAttrs[$newVarKey] = $escapedText;
+            $newKey = '${' . $key . '}';
+            $newAttrs[$newKey] = $this->ldap->escape($attrText);
         }
 
         return strtr($filterString, $newAttrs);
@@ -417,7 +386,7 @@ class LdapService
      * @throws LdapException
      * @throws JsonDebugException
      */
-    public function syncGroups(User $user, string $username): void
+    public function syncGroups(User $user, string $username)
     {
         $userLdapGroups = $this->getUserGroups($username);
         $this->groupSyncService->syncUserWithFoundGroups($user, $userLdapGroups, $this->config['remove_from_groups']);

app/Auth/Access/LoginService.php

@@ -1,26 +1,27 @@
 <?php
 
-namespace BookStack\Access;
+namespace BookStack\Auth\Access;
 
-use BookStack\Access\Mfa\MfaSession;
-use BookStack\Activity\ActivityType;
-use BookStack\Exceptions\LoginAttemptException;
+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 BookStack\Users\Models\User;
 use Exception;
 
 class LoginService
 {
     protected const LAST_LOGIN_ATTEMPTED_SESSION_KEY = 'auth-login-last-attempted';
 
-    public function __construct(
-        protected MfaSession $mfaSession,
-        protected EmailConfirmationService $emailConfirmationService,
-        protected SocialDriverManager $socialDriverManager,
-    ) {
+    protected $mfaSession;
+    protected $emailConfirmationService;
+
+    public function __construct(MfaSession $mfaSession, EmailConfirmationService $emailConfirmationService)
+    {
+        $this->mfaSession = $mfaSession;
+        $this->emailConfirmationService = $emailConfirmationService;
     }
 
     /**
@@ -148,7 +149,6 @@ class LoginService
      * May interrupt the flow if extra authentication requirements are imposed.
      *
      * @throws StoppedAuthenticationException
-     * @throws LoginAttemptException
      */
     public function attempt(array $credentials, string $method, bool $remember = false): bool
     {
@@ -161,33 +161,4 @@ class LoginService
 
         return $result;
     }
-
-    /**
-     * Logs the current user out of the application.
-     * Returns an app post-redirect path.
-     */
-    public function logout(): string
-    {
-        auth()->logout();
-        session()->invalidate();
-        session()->regenerateToken();
-
-        return $this->shouldAutoInitiate() ? '/login?prevent_auto_init=true' : '/';
-    }
-
-    /**
-     * Check if login auto-initiate should be active based upon authentication config.
-     */
-    public function shouldAutoInitiate(): bool
-    {
-        $autoRedirect = config('auth.auto_initiate');
-        if (!$autoRedirect) {
-            return false;
-        }
-
-        $socialDrivers = $this->socialDriverManager->getActive();
-        $authMethod = config('auth.method');
-
-        return count($socialDrivers) === 0 && in_array($authMethod, ['oidc', 'saml2']);
-    }
 }

app/Auth/Access/Mfa/BackupCodeService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Access\Mfa;
+namespace BookStack\Auth\Access\Mfa;
 
 use Illuminate\Support\Str;
 

app/Auth/Access/Mfa/MfaSession.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Access\Mfa;
+namespace BookStack\Auth\Access\Mfa;
 
-use BookStack\Users\Models\User;
+use BookStack\Auth\User;
 
 class MfaSession
 {

app/Auth/Access/Mfa/MfaValue.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Access\Mfa;
+namespace BookStack\Auth\Access\Mfa;
 
-use BookStack\Users\Models\User;
+use BookStack\Auth\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 

app/Auth/Access/Mfa/TotpService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Access\Mfa;
+namespace BookStack\Auth\Access\Mfa;
 
 use BaconQrCode\Renderer\Color\Rgb;
 use BaconQrCode\Renderer\Image\SvgImageBackEnd;
@@ -8,7 +8,7 @@ use BaconQrCode\Renderer\ImageRenderer;
 use BaconQrCode\Renderer\RendererStyle\Fill;
 use BaconQrCode\Renderer\RendererStyle\RendererStyle;
 use BaconQrCode\Writer;
-use BookStack\Users\Models\User;
+use BookStack\Auth\User;
 use PragmaRX\Google2FA\Google2FA;
 use PragmaRX\Google2FA\Support\Constants;