Compare commits

...
54 changed files with 680 additions and 419 deletions
+4
View File
@@ -6,6 +6,10 @@
# The following settings are ONLY set in your .env file. # The following settings are ONLY set in your .env file.
# They are NOT managed by the Admin UI and are not stored in the database. # They are NOT managed by the Admin UI and are not stored in the database.
# === First Install Token ===
# if set the user is required to enter this token on the /first_install page
# FIRST_INSTALL_TOKEN="myaccesstoken"
# === Logging and Development === # === Logging and Development ===
DEBUG=False DEBUG=False
+11 -7
View File
@@ -44,15 +44,19 @@ jobs:
if: github.repository == 'lnbits/lnbits' if: github.repository == 'lnbits/lnbits'
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- name: Install dependencies for building secp256k1
run: |
sudo apt-get update
sudo apt-get install -y build-essential automake libtool libffi-dev libgmp-dev
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Build and publish to pypi - name: Set up Python 3.10
uses: JRubics/poetry-publish@v1.15 uses: actions/setup-python@v5
with: with:
pypi_token: ${{ secrets.PYPI_API_KEY }} python-version: "3.10"
- name: Install uv
uses: astral-sh/setup-uv@v6
- name: Build the project
run: uv build
- name: Publish to pypi
env:
UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_KEY }}
run: uv publish
appimage: appimage:
needs: [ release ] needs: [ release ]
+11 -7
View File
@@ -56,15 +56,19 @@ jobs:
if: github.repository == 'lnbits/lnbits' if: github.repository == 'lnbits/lnbits'
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- name: Install dependencies for building secp256k1
run: |
sudo apt-get update
sudo apt-get install -y build-essential automake libtool libffi-dev libgmp-dev
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Build and publish to pypi - name: Set up Python 3.10
uses: JRubics/poetry-publish@v1.15 uses: actions/setup-python@v5
with: with:
pypi_token: ${{ secrets.PYPI_API_KEY }} python-version: "3.10"
- name: Install uv
uses: astral-sh/setup-uv@v6
- name: Build the project
run: uv build
- name: Publish to pypi
env:
UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_KEY }}
run: uv publish
appimage: appimage:
needs: [ release ] needs: [ release ]
+1
View File
@@ -204,6 +204,7 @@ async def get_user_from_account(
super_user=account.is_super_user, super_user=account.is_super_user,
fiat_providers=account.fiat_providers, fiat_providers=account.fiat_providers,
has_password=account.password_hash is not None, has_password=account.password_hash is not None,
ui_customization=account.ui_customization or {},
) )
+8
View File
@@ -848,3 +848,11 @@ async def m042_index_accounts(db: Connection):
CREATE INDEX IF NOT EXISTS idx_accounts_{index} ON accounts ("{index}"); CREATE INDEX IF NOT EXISTS idx_accounts_{index} ON accounts ("{index}");
""" """
) )
async def m043_add_ui_customization_to_accounts(db: Connection):
"""
Adds ui_customization column to accounts.
Used for server side persistence of UI customization settings.
"""
await db.execute("ALTER TABLE accounts ADD COLUMN ui_customization TEXT")
+10 -53
View File
@@ -6,23 +6,16 @@ from typing import Literal
from fastapi import Query from fastapi import Query
from lnurl import LnurlWithdrawResponse from lnurl import LnurlWithdrawResponse
from loguru import logger
from pydantic import BaseModel, Field, validator from pydantic import BaseModel, Field, validator
from lnbits.db import FilterModel from lnbits.db import FilterModel
from lnbits.fiat import get_fiat_provider
from lnbits.fiat.base import ( from lnbits.fiat.base import (
FiatPaymentFailedStatus,
FiatPaymentPendingStatus,
FiatPaymentStatus, FiatPaymentStatus,
FiatPaymentSuccessStatus,
) )
from lnbits.utils.exchange_rates import allowed_currencies from lnbits.utils.exchange_rates import allowed_currencies
from lnbits.wallets import get_funding_source
from lnbits.wallets.base import ( from lnbits.wallets.base import (
PaymentFailedStatus,
PaymentPendingStatus,
PaymentStatus, PaymentStatus,
PaymentSuccessStatus,
) )
@@ -130,59 +123,23 @@ class Payment(BaseModel):
"fiat_" "fiat_"
) )
# DEPRECATED: in v1.5.0, use service check_payment_status instead
async def check_status( async def check_status(
self, skip_internal_payment_notifications: bool | None = False self, skip_internal_payment_notifications: bool | None = False
) -> PaymentStatus: ) -> PaymentStatus:
if self.is_internal: logger.warning("payment.check_status() is deprecated.")
if self.success: from lnbits.core.services.payments import check_payment_status
return PaymentSuccessStatus()
if self.failed:
return PaymentFailedStatus()
if self.is_in and self.fiat_provider:
fiat_status = await self.check_fiat_status(
skip_internal_payment_notifications
)
return PaymentStatus(paid=fiat_status.paid)
return PaymentPendingStatus()
funding_source = get_funding_source()
if self.is_out:
status = await funding_source.get_payment_status(self.checking_id)
else:
status = await funding_source.get_invoice_status(self.checking_id)
return status
return await check_payment_status(self, skip_internal_payment_notifications)
# DEPRECATED: in v1.5.0, use service check_payment_status instead
async def check_fiat_status( async def check_fiat_status(
self, skip_internal_payment_notifications: bool | None = False self, skip_internal_payment_notifications: bool | None = False
) -> FiatPaymentStatus: ) -> FiatPaymentStatus:
if not self.is_internal: logger.warning("payment.check_fiat_status() is deprecated.")
return FiatPaymentPendingStatus() from lnbits.core.services.fiat_providers import check_fiat_status
if self.success:
return FiatPaymentSuccessStatus()
if self.failed:
return FiatPaymentFailedStatus()
if not self.fiat_provider: return await check_fiat_status(self, skip_internal_payment_notifications)
return FiatPaymentPendingStatus()
checking_id = self.extra.get("fiat_checking_id")
if not checking_id:
return FiatPaymentPendingStatus()
fiat_provider = await get_fiat_provider(self.fiat_provider)
if not fiat_provider:
return FiatPaymentPendingStatus()
fiat_status = await fiat_provider.get_invoice_status(checking_id)
if skip_internal_payment_notifications:
return fiat_status
if fiat_status.success:
# notify receivers asynchronously
from lnbits.tasks import internal_invoice_queue
await internal_invoice_queue.put(self.checking_id)
return fiat_status
class PaymentFilters(FilterModel): class PaymentFilters(FilterModel):
+3
View File
@@ -187,6 +187,7 @@ class Account(AccountId):
pubkey: str | None = None pubkey: str | None = None
email: str | None = None email: str | None = None
extra: UserExtra = UserExtra() extra: UserExtra = UserExtra()
ui_customization: dict = Field(default_factory=dict)
created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc)) created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc)) updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
@@ -288,6 +289,7 @@ class User(BaseModel):
fiat_providers: list[str] = [] fiat_providers: list[str] = []
has_password: bool = False has_password: bool = False
extra: UserExtra = UserExtra() extra: UserExtra = UserExtra()
ui_customization: dict = Field(default_factory=dict)
@property @property
def wallet_ids(self) -> list[str]: def wallet_ids(self) -> list[str]:
@@ -356,6 +358,7 @@ class UpdateSuperuserPassword(BaseModel):
username: str = Query(default=..., min_length=2, max_length=20) username: str = Query(default=..., min_length=2, max_length=20)
password: str = Query(default=..., min_length=8, max_length=50) password: str = Query(default=..., min_length=8, max_length=50)
password_repeat: str = Query(default=..., min_length=8, max_length=50) password_repeat: str = Query(default=..., min_length=8, max_length=50)
first_install_token: str | None = Query(None)
class LoginUsr(BaseModel): class LoginUsr(BaseModel):
+4
View File
@@ -1,3 +1,4 @@
from .fiat_providers import check_fiat_status
from .funding_source import ( from .funding_source import (
get_balance_delta, get_balance_delta,
switch_to_voidwallet, switch_to_voidwallet,
@@ -7,6 +8,7 @@ from .notifications import enqueue_admin_notification, send_payment_notification
from .payments import ( from .payments import (
calculate_fiat_amounts, calculate_fiat_amounts,
cancel_hold_invoice, cancel_hold_invoice,
check_payment_status,
check_transaction_status, check_transaction_status,
check_wallet_limits, check_wallet_limits,
create_fiat_invoice, create_fiat_invoice,
@@ -40,6 +42,8 @@ __all__ = [
"calculate_fiat_amounts", "calculate_fiat_amounts",
"cancel_hold_invoice", "cancel_hold_invoice",
"check_admin_settings", "check_admin_settings",
"check_fiat_status",
"check_payment_status",
"check_transaction_status", "check_transaction_status",
"check_wallet_limits", "check_wallet_limits",
"check_webpush_settings", "check_webpush_settings",
+40
View File
@@ -12,6 +12,12 @@ from lnbits.core.models import CreatePayment, Payment, PaymentState
from lnbits.core.models.misc import SimpleStatus from lnbits.core.models.misc import SimpleStatus
from lnbits.db import Connection from lnbits.db import Connection
from lnbits.fiat import get_fiat_provider from lnbits.fiat import get_fiat_provider
from lnbits.fiat.base import (
FiatPaymentFailedStatus,
FiatPaymentPendingStatus,
FiatPaymentStatus,
FiatPaymentSuccessStatus,
)
from lnbits.settings import settings from lnbits.settings import settings
@@ -29,6 +35,40 @@ async def handle_fiat_payment_confirmation(
logger.warning(e) logger.warning(e)
async def check_fiat_status(
payment: Payment, skip_internal_payment_notifications: bool | None = False
) -> FiatPaymentStatus:
if not payment.is_internal:
return FiatPaymentPendingStatus()
if payment.success:
return FiatPaymentSuccessStatus()
if payment.failed:
return FiatPaymentFailedStatus()
if not payment.fiat_provider:
return FiatPaymentPendingStatus()
checking_id = payment.extra.get("fiat_checking_id")
if not checking_id:
return FiatPaymentPendingStatus()
fiat_provider = await get_fiat_provider(payment.fiat_provider)
if not fiat_provider:
return FiatPaymentPendingStatus()
fiat_status = await fiat_provider.get_invoice_status(checking_id)
if skip_internal_payment_notifications:
return fiat_status
if fiat_status.success:
# notify receivers asynchronously
from lnbits.tasks import internal_invoice_queue
await internal_invoice_queue.put(payment.checking_id)
return fiat_status
def check_stripe_signature( def check_stripe_signature(
payload: bytes, payload: bytes,
sig_header: str | None, sig_header: str | None,
+40 -5
View File
@@ -25,6 +25,7 @@ from lnbits.utils.exchange_rates import fiat_amount_as_satoshis, satoshis_amount
from lnbits.wallets import fake_wallet, get_funding_source from lnbits.wallets import fake_wallet, get_funding_source
from lnbits.wallets.base import ( from lnbits.wallets.base import (
InvoiceResponse, InvoiceResponse,
PaymentFailedStatus,
PaymentPendingStatus, PaymentPendingStatus,
PaymentResponse, PaymentResponse,
PaymentStatus, PaymentStatus,
@@ -47,6 +48,7 @@ from ..models import (
PaymentState, PaymentState,
Wallet, Wallet,
) )
from .fiat_providers import check_fiat_status
from .notifications import send_payment_notification_in_background from .notifications import send_payment_notification_in_background
payment_lock = asyncio.Lock() payment_lock = asyncio.Lock()
@@ -364,7 +366,7 @@ async def update_pending_payments(wallet_id: str):
async def update_pending_payment( async def update_pending_payment(
payment: Payment, conn: Connection | None = None payment: Payment, conn: Connection | None = None
) -> Payment: ) -> Payment:
status = await payment.check_status() status = await check_payment_status(payment)
if status.failed: if status.failed:
payment.status = PaymentState.FAILED payment.status = PaymentState.FAILED
await update_payment(payment, conn=conn) await update_payment(payment, conn=conn)
@@ -618,7 +620,29 @@ async def check_transaction_status(
if payment.status == PaymentState.SUCCESS.value: if payment.status == PaymentState.SUCCESS.value:
return PaymentSuccessStatus(fee_msat=payment.fee) return PaymentSuccessStatus(fee_msat=payment.fee)
return await payment.check_status() return await check_payment_status(payment)
async def check_payment_status(
payment: Payment, skip_internal_payment_notifications: bool | None = False
) -> PaymentStatus:
if payment.is_internal:
if payment.success:
return PaymentSuccessStatus()
if payment.failed:
return PaymentFailedStatus()
if payment.is_in and payment.fiat_provider:
fiat_status = await check_fiat_status(
payment, skip_internal_payment_notifications
)
return PaymentStatus(paid=fiat_status.paid)
return PaymentPendingStatus()
funding_source = get_funding_source()
if payment.is_out:
status = await funding_source.get_payment_status(payment.checking_id)
else:
status = await funding_source.get_invoice_status(payment.checking_id)
return status
async def get_payments_daily_stats( async def get_payments_daily_stats(
@@ -752,7 +776,7 @@ async def _pay_internal_invoice(
await update_payment(internal_payment, conn=conn) await update_payment(internal_payment, conn=conn)
logger.success(f"internal payment successful {internal_payment.checking_id}") logger.success(f"internal payment successful {internal_payment.checking_id}")
send_payment_notification_in_background(wallet, payment) await _send_payment_notification_in_background(wallet.id, payment, conn=conn)
# notify receiver asynchronously # notify receiver asynchronously
from lnbits.tasks import internal_invoice_queue from lnbits.tasks import internal_invoice_queue
@@ -825,7 +849,8 @@ async def _pay_external_invoice(
payment = await update_payment_success_status( payment = await update_payment_success_status(
payment, payment_response, conn=conn payment, payment_response, conn=conn
) )
send_payment_notification_in_background(wallet, payment)
await _send_payment_notification_in_background(wallet.id, payment, conn=conn)
logger.success(f"payment successful {payment_response.checking_id}") logger.success(f"payment successful {payment_response.checking_id}")
payment.checking_id = payment_response.checking_id payment.checking_id = payment_response.checking_id
@@ -868,7 +893,7 @@ async def _verify_external_payment(
raise PaymentError("Payment already paid.", status="success") raise PaymentError("Payment already paid.", status="success")
# payment failed # payment failed
status = await payment.check_status() status = await check_payment_status(payment)
if status.failed: if status.failed:
raise PaymentError( raise PaymentError(
"Payment is failed node, retrying is not possible.", status="failed" "Payment is failed node, retrying is not possible.", status="failed"
@@ -1033,3 +1058,13 @@ async def cancel_hold_invoice(payment: Payment) -> InvoiceResponse:
await update_payment(payment) await update_payment(payment)
return response return response
async def _send_payment_notification_in_background(
wallet_id: str, payment: Payment, conn: Connection | None = None
):
# fetch balance again
wallet = await get_wallet(wallet_id, conn=conn)
if not wallet:
raise PaymentError(f"Could not fetch wallet '{wallet_id}'.", status="failed")
send_payment_notification_in_background(wallet, payment)
+23 -1
View File
@@ -467,7 +467,7 @@ async def reset_password(data: ResetUserPassword) -> JSONResponse:
return _auth_success_response(account.username, user_id, account.email) return _auth_success_response(account.username, user_id, account.email)
@auth_router.put("/update") @auth_router.patch("")
async def update( async def update(
data: UpdateUser, account: Account = Depends(check_account_exists) data: UpdateUser, account: Account = Depends(check_account_exists)
) -> User | None: ) -> User | None:
@@ -483,10 +483,32 @@ async def update(
return await get_user_from_account(account) return await get_user_from_account(account)
@auth_router.patch("/ui")
async def update_ui_customization(
req: Request, account: Account = Depends(check_account_exists)
) -> Account:
ui_customization = await req.json()
account.ui_customization = {**(account.ui_customization or {}), **ui_customization}
if len(account.ui_customization or {}) > 1000 * 1024:
raise HTTPException(
HTTPStatus.BAD_REQUEST, "UI customization too large. Drop some fields."
)
await update_user_account(account)
return account
@auth_router.put("/first_install") @auth_router.put("/first_install")
async def first_install(data: UpdateSuperuserPassword) -> JSONResponse: async def first_install(data: UpdateSuperuserPassword) -> JSONResponse:
if not settings.first_install: if not settings.first_install:
raise HTTPException(HTTPStatus.FORBIDDEN, "This is not your first install") raise HTTPException(HTTPStatus.FORBIDDEN, "This is not your first install")
if settings.first_install_token:
if not data.first_install_token:
raise HTTPException(HTTPStatus.UNAUTHORIZED, "Missing first_install_token.")
if settings.first_install_token != data.first_install_token:
raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid first_install_token.")
account = await get_account(settings.super_user) account = await get_account(settings.super_user)
if not account: if not account:
raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Superuser not found.") raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Superuser not found.")
+6 -5
View File
@@ -9,6 +9,7 @@ from lnbits.core.crud.payments import (
from lnbits.core.models.misc import SimpleStatus from lnbits.core.models.misc import SimpleStatus
from lnbits.core.models.payments import CreateInvoice from lnbits.core.models.payments import CreateInvoice
from lnbits.core.services.fiat_providers import ( from lnbits.core.services.fiat_providers import (
check_fiat_status,
check_stripe_signature, check_stripe_signature,
verify_paypal_webhook, verify_paypal_webhook,
) )
@@ -87,7 +88,7 @@ async def _handle_stripe_intent_session_completed(event: dict):
if not payment: if not payment:
logger.warning(f"No payment found for hash: '{payment_hash}'.") logger.warning(f"No payment found for hash: '{payment_hash}'.")
return return
await payment.check_fiat_status() await check_fiat_status(payment)
async def _handle_stripe_checkout_session_completed(event: dict): async def _handle_stripe_checkout_session_completed(event: dict):
@@ -110,7 +111,7 @@ async def _handle_stripe_checkout_session_completed(event: dict):
payment = await get_standalone_payment(payment_hash) payment = await get_standalone_payment(payment_hash)
if not payment: if not payment:
raise ValueError(f"No payment found for hash: '{payment_hash}'.") raise ValueError(f"No payment found for hash: '{payment_hash}'.")
await payment.check_fiat_status() await check_fiat_status(payment)
async def _handle_stripe_subscription_invoice_paid(event: dict): async def _handle_stripe_subscription_invoice_paid(event: dict):
@@ -155,7 +156,7 @@ async def _handle_stripe_subscription_invoice_paid(event: dict):
), ),
) )
await payment.check_fiat_status() await check_fiat_status(payment)
async def _get_stripe_subscription_payment_options( async def _get_stripe_subscription_payment_options(
@@ -192,7 +193,7 @@ async def handle_paypal_event(event: dict):
if not payment: if not payment:
logger.warning(f"No payment found for hash: '{payment_hash}'.") logger.warning(f"No payment found for hash: '{payment_hash}'.")
return return
await payment.check_fiat_status() await check_fiat_status(payment)
return return
if event_type in ( if event_type in (
@@ -247,7 +248,7 @@ async def _handle_paypal_subscription_payment(resource: dict):
), ),
) )
await payment.check_fiat_status() await check_fiat_status(payment)
def _paypal_extract_payment_hash(resource: dict) -> str | None: def _paypal_extract_payment_hash(resource: dict) -> str | None:
+8 -51
View File
@@ -70,57 +70,11 @@ def template_renderer(additional_folders: list | None = None) -> Jinja2Templates
t.env.globals["static_url_for"] = static_url_for t.env.globals["static_url_for"] = static_url_for
t.env.globals["normalize_path"] = normalize_path t.env.globals["normalize_path"] = normalize_path
window_settings = { # used in base.html
"AD_SPACE": settings.lnbits_ad_space, t.env.globals["SITE_TITLE"] = settings.lnbits_site_title
"AD_SPACE_ENABLED": settings.lnbits_ad_space_enabled, t.env.globals["LNBITS_APPLE_TOUCH_ICON"] = settings.lnbits_apple_touch_icon
"AD_SPACE_TITLE": settings.lnbits_ad_space_title, t.env.globals["SETTINGS"] = settings.to_public().dict(by_alias=True)
"EXTENSIONS": list(settings.lnbits_installed_extensions_ids), t.env.globals["CURRENCIES"] = list(currencies.keys())
"HIDE_API": settings.lnbits_hide_api,
"SITE_TITLE": settings.lnbits_site_title,
"SITE_TAGLINE": settings.lnbits_site_tagline,
"SITE_DESCRIPTION": settings.lnbits_site_description,
"LNBITS_ADMIN_UI": settings.lnbits_admin_ui,
"LNBITS_AUDIT_ENABLED": settings.lnbits_audit_enabled,
"LNBITS_AUTH_METHODS": settings.auth_allowed_methods,
"LNBITS_AUTH_KEYCLOAK_ORG": settings.keycloak_client_custom_org,
"LNBITS_AUTH_KEYCLOAK_ICON": settings.keycloak_client_custom_icon,
"LNBITS_CUSTOM_IMAGE": settings.lnbits_custom_image,
"LNBITS_CUSTOM_BADGE": settings.lnbits_custom_badge,
"LNBITS_CUSTOM_BADGE_COLOR": settings.lnbits_custom_badge_color,
"LNBITS_EXTENSIONS_DEACTIVATE_ALL": settings.lnbits_extensions_deactivate_all,
"LNBITS_NEW_ACCOUNTS_ALLOWED": settings.new_accounts_allowed,
"LNBITS_NODE_UI": settings.lnbits_node_ui and settings.has_nodemanager,
"LNBITS_NODE_UI_AVAILABLE": settings.has_nodemanager,
"LNBITS_QR_LOGO": settings.lnbits_qr_logo,
"LNBITS_APPLE_TOUCH_ICON": settings.lnbits_apple_touch_icon,
"LNBITS_SERVICE_FEE": settings.lnbits_service_fee,
"LNBITS_SERVICE_FEE_MAX": settings.lnbits_service_fee_max,
"LNBITS_SERVICE_FEE_WALLET": settings.lnbits_service_fee_wallet,
"LNBITS_SHOW_HOME_PAGE_ELEMENTS": settings.lnbits_show_home_page_elements,
"LNBITS_THEME_OPTIONS": settings.lnbits_theme_options,
"LNBITS_VERSION": settings.version,
"USE_CUSTOM_LOGO": settings.lnbits_custom_logo,
"LNBITS_DEFAULT_REACTION": settings.lnbits_default_reaction,
"LNBITS_DEFAULT_THEME": settings.lnbits_default_theme,
"LNBITS_DEFAULT_BORDER": settings.lnbits_default_border,
"LNBITS_DEFAULT_GRADIENT": settings.lnbits_default_gradient,
"LNBITS_DEFAULT_BGIMAGE": settings.lnbits_default_bgimage,
"VOIDWALLET": settings.lnbits_backend_wallet_class == "VoidWallet",
"WEBPUSH_PUBKEY": settings.lnbits_webpush_pubkey,
"LNBITS_EXTENSIONS_REVIEWS_URL": settings.lnbits_extensions_reviews_url,
"LNBITS_DENOMINATION": settings.lnbits_denomination,
"has_holdinvoice": settings.has_holdinvoice,
"LNBITS_NOSTR_CONFIGURED": settings.is_nostr_notifications_configured(),
"LNBITS_TELEGRAM_CONFIGURED": settings.is_telegram_notifications_configured(),
"LNBITS_EXT_BUILDER": settings.lnbits_extensions_builder_activate_non_admins,
"LNBITS_CURRENCIES": list(currencies.keys()),
"LNBITS_ALLOWED_CURRENCIES": settings.lnbits_allowed_currencies,
"CACHE_KEY": settings.server_startup_time,
}
t.env.globals["WINDOW_SETTINGS"] = window_settings
for key, value in window_settings.items():
t.env.globals[key] = value
if settings.bundle_assets: if settings.bundle_assets:
t.env.globals["INCLUDED_JS"] = ["bundle.min.js"] t.env.globals["INCLUDED_JS"] = ["bundle.min.js"]
@@ -134,6 +88,9 @@ def template_renderer(additional_folders: list | None = None) -> Jinja2Templates
t.env.globals["INCLUDED_CSS"] = vendor_files["css"] t.env.globals["INCLUDED_CSS"] = vendor_files["css"]
t.env.globals["INCLUDED_COMPONENTS"] = vendor_files["components"] t.env.globals["INCLUDED_COMPONENTS"] = vendor_files["components"]
# backwards compatibility for extensions (tpos)
t.env.globals["LNBITS_DENOMINATION"] = settings.lnbits_denomination
return t return t
+115
View File
@@ -252,6 +252,11 @@ class ThemesSettings(LNbitsSettings):
) )
lnbits_show_home_page_elements: bool = Field(default=True) lnbits_show_home_page_elements: bool = Field(default=True)
lnbits_default_wallet_name: str = Field(default="LNbits wallet") lnbits_default_wallet_name: str = Field(default="LNbits wallet")
lnbits_wallet_featured_button_label: str | None = Field(default=None)
lnbits_wallet_featured_button_url: str | None = Field(default=None)
lnbits_wallet_featured_button_icon: str | None = Field(default=None)
lnbits_custom_badge: str | None = Field(default=None) lnbits_custom_badge: str | None = Field(default=None)
lnbits_custom_badge_color: str = Field(default="warning") lnbits_custom_badge_color: str = Field(default="warning")
lnbits_theme_options: list[str] = Field( lnbits_theme_options: list[str] = Field(
@@ -978,6 +983,7 @@ class EnvSettings(LNbitsSettings):
enable_log_to_file: bool = Field(default=True) enable_log_to_file: bool = Field(default=True)
log_rotation: str = Field(default="100 MB") log_rotation: str = Field(default="100 MB")
log_retention: str = Field(default="3 months") log_retention: str = Field(default="3 months")
first_install_token: str | None = Field(default=None)
cleanup_wallets_days: int = Field(default=90, ge=0) cleanup_wallets_days: int = Field(default=90, ge=0)
funding_source_max_retries: int = Field(default=4, ge=0) funding_source_max_retries: int = Field(default=4, ge=0)
@@ -1126,6 +1132,115 @@ class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettin
and ext_id in self.lnbits_all_extensions_ids and ext_id in self.lnbits_all_extensions_ids
) )
def to_public(self) -> PublicSettings:
return PublicSettings.from_settings(self)
class PublicSettings(BaseModel):
"""
PublicSettings is used for templating and public information.
WARNING: do not expose private information, PublicSettings is exposed publicly.
"""
allow_register: bool = Field(alias="allowRegister")
qr_logo: str = Field(alias="qrLogo")
site_title: str = Field(alias="siteTitle")
site_tagline: str = Field(alias="siteTagline")
site_description: str | None = Field(alias="siteDescription")
auth_methods: list[str] = Field(alias="authMethods")
keycloak_org: str | None = Field(alias="keycloakOrg")
keycloak_icon: str | None = Field(alias="keycloakIcon")
has_holdinvoice: bool = Field(alias="hasHoldinvoice")
has_nodemanager: bool = Field(alias="hasNodemanager")
show_nodemanager: bool = Field(alias="showNodemanager")
custom_logo: str | None = Field(alias="customLogo")
show_voidwallet: bool = Field(alias="showVoidwallet")
version: str = Field(alias="version")
show_home_page_elements: bool = Field(alias="showHomePageElements")
hide_api: bool = Field(alias="hideApi")
cache_key: str = Field(alias="cacheKey")
webpush_pubkey: str | None = Field(alias="webpushPubkey")
show_extensions: bool = Field(alias="showExtensions")
show_audit: bool = Field(alias="showAudit")
show_admin: bool = Field(alias="showAdmin")
ad_space: list[list[str]] = Field(alias="adSpace")
ad_space_title: str = Field(alias="adSpaceTitle")
show_ad_space: bool = Field(alias="showAdSpace")
custom_image: str | None = Field(alias="customImage")
custom_badge: str | None = Field(alias="customBadge")
custom_badge_color: str | None = Field(alias="customBadgeColor")
service_fee: float = Field(alias="serviceFee")
service_fee_max: int = Field(alias="serviceFeeMax")
service_fee_wallet: str | None = Field(alias="serviceFeeWallet")
theme_options: list[str] = Field(alias="themeOptions")
default_reaction: str = Field(alias="defaultReaction")
default_theme: str = Field(alias="defaultTheme")
default_border: str = Field(alias="defaultBorder")
default_bgimage: str | None = Field(alias="defaultBgimage")
default_gradient: bool = Field(alias="defaultGradient")
denomination: str | None = Field()
extensions: list[str] = Field()
allowed_currencies: list[str] = Field(alias="allowedCurrencies")
extensions_reviews_url: str = Field(alias="extensionsReviewsUrl")
ext_builder: bool = Field(alias="extBuilder")
nostr_configured: bool = Field(alias="nostrConfigured")
telegram_configured: bool = Field(alias="telegramConfigured")
wallet_featured_button_label: str | None = Field(alias="walletFeaturedButtonLabel")
wallet_featured_button_url: str | None = Field(alias="walletFeaturedButtonUrl")
wallet_featured_button_icon: str | None = Field(alias="walletFeaturedButtonIcon")
@classmethod
def from_settings(cls, settings: Settings):
ads = [x.split(";") for x in settings.lnbits_ad_space.split(",")]
return cls(
adSpace=ads,
adSpaceTitle=settings.lnbits_ad_space_title,
showAdSpace=settings.lnbits_ad_space_enabled and len(ads) > 0,
allowRegister=settings.new_accounts_allowed,
qrLogo=settings.lnbits_qr_logo,
siteDescription=settings.lnbits_site_description,
siteTitle=settings.lnbits_site_title,
siteTagline=settings.lnbits_site_tagline,
authMethods=settings.auth_allowed_methods,
keycloakOrg=settings.keycloak_client_custom_org,
keycloakIcon=settings.keycloak_client_custom_icon,
hasHoldinvoice=settings.has_holdinvoice,
hasNodemanager=settings.has_nodemanager,
showNodemanager=settings.lnbits_node_ui and settings.has_nodemanager,
customLogo=settings.lnbits_custom_logo,
showVoidwallet=settings.lnbits_backend_wallet_class == "VoidWallet",
version=settings.version,
showHomePageElements=settings.lnbits_show_home_page_elements,
hideApi=settings.lnbits_hide_api,
cacheKey=str(settings.server_startup_time),
webpushPubkey=settings.lnbits_webpush_pubkey,
showExtensions=not settings.lnbits_extensions_deactivate_all,
showAudit=settings.lnbits_audit_enabled,
showAdmin=settings.lnbits_admin_ui,
customImage=settings.lnbits_custom_image,
customBadge=settings.lnbits_custom_badge,
customBadgeColor=settings.lnbits_custom_badge_color,
serviceFee=settings.lnbits_service_fee,
serviceFeeMax=settings.lnbits_service_fee_max,
serviceFeeWallet=settings.lnbits_service_fee_wallet,
themeOptions=settings.lnbits_theme_options,
defaultReaction=settings.lnbits_default_reaction,
defaultTheme=settings.lnbits_default_theme,
defaultBorder=settings.lnbits_default_border,
defaultGradient=settings.lnbits_default_gradient,
defaultBgimage=settings.lnbits_default_bgimage,
denomination=settings.lnbits_denomination,
extensions=list(settings.lnbits_installed_extensions_ids),
allowedCurrencies=settings.lnbits_allowed_currencies,
extensionsReviewsUrl=settings.lnbits_extensions_reviews_url,
extBuilder=settings.lnbits_extensions_builder_activate_non_admins,
nostrConfigured=settings.is_nostr_notifications_configured(),
telegramConfigured=settings.is_telegram_notifications_configured(),
walletFeaturedButtonLabel=settings.lnbits_wallet_featured_button_label,
walletFeaturedButtonUrl=settings.lnbits_wallet_featured_button_url,
walletFeaturedButtonIcon=settings.lnbits_wallet_featured_button_icon,
)
class SuperSettings(EditableSettings): class SuperSettings(EditableSettings):
super_user: str super_user: str
File diff suppressed because one or more lines are too long
+10 -10
View File
File diff suppressed because one or more lines are too long
+10
View File
@@ -518,6 +518,7 @@ window.localisation.en = {
hash: 'Hash: ', hash: 'Hash: ',
welcome_lnbits: 'Welcome to LNbits', welcome_lnbits: 'Welcome to LNbits',
setup_su_account: 'Set up the Superuser account below.', setup_su_account: 'Set up the Superuser account below.',
first_install_token: 'First Install Token (optional)',
create_ticker_converter: 'Create Currency Ticker Converter', create_ticker_converter: 'Create Currency Ticker Converter',
enable_audit: 'Enable Audit', enable_audit: 'Enable Audit',
recommended: 'Recommended', recommended: 'Recommended',
@@ -658,6 +659,15 @@ window.localisation.en = {
ui_site_description_hint: 'Use plain text, Markdown, or raw HTML', ui_site_description_hint: 'Use plain text, Markdown, or raw HTML',
ui_default_wallet_name: 'Default Wallet Name', ui_default_wallet_name: 'Default Wallet Name',
ui_default_theme: 'Default Theme', ui_default_theme: 'Default Theme',
wallet_featured_button_label: 'Wallet Featured Button Label',
wallet_featured_button_label_hint:
'Show featured button on the wallet homepage',
wallet_featured_button_url: 'Featured Button URL',
wallet_featured_button_url_hint:
'On click the button will open this URL. Leave empty to hide the button.',
wallet_featured_button_icon: 'Featured Button Icon',
wallet_featured_button_icon_hint:
'Icon shown on the featured button (check quasar icons)',
lnbits_wallet: 'LNbits wallet', lnbits_wallet: 'LNbits wallet',
denomination: 'Denomination', denomination: 'Denomination',
denomination_hint: 'The name for the FakeWallet token', denomination_hint: 'The name for the FakeWallet token',
+3
View File
@@ -154,6 +154,9 @@ window._lnbitsApi = {
name: name name: name
}) })
}, },
updateUiCustomization(data = {}) {
return this.request('patch', '/api/v1/auth/ui', null, data)
},
resetWalletKeys(wallet) { resetWalletKeys(wallet) {
return this.request('put', `/api/v1/wallet/reset/${wallet.id}`).then( return this.request('put', `/api/v1/wallet/reset/${wallet.id}`).then(
res => { res => {
+2 -1
View File
@@ -14,7 +14,8 @@ window.LNbits = {
fiat_providers: data.fiat_providers || [], fiat_providers: data.fiat_providers || [],
super_user: data.super_user, super_user: data.super_user,
extra: data.extra ?? {}, extra: data.extra ?? {},
hasPassword: data.has_password ?? false hasPassword: data.has_password ?? false,
uiCustomization: data.ui_customization || {}
} }
const mapWallet = this.wallet const mapWallet = this.wallet
obj.wallets = obj.wallets.map(mapWallet).sort((a, b) => { obj.wallets = obj.wallets.map(mapWallet).sort((a, b) => {
+1 -20
View File
@@ -35,23 +35,6 @@ window.app.component('lnbits-extension-rating', {
window.app.component('lnbits-manage', { window.app.component('lnbits-manage', {
template: '#lnbits-manage', template: '#lnbits-manage',
computed: {
showAdmin() {
return this.LNBITS_ADMIN_UI
},
showUsers() {
return this.LNBITS_ADMIN_UI
},
showNode() {
return this.LNBITS_NODE_UI
},
showAudit() {
return this.LNBITS_AUDIT_ENABLED
},
showExtensions() {
return this.LNBITS_EXTENSIONS_DEACTIVATE_ALL === false
}
},
methods: { methods: {
isActive(path) { isActive(path) {
return window.location.pathname === path return window.location.pathname === path
@@ -462,9 +445,7 @@ window.app.component('username-password', {
username: this.userName, username: this.userName,
password: this.password_1, password: this.password_1,
passwordRepeat: this.password_2, passwordRepeat: this.password_2,
reset_key: this.resetKey, reset_key: this.resetKey
keycloakOrg: LNBITS_AUTH_KEYCLOAK_ORG || 'Keycloak',
keycloakIcon: LNBITS_AUTH_KEYCLOAK_ICON
} }
}, },
methods: { methods: {
+3 -6
View File
@@ -1,14 +1,11 @@
window.app.component('lnbits-footer', { window.app.component('lnbits-footer', {
template: '#lnbits-footer', template: '#lnbits-footer',
computed: { computed: {
version() {
return this.LNBITS_VERSION || 'unknown version'
},
title() { title() {
return `${this.SITE_TITLE}, ${this.SITE_TAGLINE}` return `${this.g.settings.siteTitle}, ${this.g.settings.siteTagline}`
}, },
showFooter() { version() {
return this.LNBITS_SHOW_HOME_PAGE_ELEMENTS == true return this.$t('lnbits_version') + ': ' + this.g.settings.version
} }
} }
}) })
+11 -39
View File
@@ -1,48 +1,9 @@
window.app.component('lnbits-header', { window.app.component('lnbits-header', {
template: '#lnbits-header', template: '#lnbits-header',
computed: { computed: {
hasServiceFeeMax() {
return (
this.g.user &&
this.LNBITS_SERVICE_FEE_MAX &&
this.LNBITS_SERVICE_FEE_MAX > 0
)
},
serviceFeeMax() {
return this.LNBITS_SERVICE_FEE_MAX || 0
},
hasServiceFee() {
return (
this.g.user && this.LNBITS_SERVICE_FEE && this.LNBITS_SERVICE_FEE > 0
)
},
serviceFee() {
return this.LNBITS_SERVICE_FEE || 0
},
hasCustomBadge() {
return this.LNBITS_CUSTOM_BADGE && this.LNBITS_CUSTOM_BADGE != ''
},
customBadge() {
return this.LNBITS_CUSTOM_BADGE || ''
},
customBadgeColor() {
return this.LNBITS_CUSTOM_BADGE_COLOR || ''
},
title() {
return this.SITE_TITLE
},
titleIsLnbits() {
return this.SITE_TITLE == 'LNbits'
},
customLogoUrl() {
return this.USE_CUSTOM_LOGO || null
},
showAdmin() { showAdmin() {
return this.g.user && (this.g.user.super_user || this.g.user.admin) return this.g.user && (this.g.user.super_user || this.g.user.admin)
}, },
showVoidwallet() {
return this.g.user && this.VOIDWALLET == true
},
displayName() { displayName() {
return ( return (
this.g.user?.extra?.display_name || this.g.user?.extra?.display_name ||
@@ -69,6 +30,17 @@ window.app.component('lnbits-header', {
window.location = '/users' window.location = '/users'
} catch (e) { } catch (e) {
console.warn(e) console.warn(e)
}
},
async handleLanguageChanged(lang) {
try {
await LNbits.api.updateUiCustomization({locale: lang.locale})
this.$q.notify({
type: 'positive',
message: 'Language Updated',
caption: lang.locale
})
} catch (e) {
LNbits.utils.notifyApiError(e) LNbits.utils.notifyApiError(e)
} }
} }
@@ -95,8 +95,8 @@ window.app.component('lnbits-home-logos', {
showLogos() { showLogos() {
return ( return (
this.g.isSatsDenomination && this.g.isSatsDenomination &&
this.SITE_TITLE == 'LNbits' && this.g.settings.siteTitle == 'LNbits' &&
this.LNBITS_SHOW_HOME_PAGE_ELEMENTS == true this.g.settings.showHomePageElements == true
) )
} }
} }
@@ -1,5 +1,16 @@
window.app.component('lnbits-language-dropdown', { window.app.component('lnbits-language-dropdown', {
template: '#lnbits-language-dropdown', template: '#lnbits-language-dropdown',
computed: {
currentLanguage() {
return (
this.langs.find(lang => lang.value === window.i18n.global.locale) || {
value: 'en',
label: 'English',
display: '🇬🇧 EN'
}
)
}
},
methods: { methods: {
activeLanguage(lang) { activeLanguage(lang) {
return window.i18n.global.locale === lang return window.i18n.global.locale === lang
@@ -8,6 +19,7 @@ window.app.component('lnbits-language-dropdown', {
this.g.locale = newValue this.g.locale = newValue
window.i18n.global.locale = newValue window.i18n.global.locale = newValue
this.$q.localStorage.set('lnbits.lang', newValue) this.$q.localStorage.set('lnbits.lang', newValue)
this.$emit('language-changed', newValue)
} }
}, },
data() { data() {
+1 -1
View File
@@ -34,7 +34,7 @@ window.app.component('lnbits-qrcode', {
}, },
logo: { logo: {
type: String, type: String,
default: LNBITS_QR_LOGO default: window.g.settings.qrLogo || null
} }
}, },
data() { data() {
@@ -9,6 +9,10 @@ window.app.component('lnbits-theme', {
'g.disclaimerShown'(val) { 'g.disclaimerShown'(val) {
this.$q.localStorage.setItem('lnbits.disclaimerShown', val) this.$q.localStorage.setItem('lnbits.disclaimerShown', val)
}, },
'g.locale'(val) {
this.$q.localStorage.setItem('lnbits.lang', val)
window.i18n.global.locale = val
},
'g.isFiatPriority'(val) { 'g.isFiatPriority'(val) {
this.$q.localStorage.setItem('lnbits.isFiatPriority', val) this.$q.localStorage.setItem('lnbits.isFiatPriority', val)
}, },
@@ -123,6 +127,13 @@ window.app.component('lnbits-theme', {
if (this.g.mobileSimple === true) { if (this.g.mobileSimple === true) {
document.body.classList.add('mobile-simple') document.body.classList.add('mobile-simple')
} }
Object.entries(this.g.user?.uiCustomization || {}).forEach(
([key, value]) => {
if (key in this.g) {
this.g[key] = value
}
}
)
this.checkUrlParams() this.checkUrlParams()
} }
}) })
+35 -40
View File
@@ -9,26 +9,22 @@ const localStore = (key, defaultValue) => {
} }
window.g = Vue.reactive({ window.g = Vue.reactive({
errorCode: null, // vars from server
errorMessage: null, settings: SETTINGS,
user: null, currencies: CURRENCIES,
wallet: null, extensions: SETTINGS.extensions,
isPublicPage: true, allowedCurrencies: SETTINGS.allowedCurrencies,
isUserAuthorized: !!Quasar.Cookies.get('is_lnbits_user_authorized'), denomination: SETTINGS.denomination,
isUserImpersonated: !!Quasar.Cookies.get('is_lnbits_user_impersonated'), isSatsDenomination: SETTINGS.denomination == 'sats',
offline: !navigator.onLine, // local storage vars
hasCamera: false, themeChoice: localStore('lnbits.theme', SETTINGS.defaultTheme),
visibleDrawer: false, borderChoice: localStore('lnbits.border', SETTINGS.defaultBorder),
extensions: WINDOW_SETTINGS.EXTENSIONS, gradientChoice: localStore('lnbits.gradientBg', SETTINGS.defaultGradient),
fiatBalance: 0, reactionChoice: localStore('lnbits.reactions', SETTINGS.defaultReaction),
exchangeRate: 0, bgimageChoice: localStore(
fiatTracking: false, 'lnbits.backgroundImage',
payments: [], SETTINGS.defaultBgimage || ''
walletEventListeners: [], ),
updatePayments: false, // used for updating the lnbits-payment-list
updatePaymentsHash: false, // used for closing the receive dialog
currencies: WINDOW_SETTINGS.LNBITS_CURRENCIES ?? [],
allowedCurrencies: WINDOW_SETTINGS.LNBITS_ALLOWED_CURRENCIES ?? [],
locale: localStore('lnbits.lang', navigator.languages[1] ?? 'en'), locale: localStore('lnbits.lang', navigator.languages[1] ?? 'en'),
disclaimerShown: localStore('lnbits.disclaimerShown', false), disclaimerShown: localStore('lnbits.disclaimerShown', false),
isFiatPriority: localStore('lnbits.isFiatPriority', false), isFiatPriority: localStore('lnbits.isFiatPriority', false),
@@ -36,26 +32,25 @@ window.g = Vue.reactive({
walletFlip: localStore('lnbits.walletFlip', false), walletFlip: localStore('lnbits.walletFlip', false),
lastActiveWallet: localStore('lnbits.lastActiveWallet', null), lastActiveWallet: localStore('lnbits.lastActiveWallet', null),
darkChoice: localStore('lnbits.darkMode', true), darkChoice: localStore('lnbits.darkMode', true),
themeChoice: localStore('lnbits.theme', WINDOW_SETTINGS.LNBITS_DEFAULT_THEME), // cookie vars
borderChoice: localStore( isUserAuthorized: !!Quasar.Cookies.get('is_lnbits_user_authorized'),
'lnbits.border', isUserImpersonated: !!Quasar.Cookies.get('is_lnbits_user_impersonated'),
WINDOW_SETTINGS.LNBITS_DEFAULT_BORDER || 'hard-border' // frontend vars
), errorCode: null,
gradientChoice: localStore( errorMessage: null,
'lnbits.gradientBg', user: null,
WINDOW_SETTINGS.LNBITS_DEFAULT_GRADIENT || false wallet: null,
), isPublicPage: true,
reactionChoice: localStore( offline: !navigator.onLine,
'lnbits.reactions', hasCamera: false,
WINDOW_SETTINGS.LNBITS_DEFAULT_REACTION || 'confettiBothSides' visibleDrawer: false,
), fiatBalance: 0,
bgimageChoice: localStore( exchangeRate: 0,
'lnbits.backgroundImage', fiatTracking: false,
WINDOW_SETTINGS.LNBITS_DEFAULT_BGIMAGE || '' payments: [],
), walletEventListeners: [],
ads: WINDOW_SETTINGS.AD_SPACE.split(',').map(ad => ad.split(';')), updatePayments: false, // used for updating the lnbits-payment-list
denomination: WINDOW_SETTINGS.LNBITS_DENOMINATION, updatePaymentsHash: false, // used for closing the receive dialog
isSatsDenomination: WINDOW_SETTINGS.LNBITS_DENOMINATION == 'sats',
scanner: null, scanner: null,
newWalletType: null newWalletType: null
}) })
+1 -2
View File
@@ -157,8 +157,7 @@ window.app.mixin({
return { return {
api: window._lnbitsApi, api: window._lnbitsApi,
utils: window._lnbitsUtils, utils: window._lnbitsUtils,
g: window.g, g: window.g
...WINDOW_SETTINGS
} }
}, },
// backwards compatibility for extensions, should not be used in the future // backwards compatibility for extensions, should not be used in the future
+33 -15
View File
@@ -39,6 +39,15 @@ window.PageAccount = {
color: 'pink-3' color: 'pink-3'
} }
], ],
defaultSiteCustomisation: {
locale: 'en',
themeChoice: 'salvador',
bgimageChoice: '',
gradientChoice: true,
darkChoice: true,
borderChoice: 'hard-border',
reactionChoice: 'confettiBothSides'
},
reactionOptions: [ reactionOptions: [
'None', 'None',
'confettiBothSides', 'confettiBothSides',
@@ -213,26 +222,18 @@ window.PageAccount = {
} }
}, },
methods: { methods: {
activeLanguage(lang) {
return window.i18n.global.locale === lang
},
changeLanguage(newValue) { changeLanguage(newValue) {
window.i18n.global.locale = newValue window.i18n.global.locale = newValue
this.$q.localStorage.set('lnbits.lang', newValue) this.$q.localStorage.set('lnbits.lang', newValue)
}, },
async updateAccount() { async updateAccount() {
try { try {
const {data} = await LNbits.api.request( const {data} = await LNbits.api.request('PATCH', '/api/v1/auth', null, {
'PUT', user_id: this.g.user.id,
'/api/v1/auth/update', username: this.g.user.username,
null, email: this.g.user.email,
{ extra: this.g.user.extra
user_id: this.g.user.id, })
username: this.g.user.username,
email: this.g.user.email,
extra: this.g.user.extra
}
)
this.untouchedUser = JSON.parse(JSON.stringify(this.g.user)) this.untouchedUser = JSON.parse(JSON.stringify(this.g.user))
this.hasUsername = !!data.username this.hasUsername = !!data.username
Quasar.Notify.create({ Quasar.Notify.create({
@@ -680,6 +681,23 @@ window.PageAccount = {
l => l.name !== label.name l => l.name !== label.name
) )
}) })
},
async siteCustomisationChanged(options = {}) {
try {
Object.entries(options || {}).forEach(([key, value]) => {
if (key in this.g) {
this.g[key] = value
}
})
await LNbits.api.updateUiCustomization(options)
this.$q.notify({
type: 'positive',
message: 'UI Customization updated.'
})
} catch (e) {
LNbits.utils.notifyApiError(e)
}
} }
}, },
@@ -693,7 +711,7 @@ window.PageAccount = {
await this.getUserAssets() await this.getUserAssets()
// filter out themes that are not allowed // filter out themes that are not allowed
this.themeOptions = this.themeOptions.filter(theme => this.themeOptions = this.themeOptions.filter(theme =>
this.LNBITS_THEME_OPTIONS.includes(theme.name) this.g.settings.themeOptions.includes(theme.name)
) )
} }
} }
+2 -2
View File
@@ -842,8 +842,8 @@ window.PageExtensions = {
}, },
async created() { async created() {
this.extensions = await this.fetchAllExtensions() this.extensions = await this.fetchAllExtensions()
this.extbuilderEnabled = this.g.user.admin || this.LNBITS_EXT_BUILDER this.extbuilderEnabled = this.g.user.admin || this.g.settings.extBuilder
this.reviewsUrl = this.LNBITS_EXTENSIONS_REVIEWS_URL this.reviewsUrl = this.g.settings.extensionsReviewsUrl
if (this.g.user.extensions.length === 0) { if (this.g.user.extensions.length === 0) {
this.tab = 'all' this.tab = 'all'
+16 -10
View File
@@ -7,7 +7,8 @@ window.PageFirstInstall = {
isPwdRepeat: true, isPwdRepeat: true,
username: '', username: '',
password: '', password: '',
passwordRepeat: '' passwordRepeat: '',
firstInstallToken: ''
} }
} }
}, },
@@ -17,20 +18,25 @@ window.PageFirstInstall = {
} }
}, },
methods: { methods: {
async setPassword() { setPassword() {
try { LNbits.api
await LNbits.api.request('PUT', '/api/v1/auth/first_install', null, { .request('PUT', `/api/v1/auth/first_install`, null, {
username: this.loginData.username, username: this.loginData.username,
password: this.loginData.password, password: this.loginData.password,
password_repeat: this.loginData.passwordRepeat password_repeat: this.loginData.passwordRepeat,
first_install_token: this.loginData.firstInstallToken
}) })
window.location.href = '/admin' .then(async () => {
} catch (e) { const res = await LNbits.api.getAuthUser()
LNbits.utils.notifyApiError(e) this.g.user = LNbits.map.user(res.data)
} this.g.isPublicPage = false
this.$router.push('/admin')
})
.catch(this.utils.notifyApiError)
} }
}, },
created() { created() {
document.title = 'First Install - LNbits' const params = new URLSearchParams(window.location.search)
this.loginData.firstInstallToken = params.get('token') || ''
} }
} }
+3 -28
View File
@@ -19,40 +19,15 @@ window.PageHome = {
showClaimLnurl() { showClaimLnurl() {
return ( return (
this.lnurl !== '' && this.lnurl !== '' &&
this.allowRegister && this.g.settings.allowRegister &&
'user-id-only' in this.LNBITS_AUTH_METHODS 'user-id-only' in this.g.settings.authMethods
) )
}, },
formatDescription() { formatDescription() {
return LNbits.utils.convertMarkdown(this.SITE_DESCRIPTION) return LNbits.utils.convertMarkdown(this.g.settings.siteDescription)
}, },
isAccessTokenExpired() { isAccessTokenExpired() {
return this.$q.cookies.get('is_access_token_expired') return this.$q.cookies.get('is_access_token_expired')
},
allowRegister() {
return this.LNBITS_NEW_ACCOUNTS_ALLOWED
},
// TODO: this makes no sense
hasCustomImage() {
return this.LNBITS_CUSTOM_IMAGE
},
showHomepageElements() {
return this.LNBITS_SHOW_HOME_PAGE_ELEMENTS === true
},
siteTitle() {
return this.SITE_TITLE || ''
},
siteTagline() {
return this.SITE_TAGLINE || ''
},
adsEnabled() {
return this.AD_SPACE_ENABLED && this.AD_SPACE && this.AD_SPACE.length > 0
},
adsTitle() {
return this.AD_SPACE_TITLE || ''
},
ads() {
return this.AD_SPACE.map(ad => ad.split(';'))
} }
}, },
methods: { methods: {
+1 -1
View File
@@ -1,7 +1,7 @@
window._lnbitsUtils = { window._lnbitsUtils = {
url_for(url) { url_for(url) {
const _url = new URL(url, window.location.origin) const _url = new URL(url, window.location.origin)
_url.searchParams.set('v', WINDOW_SETTINGS.CACHE_KEY) _url.searchParams.set('v', window.g.settings.cacheKey)
return _url.toString() return _url.toString()
}, },
loadScript(src) { loadScript(src) {
+5 -1
View File
@@ -178,7 +178,11 @@ async def invoice_callback_dispatcher(checking_id: str, is_internal: bool = Fals
logger.warning(f"Payment '{checking_id}' is not incoming, skipping.") logger.warning(f"Payment '{checking_id}' is not incoming, skipping.")
return return
status = await payment.check_status(skip_internal_payment_notifications=True) from lnbits.core.services.payments import check_payment_status
status = await check_payment_status(
payment, skip_internal_payment_notifications=True
)
payment.fee = status.fee_msat or payment.fee payment.fee = status.fee_msat or payment.fee
# only overwrite preimage if status.preimage provides it # only overwrite preimage if status.preimage provides it
payment.preimage = status.preimage or payment.preimage payment.preimage = status.preimage or payment.preimage
+4 -4
View File
@@ -70,10 +70,10 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
const RENDERED_ROUTE = '{{ normalize_path(request.path) }}' const RENDERED_ROUTE = '{{ normalize_path(request.path) }}'
const WINDOW_SETTINGS = {{ WINDOW_SETTINGS | tojson }} const SETTINGS = {{ SETTINGS | tojson | safe }}
Object.keys(WINDOW_SETTINGS).forEach(key => { const CURRENCIES = {{ CURRENCIES | tojson | safe }}
window[key] = WINDOW_SETTINGS[key] // backwards compatibility for extensions (tpos)
}) const LNBITS_DENOMINATION = {{ LNBITS_DENOMINATION | tojson | safe }}
</script> </script>
<!-- vue templates --> <!-- vue templates -->
{% include('components.vue') %} {% include('pages.vue') %} {% include('components.vue') %} {% include('pages.vue') %}
+10 -10
View File
@@ -36,7 +36,7 @@ include('components/lnbits-error.vue') %}
<q-list v-if="g.user" dense class="lnbits-drawer__q-list"> <q-list v-if="g.user" dense class="lnbits-drawer__q-list">
<q-item-label header v-text="$t('manage')"></q-item-label> <q-item-label header v-text="$t('manage')"></q-item-label>
<div v-if="g.user.admin"> <div v-if="g.user.admin">
<q-item v-if="showAdmin" to="/admin"> <q-item v-if="g.settings.showAdmin" to="/admin">
<q-item-section side> <q-item-section side>
<q-icon <q-icon
name="settings" name="settings"
@@ -51,7 +51,7 @@ include('components/lnbits-error.vue') %}
<q-icon name="chevron_right" color="grey-5" size="md"></q-icon> <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item v-if="showNode" to="/node"> <q-item v-if="g.settings.showNodemanager" to="/node">
<q-item-section side> <q-item-section side>
<q-icon <q-icon
name="developer_board" name="developer_board"
@@ -66,7 +66,7 @@ include('components/lnbits-error.vue') %}
<q-icon name="chevron_right" color="grey-5" size="md"></q-icon> <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item v-if="showUsers" to="/users"> <q-item v-if="g.settings.showAdmin" to="/users">
<q-item-section side> <q-item-section side>
<q-icon <q-icon
name="groups" name="groups"
@@ -81,7 +81,7 @@ include('components/lnbits-error.vue') %}
<q-icon name="chevron_right" color="grey-5" size="md"></q-icon> <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item v-if="showAudit" to="/audit"> <q-item v-if="g.settings.showAudit" to="/audit">
<q-item-section side> <q-item-section side>
<q-icon <q-icon
name="playlist_add_check_circle" name="playlist_add_check_circle"
@@ -112,7 +112,7 @@ include('components/lnbits-error.vue') %}
<q-icon name="chevron_right" color="grey-5" size="md"></q-icon> <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item v-if="showExtensions" to="/extensions"> <q-item v-if="g.settings.showExtensions" to="/extensions">
<q-item-section side> <q-item-section side>
<q-icon <q-icon
name="extension" name="extension"
@@ -686,7 +686,7 @@ include('components/lnbits-error.vue') %}
dense dense
filled filled
v-model="walletName" v-model="walletName"
:label="$t('name_your_wallet', {name: SITE_TITLE + ' *'})" :label="$t('name_your_wallet', {name: g.settings.siteTitle + ' *'})"
></q-input> ></q-input>
<q-card-actions vertical align="center" class="q-pa-none"> <q-card-actions vertical align="center" class="q-pa-none">
<q-btn <q-btn
@@ -960,9 +960,9 @@ include('components/lnbits-error.vue') %}
<q-avatar size="32px" class="q-mr-md"> <q-avatar size="32px" class="q-mr-md">
<q-img <q-img
:src=" :src="
keycloakIcon g.settings.keycloakIcon
? keycloakIcon ? g.settings.keycloakIcon
: 'lnbits/static/images/keycloak-logo.png' : utils.url_for('lnbits/static/images/keycloak-logo.png')
" "
></q-img> ></q-img>
</q-avatar> </q-avatar>
@@ -970,7 +970,7 @@ include('components/lnbits-error.vue') %}
<span <span
v-text=" v-text="
$t('signin_with_custom_org', { $t('signin_with_custom_org', {
custom_org: keycloakOrg custom_org: g.settings.keycloakOrg || 'Keycloak'
}) })
" "
></span> ></span>
@@ -50,7 +50,7 @@
<br /> <br />
</div> </div>
<div class="col"> <div class="col">
<div v-if="LNBITS_NODE_UI"> <div v-if="g.settings.hasNodemanager">
<p> <p>
<span v-text="$t('node_management')"></span> <span v-text="$t('node_management')"></span>
</p> </p>
@@ -70,7 +70,7 @@
v-model="formData.lnbits_node_ui_transactions" v-model="formData.lnbits_node_ui_transactions"
></q-toggle> ></q-toggle>
</div> </div>
<p v-if="!LNBITS_NODE_UI"> <p v-if="!g.settings.hasNodemanager">
<span v-text="$t('node_management_not_supported')"></span> <span v-text="$t('node_management_not_supported')"></span>
</p> </p>
</div> </div>
@@ -86,6 +86,42 @@
></q-input> ></q-input>
</div> </div>
</div> </div>
<br />
<div class="row q-col-gutter-md">
<div class="col-12 col-md-4">
<p>
<span v-text="$t('wallet_featured_button_label')"></span>
</p>
<q-input
filled
type="text"
v-model="formData.lnbits_wallet_featured_button_label"
label="Loop to Onchain"
:hint="$t('wallet_featured_button_label_hint')"
></q-input>
</div>
<div class="col-12 col-md-4">
<p><span v-text="$t('wallet_featured_button_url')"></span></p>
<q-input
filled
type="text"
v-model="formData.lnbits_wallet_featured_button_url"
label="/boltz"
:hint="$t('wallet_featured_button_url_hint')"
></q-input>
</div>
<div class="col-12 col-md-4">
<p><span v-text="$t('wallet_featured_button_icon')"></span></p>
<q-input
filled
type="text"
v-model="formData.lnbits_wallet_featured_button_icon"
label="bolt"
:hint="$t('wallet_featured_button_icon_hint')"
></q-input>
</div>
</div>
<div class="row q-col-gutter-md q-mt-md"> <div class="row q-col-gutter-md q-mt-md">
<div class="col-12 col-md-6"> <div class="col-12 col-md-6">
<p><span v-text="$t('ui_custom_badge')"></span></p> <p><span v-text="$t('ui_custom_badge')"></span></p>
@@ -1,6 +1,6 @@
<template id="lnbits-footer"> <template id="lnbits-footer">
<q-footer <q-footer
v-if="showFooter" v-if="g.settings.showHomePageElements"
class="bg-transparent q-px-lg q-py-md" class="bg-transparent q-px-lg q-py-md"
:class="{'text-dark': !$q.dark.isActive}" :class="{'text-dark': !$q.dark.isActive}"
> >
@@ -9,7 +9,7 @@
<q-toolbar-title class="text-caption"> <q-toolbar-title class="text-caption">
<span v-text="title"></span> <span v-text="title"></span>
<br /> <br />
<small v-text="$t('lnbits_version') + ': ' + version"></small> <small v-text="version"></small>
</q-toolbar-title> </q-toolbar-title>
<q-space></q-space> <q-space></q-space>
<q-btn <q-btn
+24 -15
View File
@@ -1,6 +1,10 @@
<template id="lnbits-header"> <template id="lnbits-header">
<q-header bordered class="bg-marginal-bg"> <q-header bordered class="bg-marginal-bg">
<q-banner v-if="showVoidwallet" class="bg-warning text-white" dense> <q-banner
v-if="g.settings.showVoidwallet"
class="bg-warning text-white"
dense
>
<template v-slot:avatar> <template v-slot:avatar>
<q-icon name="warning" color="white" /> <q-icon name="warning" color="white" />
</template> </template>
@@ -24,13 +28,15 @@
<q-toolbar-title> <q-toolbar-title>
<q-btn flat no-caps dense class="q-mr-sm" size="lg" type="a" href="/"> <q-btn flat no-caps dense class="q-mr-sm" size="lg" type="a" href="/">
<q-img <q-img
v-if="customLogoUrl" v-if="customLogo"
height="30px" height="30px"
alt="Logo" alt="Logo"
:src="customLogoUrl" :src="customLogo"
></q-img> ></q-img>
<span v-else-if="!titleIsLnbits"><strong>LN</strong>bits</span> <span v-else-if="g.settings.siteTitle == 'LNbits'"
<span v-else v-text="title"></span> ><strong>LN</strong>bits</span
>
<span v-else v-text="g.settings.siteTitle"></span>
</q-btn> </q-btn>
<q-badge v-if="g.user && g.user.super_user">Super User</q-badge> <q-badge v-if="g.user && g.user.super_user">Super User</q-badge>
<q-badge v-else-if="g.user && g.user.admin">Admin User</q-badge> <q-badge v-else-if="g.user && g.user.admin">Admin User</q-badge>
@@ -38,31 +44,31 @@
<q-badge <q-badge
class="q-mr-md" class="q-mr-md"
v-show="$q.screen.gt.sm" v-show="$q.screen.gt.sm"
v-if="hasCustomBadge" v-if="g.settings.customBadge"
:label="customBadge" :label="g.settings.customBadge"
:color="customBadgeColor" :color="g.settings.customBadgeColor"
> >
</q-badge> </q-badge>
<q-badge <q-badge
v-show="$q.screen.gt.sm" v-show="$q.screen.gt.sm"
v-if="hasServiceFee" v-if="g.user && g.settings.serviceFee > 0"
color="green" color="green"
class="q-mr-md" class="q-mr-md"
> >
<span <span
v-if="hasServiceFeeMax" v-if="g.user && g.settings.serviceFeeMax > 0"
v-text=" v-text="
$t('service_fee_max_badge', { $t('service_fee_max_badge', {
amount: serviceFee, amount: g.settings.serviceFee,
max: serviceFeeMax, max: g.settings.serviceFeeMax,
denom: g.denomination denom: g.denomination
}) })
" "
></span> ></span>
<span <span
v-else v-else
v-text="$t('service_fee_badge', {amount: serviceFee})" v-text="$t('service_fee_badge', {amount: g.settings.serviceFee})"
></span> ></span>
<q-tooltip><span v-text="$t('service_fee_tooltip')"></span></q-tooltip> <q-tooltip><span v-text="$t('service_fee_tooltip')"></span></q-tooltip>
</q-badge> </q-badge>
@@ -71,8 +77,11 @@
<span>OFFLINE</span> <span>OFFLINE</span>
</q-badge> </q-badge>
<lnbits-language-dropdown></lnbits-language-dropdown> <lnbits-language-dropdown
<q-btn-dropdown v-if="g.user" flat rounded size="sm" class="q-pl-sm"> @language-changed="handleLanguageChanged({locale: $event})"
></lnbits-language-dropdown>
<q-btn-dropdown v-if="g.user" flat rounded size="md" class="q-pl-sm">
<template v-slot:label> <template v-slot:label>
<q-avatar <q-avatar
v-if="g.user?.extra?.picture && g.user?.extra?.picture !== ''" v-if="g.user?.extra?.picture && g.user?.extra?.picture !== ''"
@@ -1,5 +1,11 @@
<template id="lnbits-language-dropdown"> <template id="lnbits-language-dropdown">
<q-btn-dropdown dense flat rounded size="sm" icon="language" class="q-pl-md"> <q-btn-dropdown dense flat rounded size="md" class="q-pl-md">
<template v-slot:label>
<q-item-section>
<q-item-label v-text="currentLanguage.display"></q-item-label>
<q-tooltip><span v-text="currentLanguage.label"></span></q-tooltip>
</q-item-section>
</template>
<q-list v-for="(lang, index) in langs" :key="index"> <q-list v-for="(lang, index) in langs" :key="index">
<q-item <q-item
clickable clickable
@@ -118,7 +118,7 @@
</q-list> </q-list>
</q-card-section> </q-card-section>
<q-expansion-item <q-expansion-item
v-if="!HIDE_API" v-if="!g.settings.hideApi"
group="api" group="api"
dense dense
expand-separator expand-separator
@@ -152,7 +152,7 @@
</q-expansion-item> </q-expansion-item>
<q-expansion-item <q-expansion-item
v-if="!HIDE_API" v-if="!g.settings.hideApi"
group="api" group="api"
dense dense
expand-separator expand-separator
@@ -197,7 +197,7 @@
</q-card> </q-card>
</q-expansion-item> </q-expansion-item>
<q-expansion-item <q-expansion-item
v-if="!HIDE_API" v-if="!g.settings.hideApi"
group="api" group="api"
dense dense
expand-separator expand-separator
@@ -244,7 +244,7 @@
</q-expansion-item> </q-expansion-item>
<q-expansion-item <q-expansion-item
v-if="!HIDE_API" v-if="!g.settings.hideApi"
group="api" group="api"
dense dense
expand-separator expand-separator
@@ -273,7 +273,7 @@
</q-card> </q-card>
</q-expansion-item> </q-expansion-item>
<q-expansion-item <q-expansion-item
v-if="!HIDE_API" v-if="!g.settings.hideApi"
group="api" group="api"
dense dense
expand-separator expand-separator
+62 -29
View File
@@ -258,15 +258,20 @@
class="q-mb-md" class="q-mb-md"
> >
</q-input> </q-input>
<div v-if="!g.user.email" class="row"></div>
<div v-if="!g.user.email" class="row"> <div v-if="!g.user.email" class="row">
{% if "google-auth" in LNBITS_AUTH_METHODS or <div
"github-auth" in LNBITS_AUTH_METHODS %} v-if="
<div class="col q-pa-sm text-h6"> 'google-auth' in g.settings.authMethods ||
'github-auth' in g.settings.authMethods
"
class="col q-pa-sm text-h6"
>
<span v-text="$t('verify_email')"></span>: <span v-text="$t('verify_email')"></span>:
</div> </div>
{%endif%} {% if "google-auth" in LNBITS_AUTH_METHODS %} <div
<div class="col q-pa-sm"> v-if="'google-auth' in g.settings.authMethods"
class="col q-pa-sm"
>
<q-btn <q-btn
:href="`/api/v1/auth/google?user_id=${g.user.id}`" :href="`/api/v1/auth/google?user_id=${g.user.id}`"
type="a" type="a"
@@ -284,8 +289,10 @@
<div>Google</div> <div>Google</div>
</q-btn> </q-btn>
</div> </div>
{%endif%} {% if "github-auth" in LNBITS_AUTH_METHODS %} <div
<div class="col q-pa-sm"> v-if="'github-auth' in g.settings.authMethods"
class="col q-pa-sm"
>
<q-btn <q-btn
:href="`/api/v1/auth/github?user_id=${g.user.id}`" :href="`/api/v1/auth/github?user_id=${g.user.id}`"
type="a" type="a"
@@ -303,7 +310,6 @@
<div>GitHub</div> <div>GitHub</div>
</q-btn> </q-btn>
</div> </div>
{%endif%}
</div> </div>
</q-card-section> </q-card-section>
@@ -333,6 +339,16 @@
class="q-mb-md" class="q-mb-md"
> >
</q-input> </q-input>
<q-input
v-model="g.user.extra.visible_wallet_count"
:label="$t('visible_wallet_count')"
filled
dense
type="number"
class="q-mb-md"
></q-input>
<q-input <q-input
v-model="g.user.external_id" v-model="g.user.external_id"
:label="$t('external_id')" :label="$t('external_id')"
@@ -380,22 +396,11 @@
<span v-text="$t('language')"></span> <span v-text="$t('language')"></span>
</div> </div>
<div class="col-8"> <div class="col-8">
<lnbits-language-dropdown /> <lnbits-language-dropdown
</div> @language-changed="
</div> siteCustomisationChanged({locale: $event})
<div class="row q-mb-md"> "
<div class="col-4"> />
<span v-text="$t('visible_wallet_count')"></span>
</div>
<div class="col-8">
<q-input
v-model="g.user.extra.visible_wallet_count"
:label="$t('visible_wallet_count')"
filled
dense
type="number"
class="q-mb-md"
></q-input>
</div> </div>
</div> </div>
@@ -407,7 +412,9 @@
<q-btn <q-btn
v-for="theme in themeOptions" v-for="theme in themeOptions"
:key="theme.name" :key="theme.name"
@click="g.themeChoice = theme.name" @click="
siteCustomisationChanged({themeChoice: theme.name})
"
:color="theme.color" :color="theme.color"
dense dense
flat flat
@@ -427,6 +434,9 @@
<q-input <q-input
v-model="g.bgimageChoice" v-model="g.bgimageChoice"
:label="$t('background_image')" :label="$t('background_image')"
@update:model-value="
siteCustomisationChanged({bgimageChoice: $event})
"
> >
<q-tooltip <q-tooltip
><span v-text="$t('background_image')"></span ><span v-text="$t('background_image')"></span
@@ -445,6 +455,9 @@
round round
icon="gradient" icon="gradient"
v-model="g.gradientChoice" v-model="g.gradientChoice"
@update:model-value="
siteCustomisationChanged({gradientChoice: $event})
"
> >
<q-tooltip <q-tooltip
><span v-text="$t('toggle_gradient')"></span ><span v-text="$t('toggle_gradient')"></span
@@ -463,6 +476,9 @@
flat flat
round round
v-model="g.darkChoice" v-model="g.darkChoice"
@update:model-value="
siteCustomisationChanged({darkChoice: $event})
"
:icon="$q.dark.isActive ? 'brightness_3' : 'wb_sunny'" :icon="$q.dark.isActive ? 'brightness_3' : 'wb_sunny'"
size="sm" size="sm"
> >
@@ -481,6 +497,9 @@
v-model="g.borderChoice" v-model="g.borderChoice"
:options="borderOptions" :options="borderOptions"
label="Borders" label="Borders"
@update:model-value="
siteCustomisationChanged({borderChoice: $event})
"
> >
<q-tooltip <q-tooltip
><span v-text="$t('border_choices')"></span ><span v-text="$t('border_choices')"></span
@@ -495,7 +514,7 @@
<div class="col-8"> <div class="col-8">
<lnbits-notifications-btn <lnbits-notifications-btn
v-if="g.user" v-if="g.user"
pubkey="{{ WEBPUSH_PUBKEY }}" pubkey="g.settings.webpushPubkey"
></lnbits-notifications-btn> ></lnbits-notifications-btn>
</div> </div>
</div> </div>
@@ -508,6 +527,9 @@
v-model="g.reactionChoice" v-model="g.reactionChoice"
:options="reactionOptions" :options="reactionOptions"
label="Reactions" label="Reactions"
@update:model-value="
siteCustomisationChanged({reactionChoice: $event})
"
> >
<q-tooltip <q-tooltip
><span v-text="$t('payment_reactions')"></span ><span v-text="$t('payment_reactions')"></span
@@ -515,6 +537,17 @@
</q-select> </q-select>
</div> </div>
</div> </div>
<q-card-section>
<q-btn
@click="
siteCustomisationChanged(defaultSiteCustomisation)
"
:label="$t('reset_defaults')"
filled
color="primary"
class="float-right q-mb-md"
></q-btn>
</q-card-section>
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="notifications"> <q-tab-panel name="notifications">
<q-card-section> <q-card-section>
@@ -525,7 +558,7 @@
></span> ></span>
<br /> <br />
<q-badge <q-badge
v-if="!LNBITS_NOSTR_CONFIGURED" v-if="!g.settings.nostrConfigured"
v-text="$t('not_connected')" v-text="$t('not_connected')"
></q-badge> ></q-badge>
</div> </div>
@@ -545,7 +578,7 @@
<span v-text="$t('notifications_chat_id')"></span> <span v-text="$t('notifications_chat_id')"></span>
<br /> <br />
<q-badge <q-badge
v-if="!LNBITS_TELEGRAM_CONFIGURED" v-if="!g.settings.telegramConfigured"
v-text="$t('not_connected')" v-text="$t('not_connected')"
></q-badge> ></q-badge>
</div> </div>
+12
View File
@@ -53,6 +53,18 @@
@click="loginData.isPwdRepeat = !loginData.isPwdRepeat" @click="loginData.isPwdRepeat = !loginData.isPwdRepeat"
/> </template /> </template
></q-input> ></q-input>
<q-input
filled
v-model.trim="loginData.firstInstallToken"
:type="loginData.isPwd ? 'password' : 'text'"
:label="$t('first_install_token')"
><template v-slot:append>
<q-icon
:name="loginData.isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="loginData.isPwd = !loginData.isPwd"
/> </template
></q-input>
<q-btn <q-btn
@click="setPassword()" @click="setPassword()"
unelevated unelevated
+28 -15
View File
@@ -2,14 +2,14 @@
<div class="home row justify-center items-center"> <div class="home row justify-center items-center">
<div <div
class="full-width content-center" class="full-width content-center"
:style="`max-width: ${hasCustomImage ? '850' : '600'}px; min-height: 55vh;`" :style="`max-width: ${g.settings.customImage ? '850' : '600'}px; min-height: 55vh;`"
> >
<div v-if="showHomepageElements" class="row q-mb-md"> <div v-if="g.settings.showHomepageElements" class="row q-mb-md">
<div class="col-12"> <div class="col-12">
<div> <div>
<h5 v-text="siteTitle" class="q-my-none"></h5> <h5 v-text="g.settings.siteTitle" class="q-my-none"></h5>
<template v-if="$q.screen.gt.sm"> <template v-if="$q.screen.gt.sm">
<h6 class="q-my-sm" v-text="siteTagline"></h6> <h6 class="q-my-sm" v-text="g.settings.siteTagline"></h6>
<p class="q-my-sm" v-html="formatDescription"></p> <p class="q-my-sm" v-html="formatDescription"></p>
</template> </template>
</div> </div>
@@ -31,7 +31,10 @@
<div class="row"> <div class="row">
<div <div
class="col-12" class="col-12"
:class="{'col-sm-7': hasCustomImage, 'col-lg-6': hasCustomImage}" :class="{
'col-sm-7': g.settings.customImage,
'col-lg-6': g.settings.customImage
}"
> >
<div v-if="showClaimLnurl"> <div v-if="showClaimLnurl">
<q-card-section> <q-card-section>
@@ -54,8 +57,8 @@
<div v-else> <div v-else>
<username-password <username-password
v-if="authMethod != 'user-id-only'" v-if="authMethod != 'user-id-only'"
:allowed_new_users="allowRegister" :allowed_new_users="g.settings.allowRegister"
:auth-methods="LNBITS_AUTH_METHODS" :auth-methods="g.settings.authMethods"
:auth-action="authAction" :auth-action="authAction"
v-model:user-name="username" v-model:user-name="username"
v-model:password_1="password" v-model:password_1="password"
@@ -70,7 +73,7 @@
v-if="authAction !== 'reset'" v-if="authAction !== 'reset'"
> >
<p <p
v-if="authAction === 'login' && allowRegister" v-if="authAction === 'login' && g.settings.allowRegister"
class="q-mb-none" class="q-mb-none"
> >
Not registered? Not registered?
@@ -82,7 +85,9 @@
> >
</p> </p>
<p <p
v-else-if="authAction === 'login' && !allowRegister" v-else-if="
authAction === 'login' && !g.settings.allowRegister
"
class="q-mb-none" class="q-mb-none"
> >
<span v-text="$t('new_user_not_allowed')"></span> <span v-text="$t('new_user_not_allowed')"></span>
@@ -101,7 +106,7 @@
</username-password> </username-password>
<user-id-only <user-id-only
v-if="authMethod == 'user-id-only'" v-if="authMethod == 'user-id-only'"
:allowed_new_users="allowRegister" :allowed_new_users="g.settings.allowRegister"
v-model:usr="usr" v-model:usr="usr"
v-model:wallet="walletName" v-model:wallet="walletName"
:auth-action="authAction" :auth-action="authAction"
@@ -114,16 +119,20 @@
</user-id-only> </user-id-only>
</div> </div>
</div> </div>
<div v-if="hasCustomImage" class="col-sm-5 col-lg-6 gt-xs"> <div v-if="g.settings.customImage" class="col-sm-5 col-lg-6 gt-xs">
<div class="full-height flex flex-center q-pa-lg"> <div class="full-height flex flex-center q-pa-lg">
<q-img :src="hasCustomImage" :ratio="1" width="250px"></q-img> <q-img
:src="g.settings.customImage"
:ratio="1"
width="250px"
></q-img>
</div> </div>
</div> </div>
</div> </div>
</q-card> </q-card>
</div> </div>
<div v-if="showHomepageElements"> <div v-if="g.settings.showHomepageElements">
<div class="flex flex-center q-gutter-md q-py-md"> <div class="flex flex-center q-gutter-md q-py-md">
<q-btn <q-btn
outline outline
@@ -148,10 +157,14 @@
</div> </div>
<div <div
v-if="adsEnabled" v-if="g.settings.showAdSpace"
class="justify-center col-10 q-my-lg row q-col-gutter-sm" class="justify-center col-10 q-my-lg row q-col-gutter-sm"
> >
<a :href="ad[0]" v-for="ad in g.ads" class="lnbits-ad col-12 col-md-4"> <a
:href="ad[0]"
v-for="ad in g.settings.adSpace"
class="lnbits-ad col-12 col-md-4"
>
<q-img v-if="$q.dark.isActive" :src="ad[1]"></q-img> <q-img v-if="$q.dark.isActive" :src="ad[1]"></q-img>
<q-img v-else :src="ad[2]"></q-img> <q-img v-else :src="ad[2]"></q-img>
</a> </a>
+17 -4
View File
@@ -171,6 +171,19 @@
><span v-text="$t('camera_tooltip')"></span ><span v-text="$t('camera_tooltip')"></span
></q-tooltip> ></q-tooltip>
</q-btn> </q-btn>
<div
v-if="g.settings.walletFeaturedButtonUrl"
class="float-right q-mt-sm q-ml-sm"
>
<q-btn
color="primary"
:label="g.settings.walletFeaturedButtonLabel"
:icon="g.settings.walletFeaturedButtonIcon || undefined"
size="sm"
:to="g.settings.walletFeaturedButtonUrl"
>
</q-btn>
</div>
<lnbits-update-balance <lnbits-update-balance
v-if="$q.screen.gt.md" v-if="$q.screen.gt.md"
:wallet_id="this.g.wallet.id" :wallet_id="this.g.wallet.id"
@@ -199,10 +212,10 @@
@send-lnurl="handleSendLnurl" @send-lnurl="handleSendLnurl"
:chart-config="chartConfig" :chart-config="chartConfig"
></lnbits-wallet-extra> ></lnbits-wallet-extra>
<q-card class="lnbits-wallet-ads" v-if="AD_SPACE_ENABLED"> <q-card class="lnbits-wallet-ads" v-if="g.settings.showAdSpace">
<q-card-section class="text-subtitle1"> <q-card-section class="text-subtitle1">
<span v-text="AD_SPACE_TITLE"></span> <span v-text="g.settings.adSpaceTitle"></span>
<a :href="ad[0]" class="lnbits-ad" v-for="ad in g.ads"> <a :href="ad[0]" class="lnbits-ad" v-for="ad in g.settings.adSpace">
<q-img class="q-mb-xs" v-if="$q.dark.isActive" :src="ad[1]"></q-img> <q-img class="q-mb-xs" v-if="$q.dark.isActive" :src="ad[1]"></q-img>
<q-img class="q-mb-xs" v-else :src="ad[2]"></q-img> <q-img class="q-mb-xs" v-else :src="ad[2]"></q-img>
</a> </a>
@@ -276,7 +289,7 @@
></q-input> ></q-input>
</div> </div>
<q-input <q-input
v-if="has_holdinvoice" v-if="g.settings.hasHoldinvoice"
filled filled
dense dense
v-model="receive.data.payment_hash" v-model="receive.data.payment_hash"
+2 -4
View File
@@ -45,10 +45,8 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
const WINDOW_SETTINGS = {{ WINDOW_SETTINGS | tojson }} const SETTINGS = {{ SETTINGS | tojson | safe }}
Object.keys(WINDOW_SETTINGS).forEach(key => { const CURRENCIES = {{ CURRENCIES | tojson | safe }}
window[key] = WINDOW_SETTINGS[key]
})
</script> </script>
{% include('components.vue') %}{% block vue_templates %}{% endblock %} {% {% include('components.vue') %}{% block vue_templates %}{% endblock %} {%
for url in INCLUDED_JS %} for url in INCLUDED_JS %}
+7
View File
@@ -14,6 +14,13 @@ from lnbits.settings import settings
def log_server_info(): def log_server_info():
logger.info("LNbits Info") logger.info("LNbits Info")
if settings.first_install:
logger.success("This is a fresh install of LNbits.")
if settings.first_install_token:
logger.success(
f"FIRST_INSTALL_TOKEN: `{settings.first_install_token}`. "
"Please provide this token on /first_install."
)
logger.info(f"Version: {settings.version}") logger.info(f"Version: {settings.version}")
logger.info(f"Baseurl: {settings.lnbits_baseurl}") logger.info(f"Baseurl: {settings.lnbits_baseurl}")
logger.info(f"Host: {settings.host}") logger.info(f"Host: {settings.host}")
Generated
+1 -1
View File
@@ -4638,4 +4638,4 @@ migration = ["psycopg2-binary"]
[metadata] [metadata]
lock-version = "2.1" lock-version = "2.1"
python-versions = ">=3.10,<3.13" python-versions = ">=3.10,<3.13"
content-hash = "6c17d723baa390c36ecf6f861166878f2619acd47f878cf9253c5614ba25b9ea" content-hash = "f63a5be62359f837513e01a8b0e5282a3b4509ea97439ba0c8226ccf3c158ceb"
+1 -2
View File
@@ -1,6 +1,6 @@
[project] [project]
name = "lnbits" name = "lnbits"
version = "1.4.1" version = "1.4.2"
requires-python = ">=3.10,<3.13" requires-python = ">=3.10,<3.13"
description = "LNbits, free and open-source Lightning wallet and accounts system." description = "LNbits, free and open-source Lightning wallet and accounts system."
authors = [{ name = "Alan Bits", email = "alan@lnbits.com" }] authors = [{ name = "Alan Bits", email = "alan@lnbits.com" }]
@@ -9,7 +9,6 @@ readme = "README.md"
dependencies = [ dependencies = [
"bech32==1.2.0", "bech32==1.2.0",
"click==8.3.1", "click==8.3.1",
"ecdsa==0.19.1",
"fastapi==0.116.1", "fastapi==0.116.1",
"starlette==0.47.1", "starlette==0.47.1",
"httpx==0.27.2", "httpx==0.27.2",
+3 -9
View File
@@ -2016,9 +2016,7 @@ async def test_api_update_user_labels(http_client: AsyncClient):
] ]
data = UpdateUser(user_id=user.id, username=f"u{tiny_id}", extra=user.extra) data = UpdateUser(user_id=user.id, username=f"u{tiny_id}", extra=user.extra)
assert data.extra assert data.extra
response = await http_client.put( response = await http_client.patch("/api/v1/auth?usr=" + user.id, json=data.dict())
"/api/v1/auth/update?usr=" + user.id, json=data.dict()
)
assert response.status_code == 200 assert response.status_code == 200
user_data = response.json() user_data = response.json()
assert len(user_data["extra"]["labels"]) == 2 assert len(user_data["extra"]["labels"]) == 2
@@ -2028,18 +2026,14 @@ async def test_api_update_user_labels(http_client: AsyncClient):
assert user_data["extra"]["labels"][1]["color"] == "#00FF00" assert user_data["extra"]["labels"][1]["color"] == "#00FF00"
data.extra.labels = [] data.extra.labels = []
response = await http_client.put( response = await http_client.patch("/api/v1/auth?usr=" + user.id, json=data.dict())
"/api/v1/auth/update?usr=" + user.id, json=data.dict()
)
assert response.status_code == 200 assert response.status_code == 200
user_data = response.json() user_data = response.json()
assert len(user_data["extra"]["labels"]) == 0 assert len(user_data["extra"]["labels"]) == 0
json_data = data.dict() json_data = data.dict()
json_data["extra"] = {"labels": [{"name": "label + 01", "color": "#FF0000"}]} json_data["extra"] = {"labels": [{"name": "label + 01", "color": "#FF0000"}]}
response = await http_client.put( response = await http_client.patch("/api/v1/auth?usr=" + user.id, json=json_data)
"/api/v1/auth/update?usr=" + user.id, json=json_data
)
assert response.status_code == 400 assert response.status_code == 400
data = response.json() data = response.json()
+6 -2
View File
@@ -7,7 +7,11 @@ from lnbits import bolt11
from lnbits.core.crud import get_standalone_payment, update_payment from lnbits.core.crud import get_standalone_payment, update_payment
from lnbits.core.crud.wallets import create_wallet, get_wallet from lnbits.core.crud.wallets import create_wallet, get_wallet
from lnbits.core.models import CreateInvoice, Payment, PaymentState from lnbits.core.models import CreateInvoice, Payment, PaymentState
from lnbits.core.services import fee_reserve_total, get_balance_delta from lnbits.core.services import (
check_payment_status,
fee_reserve_total,
get_balance_delta,
)
from lnbits.core.services.payments import pay_invoice, update_wallet_balance from lnbits.core.services.payments import pay_invoice, update_wallet_balance
from lnbits.core.services.users import create_user_account from lnbits.core.services.users import create_user_account
from lnbits.exceptions import PaymentError from lnbits.exceptions import PaymentError
@@ -355,7 +359,7 @@ async def test_pay_hold_invoice_check_pending_and_fail_cancel_payment_task_in_me
assert payment_db_after_settlement is not None assert payment_db_after_settlement is not None
# payment is failed # payment is failed
status = await payment_db_after_settlement.check_status() status = await check_payment_status(payment_db_after_settlement)
assert not status.paid assert not status.paid
assert status.failed assert status.failed
+3 -3
View File
@@ -12,7 +12,7 @@ from lnbits.core.crud.wallets import create_wallet
from lnbits.core.models.payments import CreateInvoice, PaymentState from lnbits.core.models.payments import CreateInvoice, PaymentState
from lnbits.core.models.users import User from lnbits.core.models.users import User
from lnbits.core.models.wallets import Wallet from lnbits.core.models.wallets import Wallet
from lnbits.core.services import payments from lnbits.core.services import check_payment_status, payments
from lnbits.core.services.fiat_providers import ( from lnbits.core.services.fiat_providers import (
check_stripe_signature, check_stripe_signature,
handle_fiat_payment_confirmation, handle_fiat_payment_confirmation,
@@ -221,7 +221,7 @@ async def test_create_wallet_fiat_invoice_success(
assert payment.checking_id.startswith("fiat_stripe_") assert payment.checking_id.startswith("fiat_stripe_")
assert payment.fee <= 0 assert payment.fee <= 0
status = await payment.check_status() status = await check_payment_status(payment)
assert status.success is False assert status.success is False
assert status.pending is True assert status.pending is True
@@ -230,7 +230,7 @@ async def test_create_wallet_fiat_invoice_success(
"lnbits.fiat.StripeWallet.get_invoice_status", "lnbits.fiat.StripeWallet.get_invoice_status",
AsyncMock(return_value=fiat_mock_status), AsyncMock(return_value=fiat_mock_status),
) )
status = await payment.check_status() status = await check_payment_status(payment)
assert status.paid is True assert status.paid is True
assert status.success is True assert status.success is True
Generated
+1 -3
View File
@@ -1247,7 +1247,7 @@ wheels = [
[[package]] [[package]]
name = "lnbits" name = "lnbits"
version = "1.4.1" version = "1.4.2"
source = { editable = "." } source = { editable = "." }
dependencies = [ dependencies = [
{ name = "aiosqlite" }, { name = "aiosqlite" },
@@ -1256,7 +1256,6 @@ dependencies = [
{ name = "bech32" }, { name = "bech32" },
{ name = "bolt11" }, { name = "bolt11" },
{ name = "click" }, { name = "click" },
{ name = "ecdsa" },
{ name = "embit" }, { name = "embit" },
{ name = "fastapi" }, { name = "fastapi" },
{ name = "fastapi-sso" }, { name = "fastapi-sso" },
@@ -1340,7 +1339,6 @@ requires-dist = [
{ name = "breez-sdk", marker = "extra == 'breez'", specifier = "==0.8.0" }, { name = "breez-sdk", marker = "extra == 'breez'", specifier = "==0.8.0" },
{ name = "breez-sdk-liquid", marker = "extra == 'breez'", specifier = "==0.11.11" }, { name = "breez-sdk-liquid", marker = "extra == 'breez'", specifier = "==0.11.11" },
{ name = "click", specifier = "==8.3.1" }, { name = "click", specifier = "==8.3.1" },
{ name = "ecdsa", specifier = "==0.19.1" },
{ name = "embit", specifier = "==0.8.0" }, { name = "embit", specifier = "==0.8.0" },
{ name = "fastapi", specifier = "==0.116.1" }, { name = "fastapi", specifier = "==0.116.1" },
{ name = "fastapi-sso", specifier = "==0.19.0" }, { name = "fastapi-sso", specifier = "==0.19.0" },