New Sign-In Detected
+
+
+
+
+
+ IP Address
+{{ipAddress}}
+
+
+ Device
+{{device}}
+
+
+ Sign-In Time
+{{dateTimeString}}
+
+
+ Audit Log
+
+
+
+
+ Audit Log
+ See your account activities from the last 3 months.
+
+
+
+
diff --git a/frontend/src/routes/settings/audit-log/audit-log-list.svelte b/frontend/src/routes/settings/audit-log/audit-log-list.svelte
new file mode 100644
index 0000000..5da2bb4
--- /dev/null
+++ b/frontend/src/routes/settings/audit-log/audit-log-list.svelte
@@ -0,0 +1,95 @@
+
+
+
+
+
+ Time
+ Event
+ IP Address
+ Device
+ Client
+
+
+
+ {#if auditLogs.data.length === 0}
+
+ No logs found
+
+ {:else}
+ {#each auditLogs.data as auditLog}
+
+ {new Date(auditLog.createdAt).toLocaleString()}
+
+ {toFriendlyEventString(auditLog.event)}
+
+ {auditLog.ipAddress}
+ {auditLog.device}
+ {auditLog.data.clientName}
+
+ {/each}
+ {/if}
+
+
+
+{#if auditLogs?.data?.length ?? 0 > 0}
+
+ (auditLogs = await auditLogService.list({
+ page: p,
+ limit: pagination.limit
+ }))}
+ bind:page={auditLogs.pagination.currentPage}
+ let:pages
+ let:currentPage
+ >
+
+
+
+ {#each pages as page (page.key)}
+ {#if page.type === 'ellipsis'}
+
+
+ {:else}
+
+
+ {page.value}
+
+
+ {/if}
+ {/each}
+
+
+
+
+{/if}
diff --git a/frontend/tests/application-configuration.spec.ts b/frontend/tests/application-configuration.spec.ts
index d8d0b09..cce1174 100644
--- a/frontend/tests/application-configuration.spec.ts
+++ b/frontend/tests/application-configuration.spec.ts
@@ -21,6 +21,33 @@ test('Update general configuration', async ({ page }) => {
await expect(page.getByLabel('Session Duration')).toHaveValue('30');
});
+test('Update email configuration', async ({ page }) => {
+ await page.goto('/settings/admin/application-configuration');
+
+ await page.getByLabel('SMTP Host').fill('smtp.gmail.com');
+ await page.getByLabel('SMTP Port').fill('587');
+ await page.getByLabel('SMTP User').fill('test@gmail.com');
+ await page.getByLabel('SMTP Password').fill('password');
+ await page.getByLabel('SMTP From').fill('test@gmail.com');
+ await page.getByRole('button', { name: 'Enable' }).click();
+ await page.getByRole('status').click();
+
+ await expect(page.getByRole('status')).toHaveText('Email configuration updated successfully');
+ await expect(page.getByRole('button', { name: 'Disable' })).toBeVisible();
+
+ await page.reload();
+
+ await expect(page.getByLabel('SMTP Host')).toHaveValue('smtp.gmail.com');
+ await expect(page.getByLabel('SMTP Port')).toHaveValue('587');
+ await expect(page.getByLabel('SMTP User')).toHaveValue('test@gmail.com');
+ await expect(page.getByLabel('SMTP Password')).toHaveValue('password');
+ await expect(page.getByLabel('SMTP From')).toHaveValue('test@gmail.com');
+
+ await page.getByRole('button', { name: 'Disable' }).click();
+
+ await expect(page.getByRole('status')).toHaveText('Email disabled successfully');
+});
+
test('Update application images', async ({ page }) => {
await page.goto('/settings/admin/application-configuration');
diff --git a/Caddyfile b/reverse-proxy/Caddyfile
similarity index 79%
rename from Caddyfile
rename to reverse-proxy/Caddyfile
index 4ae284a..ac3249a 100644
--- a/Caddyfile
+++ b/reverse-proxy/Caddyfile
@@ -1,5 +1,5 @@
:80 {
- reverse_proxy /api/* http://localhost:8080
+ reverse_proxy /api/* http://localhost:8080
reverse_proxy /.well-known/* http://localhost:8080
reverse_proxy /* http://localhost:3000
diff --git a/reverse-proxy/Caddyfile.trust-proxy b/reverse-proxy/Caddyfile.trust-proxy
new file mode 100644
index 0000000..068a98d
--- /dev/null
+++ b/reverse-proxy/Caddyfile.trust-proxy
@@ -0,0 +1,16 @@
+:80 {
+ reverse_proxy /api/* http://localhost:8080 {
+ trusted_proxies 0.0.0.0/0
+ }
+ reverse_proxy /.well-known/* http://localhost:8080 {
+ trusted_proxies 0.0.0.0/0
+ }
+ reverse_proxy /* http://localhost:3000 {
+ trusted_proxies 0.0.0.0/0
+ }
+
+ log {
+ output file /var/log/caddy/access.log
+ level WARN
+ }
+}
\ No newline at end of file
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index cff6abf..0f694ec 100644
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -1,4 +1,3 @@
-
echo "Starting frontend..."
node frontend/build &
@@ -6,6 +5,12 @@ echo "Starting backend..."
cd backend && ./pocket-id-backend &
echo "Starting Caddy..."
-caddy start --config /etc/caddy/Caddyfile &
+
+# Check if TRUST_PROXY is set to true and use the appropriate Caddyfile
+if [ "$TRUST_PROXY" = "true" ]; then
+ caddy start --config /etc/caddy/Caddyfile.trust-proxy &
+else
+ caddy start --config /etc/caddy/Caddyfile &
+fi
wait
\ No newline at end of file