fixes
This commit is contained in:
parent
d35bbf5661
commit
7b1f1e79fb
2 changed files with 10 additions and 10 deletions
|
|
@ -17,7 +17,7 @@ Betrifft nur `poweron-swiss`-Repos. Die `poweron`-Repos (gateway, ui-nyla) bleib
|
||||||
- [x] `env-int.env`: DB_HOST → `db-int.poweron.swiss`
|
- [x] `env-int.env`: DB_HOST → `db-int.poweron.swiss`
|
||||||
- [x] `env-int.env`: DB_USER → `poweron_dev`
|
- [x] `env-int.env`: DB_USER → `poweron_dev`
|
||||||
- [x] `env-int.env`: OAuth-Redirect-URIs → `api-int.poweron.swiss`
|
- [x] `env-int.env`: OAuth-Redirect-URIs → `api-int.poweron.swiss`
|
||||||
- [x] `env-int.env`: CORS (APP_ALLOWED_ORIGINS) → alle UI-Domains (poweron.swiss + poweron-center.net)
|
- [x] `env-int.env`: CORS (APP_ALLOWED_ORIGINS) → alle UI-Domains (poweron.swiss)
|
||||||
- [x] `env-int.env`: APP_KEY_SYSVAR → `/srv/platform-core/shared/secrets/master_key.txt`
|
- [x] `env-int.env`: APP_KEY_SYSVAR → `/srv/platform-core/shared/secrets/master_key.txt`
|
||||||
- [x] `env-int.env`: APP_LOGGING_LOG_DIR → `srv/platform-core/shared/logs`
|
- [x] `env-int.env`: APP_LOGGING_LOG_DIR → `srv/platform-core/shared/logs`
|
||||||
- [x] `env-int.env`: TEAMSBOT_BROWSER_BOT_URL → `http://teamsbot.poweron.swiss:4100`
|
- [x] `env-int.env`: TEAMSBOT_BROWSER_BOT_URL → `http://teamsbot.poweron.swiss:4100`
|
||||||
|
|
|
||||||
|
|
@ -288,7 +288,7 @@ from modules.services import getInterface as getServices
|
||||||
services = getServices(rootUser)
|
services = getServices(rootUser)
|
||||||
|
|
||||||
# Generate magic link
|
# Generate magic link
|
||||||
frontendUrl = APP_CONFIG.get("Frontend_BASE_URL", "https://playground.poweron-center.net")
|
frontendUrl = APP_CONFIG.get("Frontend_BASE_URL", "https://playground.poweron.swiss")
|
||||||
magicLink = f"{frontendUrl}/reset.html?token={resetToken}"
|
magicLink = f"{frontendUrl}/reset.html?token={resetToken}"
|
||||||
|
|
||||||
# Prepare email content
|
# Prepare email content
|
||||||
|
|
@ -369,7 +369,7 @@ def sendPasswordResetEmail(
|
||||||
try:
|
try:
|
||||||
# Get frontend URL from config
|
# Get frontend URL from config
|
||||||
from modules.shared.configuration import APP_CONFIG
|
from modules.shared.configuration import APP_CONFIG
|
||||||
frontendUrl = APP_CONFIG.get("Frontend_BASE_URL", "https://playground.poweron-center.net")
|
frontendUrl = APP_CONFIG.get("Frontend_BASE_URL", "https://playground.poweron.swiss")
|
||||||
magicLink = f"{frontendUrl}/reset.html?token={token}"
|
magicLink = f"{frontendUrl}/reset.html?token={token}"
|
||||||
|
|
||||||
# Get expiry hours from config
|
# Get expiry hours from config
|
||||||
|
|
@ -426,10 +426,10 @@ If you did not request this, please ignore this email.
|
||||||
**File**: `gateway/config.ini`
|
**File**: `gateway/config.ini`
|
||||||
```ini
|
```ini
|
||||||
# Frontend URL for magic link generation
|
# Frontend URL for magic link generation
|
||||||
Frontend_BASE_URL = https://playground.poweron-center.net
|
Frontend_BASE_URL = https://playground.poweron.swiss
|
||||||
# Or use environment-specific values:
|
# Or use environment-specific values:
|
||||||
# Frontend_BASE_URL_INT = https://playground-int.poweron-center.net
|
# Frontend_BASE_URL_INT = https://playground-int.poweron.swiss
|
||||||
# Frontend_BASE_URL_PROD = https://playground.poweron-center.net
|
# Frontend_BASE_URL_PROD = https://playground.poweron.swiss
|
||||||
```
|
```
|
||||||
|
|
||||||
**File**: `gateway/env_*.env` (environment-specific)
|
**File**: `gateway/env_*.env` (environment-specific)
|
||||||
|
|
@ -975,7 +975,7 @@ def resetPasswordWithToken(self, token: str, newPassword: str) -> bool:
|
||||||
Auth_RESET_TOKEN_EXPIRY_HOURS = 24
|
Auth_RESET_TOKEN_EXPIRY_HOURS = 24
|
||||||
|
|
||||||
# Frontend URL for magic links
|
# Frontend URL for magic links
|
||||||
Frontend_BASE_URL = https://playground.poweron-center.net
|
Frontend_BASE_URL = https://playground.poweron.swiss
|
||||||
```
|
```
|
||||||
|
|
||||||
#### 3.2 Add Password Reset Endpoints
|
#### 3.2 Add Password Reset Endpoints
|
||||||
|
|
@ -1011,7 +1011,7 @@ async def passwordResetRequest(
|
||||||
services = Services(user)
|
services = Services(user)
|
||||||
|
|
||||||
# Generate magic link
|
# Generate magic link
|
||||||
frontendUrl = APP_CONFIG.get("Frontend_BASE_URL", "https://playground.poweron-center.net")
|
frontendUrl = APP_CONFIG.get("Frontend_BASE_URL", "https://playground.poweron.swiss")
|
||||||
magicLink = f"{frontendUrl}/reset.html?token={token}"
|
magicLink = f"{frontendUrl}/reset.html?token={token}"
|
||||||
|
|
||||||
# Send email
|
# Send email
|
||||||
|
|
@ -1277,8 +1277,8 @@ Auth_RESET_TOKEN_EXPIRY_HOURS = 24
|
||||||
# Frontend URL for magic link generation (add to each env file)
|
# Frontend URL for magic link generation (add to each env file)
|
||||||
APP_FRONTEND_URL = https://your-frontend-domain.com
|
APP_FRONTEND_URL = https://your-frontend-domain.com
|
||||||
# Examples:
|
# Examples:
|
||||||
# env_int.env: APP_FRONTEND_URL = https://playground-int.poweron-center.net
|
# env_int.env: APP_FRONTEND_URL = https://playground-int.poweron.swiss
|
||||||
# env_prod.env: APP_FRONTEND_URL = https://playground.poweron-center.net
|
# env_prod.env: APP_FRONTEND_URL = https://playground.poweron.swiss
|
||||||
```
|
```
|
||||||
|
|
||||||
### Usage
|
### Usage
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue