Fix path subfolder and inject more env (#237)

Author: ildyria

.env.example

@@ -18,6 +18,15 @@ LOG_VIEWER_CACHE_DRIVER=file
 # Default app URL
 # APP_URL=http://localhost
 
+# If using Lychee in a sub folder, specify the path after the tld here.
+# For example for https://lychee.test/path/to/lychee
+# Set APP_URL=https://lychee.test
+# and APP_DIR=/path/to/lychee
+# and ASSET_URL=https://lychee.test/path/to/lychee
+# We (LycheeOrg) ABSOLUTELY DO NOT RECOMMEND the use of APP_DIR.
+# APP_DIR=/path/to/lychee
+# ASSET_URL=http://example.com/path/to/lychee
+
 # Redis configuration
 # REDIS_PORT=6379
 # REDIS_USERNAME=default
@@ -32,4 +41,11 @@ LOG_VIEWER_CACHE_DRIVER=file
 
 # Allows to use remote connection via vite proxy.
 # This disables the graceful handling of sessions expirations. 
-# VITE_HTTP_PROXY_ENABLED=false
+# VITE_HTTP_PROXY_ENABLED=false
+
+# Disable Basic Auth. This means that the only way to authenticate is via the API token or Oauth.
+# This should only be toggled AFTER having set up the admin account and bound the Oauth client.
+# DISABLE_BASIC_AUTH=false
+
+# Disable WebAuthn. This means that the only way to authenticate is via the API token, Basic Auth or OAuth.
+# DISABLE_WEBAUTHN=false

.github/workflows/test_pull.yml

@@ -31,21 +31,21 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
+            let artifacts = await github.rest.actions.listWorkflowRunArtifacts({
                owner: context.repo.owner,
                repo: context.repo.repo,
-               run_id: ${{ github.event.workflow_run.id }},
+               run_id: context.payload.workflow_run.id,
             });
-            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+            let matchArtifact = artifacts.data.artifacts.filter((artifact) => {
               return artifact.name == "artifact"
             })[0];
-            var download = await github.actions.downloadArtifact({
+            let download = await github.actions.downloadArtifact({
                owner: context.repo.owner,
                repo: context.repo.repo,
                artifact_id: matchArtifact.id,
                archive_format: 'zip',
             });
-            var fs = require('fs');
+            const fs = require('fs');
             fs.writeFileSync('${{github.workspace}}/artifact.zip', Buffer.from(download.data));
       -
         name: "Unzip"

docker-compose.yml

@@ -77,10 +77,11 @@ services:
       #- APP_DEBUG=true
       #- APP_FORCE_HTTPS=false
       - APP_URL=${APP_URL:-http://localhost}
+      # If using Lychee in a sub folder, specify the path after the tld here.
+      # We do not recommend the use of APP_DIR and ASSET_URL.
       #- APP_DIR=
+      #- ASSET_URL=      
       #- DEBUGBAR_ENABLEd=false
-      #- VUEJS_ENABLED=true
-      #- LEGACY_API_ENABLED=false
       #- LEGACY_V4_REDIRECT=false
       #- DB_OLD_LYCHEE_PREFIX=''
       - DB_CONNECTION=mysql
@@ -124,6 +125,8 @@ services:
       - REDIS_PASSWORD=${REDIS_PASSWORD:-}
       - LOG_VIEWER_CACHE_DRIVER=${LOG_VIEWER_CACHE_DRIVER:-file}
       - VITE_HTTP_PROXY_ENABLED=${VITE_HTTP_PROXY_ENABLED:-false}
+      - DISABLE_BASIC_AUTH=${DISABLE_BASIC_AUTH:-false}
+      - DISABLE_WEBAUTHN=${DISABLE_WEBAUTHN:-false}
     restart: unless-stopped
     depends_on:
       - lychee_db

inject.sh

@@ -25,15 +25,12 @@ if [ "$APP_FORCE_HTTPS" != '' ]; then
 if [ "$APP_DIR" != '' ]; then
     replace_or_insert "APP_DIR" "$APP_DIR"
  fi
+if [ "$ASSET_URL" != '' ]; then
+    replace_or_insert "ASSET_URL" "$ASSET_URL"
+ fi
 if [ "$DEBUGBAR_ENABLED" != '' ]; then
     replace_or_insert "DEBUGBAR_ENABLED" "$DEBUGBAR_ENABLED"
  fi
-if [ "$LIVEWIRE_ENABLED" != '' ]; then
-    replace_or_insert "LIVEWIRE_ENABLED" "$LIVEWIRE_ENABLED"
- fi
-if [ "$VUEJS_ENABLED" != '' ]; then
-    replace_or_insert "VUEJS_ENABLED" "$VUEJS_ENABLED"
- fi
 if [ "$LEGACY_API_ENABLED" != '' ]; then
     replace_or_insert "LEGACY_API_ENABLED" "$LEGACY_API_ENABLED"
  fi
@@ -46,9 +43,6 @@ if [ "$S3_ENABLED" != '' ]; then
 if [ "$LEGACY_V4_REDIRECT" != '' ]; then
     replace_or_insert "LEGACY_V4_REDIRECT" "$LEGACY_V4_REDIRECT"
  fi
-if [ "$PHOTO_PIPES" != '' ]; then
-    replace_or_insert "PHOTO_PIPES" "$PHOTO_PIPES"
- fi
 if [ "$DB_OLD_LYCHEE_PREFIX" != '' ]; then
     replace_or_insert "DB_OLD_LYCHEE_PREFIX" "$DB_OLD_LYCHEE_PREFIX"
  fi
@@ -346,4 +340,10 @@ if [ "$PHP_TZ" != '' ]; then
  fi
 if [ "$VITE_HTTP_PROXY_ENABLED" != '' ]; then
     replace_or_insert "VITE_HTTP_PROXY_ENABLED" "$VITE_HTTP_PROXY_ENABLED"
+ fi
+if [ "$DISABLE_BASIC_AUTH" != '' ]; then
+    replace_or_insert "DISABLE_BASIC_AUTH" "$DISABLE_BASIC_AUTH"
+ fi
+if [ "$DISABLE_WEBAUTHN" != '' ]; then
+    replace_or_insert "DISABLE_WEBAUTHN" "$DISABLE_WEBAUTHN"
  fi