Compare commits
64
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
18ce66e507 | ||
|
|
acce8d726b | ||
|
|
164e498476 | ||
|
|
48e0ca80bd | ||
|
|
0f4930f6c8 | ||
|
|
e0cade01c9 | ||
|
|
dd79dbc90b | ||
|
|
9e1ac86761 | ||
|
|
abfc8ebfb4 | ||
|
|
872c24e6ea | ||
|
|
6dcff91bf7 | ||
|
|
ef253de426 | ||
|
|
0819f51c3a | ||
|
|
d1cae5341f | ||
|
|
3b249fbad2 | ||
|
|
9648587850 | ||
|
|
a5523c1bf6 | ||
|
|
eb84621f23 | ||
|
|
b702229cb1 | ||
|
|
c722776bc0 | ||
|
|
bd7917ab20 | ||
|
|
db9006ea8b | ||
|
|
15f2048bcb | ||
|
|
b0079871b0 | ||
|
|
2bedcae9f1 | ||
|
|
341974fb35 | ||
|
|
d6bfbb0045 | ||
|
|
dc9338b991 | ||
|
|
6f6f7d4542 | ||
|
|
617f9c14ed | ||
|
|
54fdb0948c | ||
|
|
2fe7ab4f83 | ||
|
|
10c8ca4ca1 | ||
|
|
f079762b71 | ||
|
|
2e042d2597 | ||
|
|
49b57c9f0b | ||
|
|
656c6cac5b | ||
|
|
45e773b66f | ||
|
|
f692ac6f12 | ||
|
|
78202a027b | ||
|
|
28fa0906a6 | ||
|
|
91354f8be4 | ||
|
|
5f5d45e89f | ||
|
|
52bb125a25 | ||
|
|
2ca1ed897c | ||
|
|
631f4e8455 | ||
|
|
b22f88b264 | ||
|
|
c08bc02930 | ||
|
|
e020a7c5a0 | ||
|
|
d2e8914835 | ||
|
|
5e79ca35ab | ||
|
|
4690d178a2 | ||
|
|
c5825aa4c3 | ||
|
|
ebe0c4e3c3 | ||
|
|
383bdb6312 | ||
|
|
a947686d79 | ||
|
|
28e9d32b44 | ||
|
|
ef9adc077b | ||
|
|
ffad5d79c4 | ||
|
|
09c35eaca0 | ||
|
|
52adc62bc4 | ||
|
|
0efa173084 | ||
|
|
724f8c9f63 | ||
|
|
c6981089e5 |
@@ -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
|
||||||
|
|||||||
@@ -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 ]
|
||||||
|
|||||||
@@ -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 ]
|
||||||
|
|||||||
+76
-21
@@ -4,10 +4,12 @@ from typing import Any
|
|||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
from lnbits.core.crud.extensions import get_user_active_extensions_ids
|
from lnbits.core.crud.extensions import get_user_active_extensions_ids
|
||||||
from lnbits.core.crud.wallets import create_wallet, get_wallets
|
from lnbits.core.crud.wallets import clear_wallet_cache, create_wallet, get_wallets
|
||||||
from lnbits.core.db import db
|
from lnbits.core.db import db
|
||||||
from lnbits.core.models import UserAcls
|
from lnbits.core.models import UserAcls
|
||||||
from lnbits.db import Connection, Filters, Page
|
from lnbits.db import Connection, Filters, Page
|
||||||
|
from lnbits.helpers import sha256s
|
||||||
|
from lnbits.utils.cache import cache
|
||||||
|
|
||||||
from ..models import (
|
from ..models import (
|
||||||
Account,
|
Account,
|
||||||
@@ -41,6 +43,7 @@ async def delete_account(user_id: str, conn: Connection | None = None) -> None:
|
|||||||
"DELETE from accounts WHERE id = :user",
|
"DELETE from accounts WHERE id = :user",
|
||||||
{"user": user_id},
|
{"user": user_id},
|
||||||
)
|
)
|
||||||
|
await clear_user_id_cache(user_id)
|
||||||
|
|
||||||
|
|
||||||
async def get_accounts(
|
async def get_accounts(
|
||||||
@@ -69,6 +72,7 @@ async def get_accounts(
|
|||||||
accounts.email,
|
accounts.email,
|
||||||
accounts.pubkey,
|
accounts.pubkey,
|
||||||
accounts.external_id,
|
accounts.external_id,
|
||||||
|
accounts.activated,
|
||||||
SUM(COALESCE((
|
SUM(COALESCE((
|
||||||
SELECT balance FROM balances WHERE wallet_id = wallets.id
|
SELECT balance FROM balances WHERE wallet_id = wallets.id
|
||||||
), 0)) as balance_msat,
|
), 0)) as balance_msat,
|
||||||
@@ -93,12 +97,18 @@ async def get_accounts(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def get_account(user_id: str, conn: Connection | None = None) -> Account | None:
|
async def get_account(
|
||||||
|
user_id: str, active_only: bool = True, conn: Connection | None = None
|
||||||
|
) -> Account | None:
|
||||||
if len(user_id) == 0:
|
if len(user_id) == 0:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
return await (conn or db).fetchone(
|
return await (conn or db).fetchone(
|
||||||
"SELECT * FROM accounts WHERE id = :id",
|
"""
|
||||||
{"id": user_id},
|
SELECT * FROM accounts
|
||||||
|
WHERE id = :id AND (activated = true OR activated = :activated)
|
||||||
|
""",
|
||||||
|
{"id": user_id, "activated": active_only},
|
||||||
Account,
|
Account,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -124,55 +134,79 @@ async def delete_accounts_no_wallets(
|
|||||||
|
|
||||||
|
|
||||||
async def get_account_by_username(
|
async def get_account_by_username(
|
||||||
username: str, conn: Connection | None = None
|
username: str, active_only: bool = True, conn: Connection | None = None
|
||||||
) -> Account | None:
|
) -> Account | None:
|
||||||
if len(username) == 0:
|
if len(username) == 0:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
return await (conn or db).fetchone(
|
return await (conn or db).fetchone(
|
||||||
"SELECT * FROM accounts WHERE LOWER(username) = :username",
|
"""
|
||||||
{"username": username.lower()},
|
SELECT * FROM accounts
|
||||||
|
WHERE
|
||||||
|
LOWER(username) = :username
|
||||||
|
AND (activated = true OR activated = :activated)
|
||||||
|
""",
|
||||||
|
{"username": username.lower(), "activated": active_only},
|
||||||
Account,
|
Account,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def get_account_by_pubkey(
|
async def get_account_by_pubkey(
|
||||||
pubkey: str, conn: Connection | None = None
|
pubkey: str, active_only: bool = True, conn: Connection | None = None
|
||||||
) -> Account | None:
|
) -> Account | None:
|
||||||
return await (conn or db).fetchone(
|
return await (conn or db).fetchone(
|
||||||
"SELECT * FROM accounts WHERE LOWER(pubkey) = :pubkey",
|
"""
|
||||||
{"pubkey": pubkey.lower()},
|
SELECT * FROM accounts
|
||||||
|
WHERE
|
||||||
|
LOWER(pubkey) = :pubkey
|
||||||
|
AND (activated = true OR activated = :activated)
|
||||||
|
""",
|
||||||
|
{"pubkey": pubkey.lower(), "activated": active_only},
|
||||||
Account,
|
Account,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def get_account_by_email(
|
async def get_account_by_email(
|
||||||
email: str, conn: Connection | None = None
|
email: str, active_only: bool = True, conn: Connection | None = None
|
||||||
) -> Account | None:
|
) -> Account | None:
|
||||||
if len(email) == 0:
|
if len(email) == 0:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
return await (conn or db).fetchone(
|
return await (conn or db).fetchone(
|
||||||
"SELECT * FROM accounts WHERE LOWER(email) = :email",
|
"""
|
||||||
{"email": email.lower()},
|
SELECT * FROM accounts
|
||||||
|
WHERE
|
||||||
|
LOWER(email) = :email
|
||||||
|
AND (activated = true OR activated = :activated)
|
||||||
|
""",
|
||||||
|
{"email": email.lower(), "activated": active_only},
|
||||||
Account,
|
Account,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def get_account_by_username_or_email(
|
async def get_account_by_username_or_email(
|
||||||
username_or_email: str, conn: Connection | None = None
|
username_or_email: str,
|
||||||
|
active_only: bool = True,
|
||||||
|
conn: Connection | None = None,
|
||||||
) -> Account | None:
|
) -> Account | None:
|
||||||
|
|
||||||
return await (conn or db).fetchone(
|
return await (conn or db).fetchone(
|
||||||
"""
|
"""
|
||||||
SELECT * FROM accounts
|
SELECT * FROM accounts
|
||||||
WHERE LOWER(email) = :value or LOWER(username) = :value
|
WHERE
|
||||||
|
(LOWER(email) = :value or LOWER(username) = :value)
|
||||||
|
AND (activated = true OR activated = :activated)
|
||||||
""",
|
""",
|
||||||
{"value": username_or_email.lower()},
|
{"value": username_or_email.lower(), "activated": active_only},
|
||||||
Account,
|
Account,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def get_user(user_id: str, conn: Connection | None = None) -> User | None:
|
async def get_user(
|
||||||
|
user_id: str, active_only: bool = True, conn: Connection | None = None
|
||||||
|
) -> User | None:
|
||||||
async with db.reuse_conn(conn) if conn else db.connect() as conn:
|
async with db.reuse_conn(conn) if conn else db.connect() as conn:
|
||||||
account = await get_account(user_id, conn=conn)
|
account = await get_account(user_id, active_only, conn=conn)
|
||||||
if not account:
|
if not account:
|
||||||
return None
|
return None
|
||||||
return await get_user_from_account(account, conn=conn)
|
return await get_user_from_account(account, conn=conn)
|
||||||
@@ -191,6 +225,7 @@ async def get_user_from_account(
|
|||||||
|
|
||||||
return User(
|
return User(
|
||||||
id=account.id,
|
id=account.id,
|
||||||
|
activated=account.activated,
|
||||||
email=account.email,
|
email=account.email,
|
||||||
username=account.username,
|
username=account.username,
|
||||||
pubkey=account.pubkey,
|
pubkey=account.pubkey,
|
||||||
@@ -204,6 +239,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 {},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -215,12 +251,31 @@ async def update_user_access_control_list(
|
|||||||
|
|
||||||
|
|
||||||
async def get_user_access_control_lists(
|
async def get_user_access_control_lists(
|
||||||
user_id: str, conn: Connection | None = None
|
user_id: str, active_only: bool = True, conn: Connection | None = None
|
||||||
) -> UserAcls:
|
) -> UserAcls:
|
||||||
user_acls = await (conn or db).fetchone(
|
user_acls = await (conn or db).fetchone(
|
||||||
"SELECT id, access_control_list FROM accounts WHERE id = :id",
|
"""
|
||||||
{"id": user_id},
|
SELECT id, access_control_list FROM accounts
|
||||||
|
WHERE id = :user_id AND (activated = true OR activated = :activated)
|
||||||
|
""",
|
||||||
|
{"user_id": user_id, "activated": active_only},
|
||||||
UserAcls,
|
UserAcls,
|
||||||
)
|
)
|
||||||
|
|
||||||
return user_acls or UserAcls(id=user_id)
|
return user_acls or UserAcls(id=user_id)
|
||||||
|
|
||||||
|
|
||||||
|
async def clear_user_id_cache(user_id: str):
|
||||||
|
user = await get_user(user_id, active_only=True)
|
||||||
|
if user:
|
||||||
|
clear_user_cache(user)
|
||||||
|
|
||||||
|
|
||||||
|
def clear_user_cache(user: User):
|
||||||
|
user_cache_key: str | None = cache.pop(
|
||||||
|
f"auth:user:cache_key:{sha256s(user.id)}", None
|
||||||
|
)
|
||||||
|
if user_cache_key:
|
||||||
|
cache.pop(user_cache_key)
|
||||||
|
for wallet in user.wallets:
|
||||||
|
clear_wallet_cache(wallet)
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ async def delete_wallet(
|
|||||||
deleted: bool = True,
|
deleted: bool = True,
|
||||||
conn: Connection | None = None,
|
conn: Connection | None = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
_clear_wallet_cache(wallet_id)
|
clear_wallet_id_cache(wallet_id)
|
||||||
now = int(time())
|
now = int(time())
|
||||||
|
|
||||||
await (conn or db).execute(
|
await (conn or db).execute(
|
||||||
@@ -65,7 +65,7 @@ async def delete_wallet(
|
|||||||
|
|
||||||
|
|
||||||
async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) -> None:
|
async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) -> None:
|
||||||
_clear_wallet_cache(wallet_id)
|
clear_wallet_id_cache(wallet_id)
|
||||||
await (conn or db).execute(
|
await (conn or db).execute(
|
||||||
"DELETE FROM wallets WHERE id = :wallet",
|
"DELETE FROM wallets WHERE id = :wallet",
|
||||||
{"wallet": wallet_id},
|
{"wallet": wallet_id},
|
||||||
@@ -75,7 +75,7 @@ async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) ->
|
|||||||
async def delete_wallet_by_id(
|
async def delete_wallet_by_id(
|
||||||
wallet_id: str, conn: Connection | None = None
|
wallet_id: str, conn: Connection | None = None
|
||||||
) -> int | None:
|
) -> int | None:
|
||||||
_clear_wallet_cache(wallet_id)
|
clear_wallet_id_cache(wallet_id)
|
||||||
now = int(time())
|
now = int(time())
|
||||||
result = await (conn or db).execute(
|
result = await (conn or db).execute(
|
||||||
# Timestamp placeholder is safe from SQL injection (not user input)
|
# Timestamp placeholder is safe from SQL injection (not user input)
|
||||||
@@ -226,11 +226,14 @@ async def get_wallet_for_key(
|
|||||||
) -> Wallet | None:
|
) -> Wallet | None:
|
||||||
wallet = await (conn or db).fetchone(
|
wallet = await (conn or db).fetchone(
|
||||||
"""
|
"""
|
||||||
SELECT *, COALESCE((
|
SELECT wallets.*, COALESCE((
|
||||||
SELECT balance FROM balances WHERE wallet_id = wallets.id
|
SELECT balance FROM balances WHERE wallet_id = wallets.id
|
||||||
), 0)
|
), 0)
|
||||||
AS balance_msat FROM wallets
|
AS balance_msat FROM wallets
|
||||||
WHERE (adminkey = :key OR inkey = :key) AND deleted = false
|
INNER JOIN accounts ON wallets.user = accounts.id
|
||||||
|
WHERE (adminkey = :key OR inkey = :key)
|
||||||
|
AND deleted = false
|
||||||
|
AND accounts.activated = true
|
||||||
""",
|
""",
|
||||||
{"key": key},
|
{"key": key},
|
||||||
Wallet,
|
Wallet,
|
||||||
@@ -250,8 +253,11 @@ async def get_base_wallet_for_key(
|
|||||||
) -> BaseWallet | None:
|
) -> BaseWallet | None:
|
||||||
wallet = await (conn or db).fetchone(
|
wallet = await (conn or db).fetchone(
|
||||||
"""
|
"""
|
||||||
SELECT id, "user", wallet_type, adminkey, inkey FROM wallets
|
SELECT wallets.id, "user", wallet_type, adminkey, inkey FROM wallets
|
||||||
WHERE (adminkey = :key OR inkey = :key) AND deleted = false
|
INNER JOIN accounts ON wallets.user = accounts.id
|
||||||
|
WHERE (adminkey = :key OR inkey = :key)
|
||||||
|
AND deleted = false
|
||||||
|
AND accounts.activated = true
|
||||||
""",
|
""",
|
||||||
{"key": key},
|
{"key": key},
|
||||||
BaseWallet,
|
BaseWallet,
|
||||||
@@ -294,8 +300,14 @@ async def get_total_balance(conn: Connection | None = None):
|
|||||||
return row.get("balance", 0) or 0
|
return row.get("balance", 0) or 0
|
||||||
|
|
||||||
|
|
||||||
def _clear_wallet_cache(wallet_id):
|
def clear_wallet_id_cache(wallet_id: str):
|
||||||
cached_wallet: BaseWallet | None = cache.pop(f"auth:wallet:{wallet_id}")
|
cached_wallet: BaseWallet | None = cache.pop(f"auth:wallet:{wallet_id}")
|
||||||
if cached_wallet:
|
if cached_wallet:
|
||||||
cache.pop(f"auth:x-api-key:{cached_wallet.adminkey}")
|
cache.pop(f"auth:x-api-key:{cached_wallet.adminkey}")
|
||||||
cache.pop(f"auth:x-api-key:{cached_wallet.inkey}")
|
cache.pop(f"auth:x-api-key:{cached_wallet.inkey}")
|
||||||
|
|
||||||
|
|
||||||
|
def clear_wallet_cache(wallet: Wallet):
|
||||||
|
cache.pop(f"auth:wallet:{wallet.id}")
|
||||||
|
cache.pop(f"auth:x-api-key:{wallet.adminkey}")
|
||||||
|
cache.pop(f"auth:x-api-key:{wallet.inkey}")
|
||||||
|
|||||||
@@ -848,3 +848,19 @@ 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")
|
||||||
|
|
||||||
|
|
||||||
|
async def m044_add_activated_to_accounts(db: Connection):
|
||||||
|
"""
|
||||||
|
Adds activated column to accounts.
|
||||||
|
Used for account activation status.
|
||||||
|
"""
|
||||||
|
await db.execute("ALTER TABLE accounts ADD COLUMN activated BOOLEAN DEFAULT true")
|
||||||
|
|||||||
@@ -269,10 +269,30 @@ class ExtensionRelease(BaseModel):
|
|||||||
async def get_github_releases(cls, org: str, repo: str) -> list[ExtensionRelease]:
|
async def get_github_releases(cls, org: str, repo: str) -> list[ExtensionRelease]:
|
||||||
try:
|
try:
|
||||||
github_releases = await cls.fetch_github_releases(org, repo)
|
github_releases = await cls.fetch_github_releases(org, repo)
|
||||||
return [
|
extension_releases = [
|
||||||
ExtensionRelease.from_github_release(f"{org}/{repo}", r)
|
ExtensionRelease.from_github_release(f"{org}/{repo}", r)
|
||||||
for r in github_releases
|
for r in github_releases
|
||||||
]
|
]
|
||||||
|
for release in extension_releases:
|
||||||
|
if not release.details_link:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
config = await ExtensionConfig.fetch_github_release_config(
|
||||||
|
org, repo, release.version
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(e)
|
||||||
|
config = None
|
||||||
|
if not config:
|
||||||
|
continue
|
||||||
|
|
||||||
|
release.min_lnbits_version = config.min_lnbits_version
|
||||||
|
release.max_lnbits_version = config.max_lnbits_version
|
||||||
|
release.is_version_compatible = config.is_version_compatible()
|
||||||
|
|
||||||
|
release.icon = icon_to_github_url(f"{org}/{repo}", config.tile)
|
||||||
|
|
||||||
|
return extension_releases
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(e)
|
logger.warning(e)
|
||||||
return []
|
return []
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
import random
|
||||||
|
import uuid
|
||||||
from datetime import datetime, timedelta, timezone
|
from datetime import datetime, timedelta, timezone
|
||||||
from typing import Any, Literal
|
from typing import Any, Literal
|
||||||
|
|
||||||
@@ -55,6 +57,29 @@ class DataField(BaseModel):
|
|||||||
field_type += ' = "sat"'
|
field_type += ' = "sat"'
|
||||||
return f"{field_name}: {field_type}"
|
return f"{field_name}: {field_type}"
|
||||||
|
|
||||||
|
def field_to_random_value(self) -> str:
|
||||||
|
field_name = camel_to_snake(self.name)
|
||||||
|
field_value: Any = f'"{self.type}"'
|
||||||
|
if self.type == "json":
|
||||||
|
field_value = '"{}"'
|
||||||
|
elif self.type == "wallet":
|
||||||
|
field_value = f'"{uuid.uuid4()}"'
|
||||||
|
elif self.type == "currency":
|
||||||
|
field_value = '"sat"'
|
||||||
|
elif self.type in ["str", "text"]:
|
||||||
|
field_value = f'"{field_name}_{urlsafe_short_hash()}"'
|
||||||
|
elif self.type == "int":
|
||||||
|
field_value = random.randint(1, 100) # noqa: S311
|
||||||
|
elif self.type == "float":
|
||||||
|
field_value = random.uniform(1.0, 100.0) # noqa: S311
|
||||||
|
elif self.type == "bool":
|
||||||
|
field_value = random.choice([True, False]) # noqa: S311
|
||||||
|
elif self.type == "datetime":
|
||||||
|
random_days = random.randint(-30, 30) # noqa: S311
|
||||||
|
random_date = datetime.now(timezone.utc) - timedelta(days=random_days)
|
||||||
|
field_value = f"""datetime.fromisoformat("{random_date.isoformat()}")"""
|
||||||
|
return f"{field_name} = {field_value},"
|
||||||
|
|
||||||
def field_to_js(self) -> str:
|
def field_to_js(self) -> str:
|
||||||
field_name = camel_to_snake(self.name)
|
field_name = camel_to_snake(self.name)
|
||||||
default_value = "null"
|
default_value = "null"
|
||||||
|
|||||||
@@ -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):
|
||||||
|
|||||||
@@ -181,12 +181,14 @@ class AccountId(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class Account(AccountId):
|
class Account(AccountId):
|
||||||
|
activated: bool = True
|
||||||
external_id: str | None = None # for external account linking
|
external_id: str | None = None # for external account linking
|
||||||
username: str | None = None
|
username: str | None = None
|
||||||
password_hash: str | None = None
|
password_hash: str | None = None
|
||||||
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))
|
||||||
@@ -240,6 +242,7 @@ class Account(AccountId):
|
|||||||
|
|
||||||
|
|
||||||
class AccountOverview(Account):
|
class AccountOverview(Account):
|
||||||
|
activated: bool = True
|
||||||
transaction_count: int | None = 0
|
transaction_count: int | None = 0
|
||||||
wallet_count: int | None = 0
|
wallet_count: int | None = 0
|
||||||
balance_msat: int | None = 0
|
balance_msat: int | None = 0
|
||||||
@@ -275,6 +278,7 @@ class AccountFilters(FilterModel):
|
|||||||
|
|
||||||
class User(BaseModel):
|
class User(BaseModel):
|
||||||
id: str
|
id: str
|
||||||
|
activated: bool = True
|
||||||
created_at: datetime
|
created_at: datetime
|
||||||
updated_at: datetime
|
updated_at: datetime
|
||||||
email: str | None = None
|
email: str | None = None
|
||||||
@@ -288,6 +292,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]:
|
||||||
@@ -313,6 +318,7 @@ class RegisterUser(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)
|
||||||
|
invitation_code: str | None = Query(default=None, min_length=1, max_length=256)
|
||||||
|
|
||||||
|
|
||||||
class CreateUser(BaseModel):
|
class CreateUser(BaseModel):
|
||||||
@@ -356,6 +362,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):
|
||||||
|
|||||||
@@ -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",
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import io
|
|||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
from fastapi import UploadFile
|
from fastapi import UploadFile
|
||||||
|
from loguru import logger
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
|
|
||||||
from lnbits.core.crud.assets import create_asset, get_user_assets_count
|
from lnbits.core.crud.assets import create_asset, get_user_assets_count
|
||||||
@@ -29,17 +30,7 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
|
|||||||
f"File limit of {settings.lnbits_max_asset_size_mb}MB exceeded."
|
f"File limit of {settings.lnbits_max_asset_size_mb}MB exceeded."
|
||||||
)
|
)
|
||||||
|
|
||||||
image = Image.open(io.BytesIO(contents))
|
thumb_buffer = thumbnail_from_bytes(contents)
|
||||||
|
|
||||||
thumbnail_width = min(256, settings.lnbits_asset_thumbnail_width)
|
|
||||||
thumbnail_height = min(256, settings.lnbits_asset_thumbnail_height)
|
|
||||||
image.thumbnail((thumbnail_width, thumbnail_height))
|
|
||||||
|
|
||||||
# Save thumbnail to an in-memory buffer
|
|
||||||
thumb_buffer = io.BytesIO()
|
|
||||||
thumbnail_format = settings.lnbits_asset_thumbnail_format or "PNG"
|
|
||||||
image.save(thumb_buffer, format=thumbnail_format)
|
|
||||||
thumb_buffer.seek(0)
|
|
||||||
|
|
||||||
asset = Asset(
|
asset = Asset(
|
||||||
id=uuid4().hex,
|
id=uuid4().hex,
|
||||||
@@ -48,9 +39,32 @@ async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) ->
|
|||||||
is_public=is_public,
|
is_public=is_public,
|
||||||
name=file.filename or "unnamed",
|
name=file.filename or "unnamed",
|
||||||
size_bytes=len(contents),
|
size_bytes=len(contents),
|
||||||
thumbnail_base64=base64.b64encode(thumb_buffer.getvalue()).decode("utf-8"),
|
thumbnail_base64=(
|
||||||
|
base64.b64encode(thumb_buffer.getvalue()).decode("utf-8")
|
||||||
|
if thumb_buffer
|
||||||
|
else None
|
||||||
|
),
|
||||||
data=contents,
|
data=contents,
|
||||||
)
|
)
|
||||||
|
|
||||||
await create_asset(asset)
|
await create_asset(asset)
|
||||||
return asset
|
return asset
|
||||||
|
|
||||||
|
|
||||||
|
def thumbnail_from_bytes(contents: bytes) -> io.BytesIO | None:
|
||||||
|
try:
|
||||||
|
image = Image.open(io.BytesIO(contents))
|
||||||
|
|
||||||
|
thumbnail_width = min(256, settings.lnbits_asset_thumbnail_width)
|
||||||
|
thumbnail_height = min(256, settings.lnbits_asset_thumbnail_height)
|
||||||
|
image.thumbnail((thumbnail_width, thumbnail_height))
|
||||||
|
|
||||||
|
# Save thumbnail to an in-memory buffer
|
||||||
|
thumb_buffer = io.BytesIO()
|
||||||
|
thumbnail_format = settings.lnbits_asset_thumbnail_format or "PNG"
|
||||||
|
image.save(thumb_buffer, format=thumbnail_format)
|
||||||
|
thumb_buffer.seek(0)
|
||||||
|
return thumb_buffer
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning(f"Failed to create thumbnail: {exc}")
|
||||||
|
return None
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ from lnbits.helpers import (
|
|||||||
camel_to_words,
|
camel_to_words,
|
||||||
download_url,
|
download_url,
|
||||||
lowercase_first_letter,
|
lowercase_first_letter,
|
||||||
|
snake_to_camel,
|
||||||
)
|
)
|
||||||
from lnbits.settings import settings
|
from lnbits.settings import settings
|
||||||
|
|
||||||
@@ -195,13 +196,29 @@ def _copy_ext_stub_to_build_dir(
|
|||||||
ext_build_dir = Path(working_dir, new_ext_id, working_dir_name, new_ext_id)
|
ext_build_dir = Path(working_dir, new_ext_id, working_dir_name, new_ext_id)
|
||||||
shutil.rmtree(ext_build_dir, True)
|
shutil.rmtree(ext_build_dir, True)
|
||||||
|
|
||||||
shutil.copytree(ext_stub_cache_dir, ext_build_dir)
|
shutil.copytree(
|
||||||
|
ext_stub_cache_dir,
|
||||||
|
ext_build_dir,
|
||||||
|
ignore=shutil.ignore_patterns(
|
||||||
|
"__pycache__",
|
||||||
|
".git",
|
||||||
|
".env",
|
||||||
|
".venv",
|
||||||
|
"*.env",
|
||||||
|
"*.log",
|
||||||
|
"node_modules",
|
||||||
|
".mypy_cache",
|
||||||
|
".pytest_cache",
|
||||||
|
".ruff_cache",
|
||||||
|
),
|
||||||
|
)
|
||||||
return ext_build_dir
|
return ext_build_dir
|
||||||
|
|
||||||
|
|
||||||
def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None:
|
def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None:
|
||||||
parsed_data = _parse_extension_data(data)
|
parsed_data = _parse_extension_data(data)
|
||||||
for py_file in py_files:
|
test_files = [f"tests/{p.name}" for p in Path(ext_stub_dir, "tests").glob("*.py")]
|
||||||
|
for py_file in py_files + test_files:
|
||||||
template_path = Path(ext_stub_dir, py_file).as_posix()
|
template_path = Path(ext_stub_dir, py_file).as_posix()
|
||||||
rederer = _render_file(template_path, parsed_data)
|
rederer = _render_file(template_path, parsed_data)
|
||||||
with open(template_path, "w", encoding="utf-8") as f:
|
with open(template_path, "w", encoding="utf-8") as f:
|
||||||
@@ -209,7 +226,7 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
|
|||||||
|
|
||||||
_remove_lines_with_string(template_path, remove_line_marker)
|
_remove_lines_with_string(template_path, remove_line_marker)
|
||||||
|
|
||||||
template_path = Path(ext_stub_dir, "static", "js", "index.js").as_posix()
|
template_path = Path(ext_stub_dir, "static", "index.js").as_posix()
|
||||||
rederer = _render_file(
|
rederer = _render_file(
|
||||||
template_path, {"preview": data.preview_action, **parsed_data}
|
template_path, {"preview": data.preview_action, **parsed_data}
|
||||||
)
|
)
|
||||||
@@ -234,9 +251,7 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
|
|||||||
"settingsFormDialog.data",
|
"settingsFormDialog.data",
|
||||||
ext_stub_dir,
|
ext_stub_dir,
|
||||||
)
|
)
|
||||||
template_path = Path(
|
template_path = Path(ext_stub_dir, "static", "index.vue").as_posix()
|
||||||
ext_stub_dir, "templates", "extension_builder_stub", "index.html"
|
|
||||||
).as_posix()
|
|
||||||
rederer = _render_file(
|
rederer = _render_file(
|
||||||
template_path,
|
template_path,
|
||||||
{
|
{
|
||||||
@@ -263,12 +278,12 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
|
|||||||
"publicClientData",
|
"publicClientData",
|
||||||
ext_stub_dir,
|
ext_stub_dir,
|
||||||
)
|
)
|
||||||
public_template_path = Path(
|
public_template_path = Path(ext_stub_dir, "static", "public_page.vue")
|
||||||
ext_stub_dir, "templates", "extension_builder_stub", "public_page.html"
|
public_component_path = Path(ext_stub_dir, "static", "public_page.js")
|
||||||
)
|
|
||||||
template_path = public_template_path.as_posix()
|
template_path = public_template_path.as_posix()
|
||||||
if not data.public_page.has_public_page:
|
if not data.public_page.has_public_page:
|
||||||
public_template_path.unlink(missing_ok=True)
|
public_template_path.unlink(missing_ok=True)
|
||||||
|
public_component_path.unlink(missing_ok=True)
|
||||||
else:
|
else:
|
||||||
rederer = _render_file(
|
rederer = _render_file(
|
||||||
template_path,
|
template_path,
|
||||||
@@ -308,8 +323,10 @@ def zip_directory(source_dir, zip_path):
|
|||||||
|
|
||||||
def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) -> None:
|
def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) -> None:
|
||||||
extension_dir_path = extension_dir.as_posix()
|
extension_dir_path = extension_dir.as_posix()
|
||||||
|
# the order of fields is important, do not chage
|
||||||
rename_values = {
|
rename_values = {
|
||||||
"extension_builder_stub_name": data.name,
|
"extension_builder_stub_name": data.name,
|
||||||
|
"extension_builder_stub_camel_name": snake_to_camel(data.id, True),
|
||||||
"extension_builder_stub_short_description": data.short_description or "",
|
"extension_builder_stub_short_description": data.short_description or "",
|
||||||
"extension_builder_stub": data.id,
|
"extension_builder_stub": data.id,
|
||||||
"OwnerData": data.owner_data.name,
|
"OwnerData": data.owner_data.name,
|
||||||
@@ -328,7 +345,7 @@ def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) ->
|
|||||||
directory=extension_dir_path,
|
directory=extension_dir_path,
|
||||||
old_text=old_text,
|
old_text=old_text,
|
||||||
new_text=new_text,
|
new_text=new_text,
|
||||||
file_extensions=[".py", ".js", ".html", ".md", ".json", ".toml"],
|
file_extensions=[".py", ".js", ".vue", ".html", ".md", ".json", ".toml"],
|
||||||
)
|
)
|
||||||
|
|
||||||
_rename_files_and_dirs_in_directory(
|
_rename_files_and_dirs_in_directory(
|
||||||
@@ -406,6 +423,7 @@ def _parse_extension_data(data: ExtensionData) -> dict:
|
|||||||
"owner_data": {
|
"owner_data": {
|
||||||
"name": data.owner_data.name,
|
"name": data.owner_data.name,
|
||||||
"editable": data.owner_data.editable,
|
"editable": data.owner_data.editable,
|
||||||
|
"fields": [field.name for field in data.owner_data.fields],
|
||||||
"js_fields": [
|
"js_fields": [
|
||||||
field.field_to_js()
|
field.field_to_js()
|
||||||
for field in data.owner_data.fields
|
for field in data.owner_data.fields
|
||||||
@@ -432,6 +450,18 @@ def _parse_extension_data(data: ExtensionData) -> dict:
|
|||||||
],
|
],
|
||||||
"db_fields": [field.field_to_db() for field in data.owner_data.fields],
|
"db_fields": [field.field_to_db() for field in data.owner_data.fields],
|
||||||
"all_fields": [field.field_to_py() for field in data.owner_data.fields],
|
"all_fields": [field.field_to_py() for field in data.owner_data.fields],
|
||||||
|
"random_fields_values": [
|
||||||
|
field.field_to_random_value() for field in data.owner_data.fields
|
||||||
|
],
|
||||||
|
"public_fields": [
|
||||||
|
field.field_to_py()
|
||||||
|
for field in data.owner_data.fields
|
||||||
|
if field.name
|
||||||
|
in [
|
||||||
|
data.public_page.owner_data_fields.name,
|
||||||
|
data.public_page.owner_data_fields.description,
|
||||||
|
]
|
||||||
|
],
|
||||||
},
|
},
|
||||||
"client_data": {
|
"client_data": {
|
||||||
"name": data.client_data.name,
|
"name": data.client_data.name,
|
||||||
@@ -457,6 +487,9 @@ def _parse_extension_data(data: ExtensionData) -> dict:
|
|||||||
],
|
],
|
||||||
"db_fields": [field.field_to_db() for field in data.client_data.fields],
|
"db_fields": [field.field_to_db() for field in data.client_data.fields],
|
||||||
"all_fields": [field.field_to_py() for field in data.client_data.fields],
|
"all_fields": [field.field_to_py() for field in data.client_data.fields],
|
||||||
|
"random_fields_values": [
|
||||||
|
field.field_to_random_value() for field in data.client_data.fields
|
||||||
|
],
|
||||||
},
|
},
|
||||||
"settings_data": {
|
"settings_data": {
|
||||||
"enabled": data.settings_data.enabled,
|
"enabled": data.settings_data.enabled,
|
||||||
@@ -536,7 +569,7 @@ def _rename_files_and_dirs_in_directory(directory, old_text, new_text):
|
|||||||
logger.warning(f"Failed to rename directory {old_dir_path}: {e}")
|
logger.warning(f"Failed to rename directory {old_dir_path}: {e}")
|
||||||
|
|
||||||
|
|
||||||
def _is_excluded_dir(path):
|
def _is_excluded_dir(path: str) -> bool:
|
||||||
for excluded_dir in excluded_dirs:
|
for excluded_dir in excluded_dirs:
|
||||||
if path.startswith(excluded_dir):
|
if path.startswith(excluded_dir):
|
||||||
return True
|
return True
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -3,8 +3,10 @@ from uuid import uuid4
|
|||||||
|
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
|
|
||||||
|
from lnbits.core.crud.settings import set_settings_field
|
||||||
from lnbits.core.db import db
|
from lnbits.core.db import db
|
||||||
from lnbits.core.models.extensions import UserExtension
|
from lnbits.core.models.extensions import UserExtension
|
||||||
|
from lnbits.core.models.users import RegisterUser
|
||||||
from lnbits.db import Connection
|
from lnbits.db import Connection
|
||||||
from lnbits.settings import (
|
from lnbits.settings import (
|
||||||
EditableSettings,
|
EditableSettings,
|
||||||
@@ -192,3 +194,25 @@ async def init_admin_settings(super_user: str | None = None) -> SuperSettings:
|
|||||||
|
|
||||||
editable_settings = EditableSettings.from_dict(settings.dict())
|
editable_settings = EditableSettings.from_dict(settings.dict())
|
||||||
return await create_admin_settings(account.id, editable_settings.dict())
|
return await create_admin_settings(account.id, editable_settings.dict())
|
||||||
|
|
||||||
|
|
||||||
|
async def check_register_activation_settings(data: RegisterUser):
|
||||||
|
if not settings.lnbits_require_user_activation:
|
||||||
|
return None
|
||||||
|
if settings.lnbits_user_activation_by_invitation_code:
|
||||||
|
code = data.invitation_code.strip() if data.invitation_code else ""
|
||||||
|
if len(code) == 0:
|
||||||
|
raise ValueError("Invitation code cannot be empty.")
|
||||||
|
|
||||||
|
if code == settings.lnbits_register_reusable_activation_code:
|
||||||
|
return None
|
||||||
|
if code in settings.lnbits_register_one_time_activation_codes:
|
||||||
|
settings.lnbits_register_one_time_activation_codes.remove(code)
|
||||||
|
await set_settings_field(
|
||||||
|
"lnbits_register_one_time_activation_codes",
|
||||||
|
settings.lnbits_register_one_time_activation_codes,
|
||||||
|
)
|
||||||
|
return None
|
||||||
|
raise ValueError("Invalid invitation code.")
|
||||||
|
|
||||||
|
raise ValueError("No activation method provided.")
|
||||||
|
|||||||
@@ -57,11 +57,11 @@ async def api_get_asset(
|
|||||||
|
|
||||||
|
|
||||||
@asset_router.get(
|
@asset_router.get(
|
||||||
"/{asset_id}/binary",
|
"/{asset_id}/data",
|
||||||
name="Get user asset binary",
|
name="Get user asset data",
|
||||||
summary="Get user asset binary data by ID",
|
summary="Get user asset data data by ID",
|
||||||
)
|
)
|
||||||
async def api_get_asset_binary(
|
async def api_get_asset_data(
|
||||||
asset_id: str,
|
asset_id: str,
|
||||||
user_id: str | None = Depends(optional_user_id),
|
user_id: str | None = Depends(optional_user_id),
|
||||||
) -> Response:
|
) -> Response:
|
||||||
|
|||||||
@@ -4,9 +4,10 @@ import json
|
|||||||
from collections.abc import Callable
|
from collections.abc import Callable
|
||||||
from http import HTTPStatus
|
from http import HTTPStatus
|
||||||
from time import time
|
from time import time
|
||||||
|
from typing import Annotated
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
from fastapi import APIRouter, Cookie, Depends, HTTPException, Request
|
||||||
from fastapi.responses import JSONResponse, RedirectResponse
|
from fastapi.responses import JSONResponse, RedirectResponse
|
||||||
from fastapi_sso.sso.base import OpenID, SSOBase
|
from fastapi_sso.sso.base import OpenID, SSOBase
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
@@ -25,10 +26,14 @@ from lnbits.core.models.users import (
|
|||||||
UpdateAccessControlList,
|
UpdateAccessControlList,
|
||||||
)
|
)
|
||||||
from lnbits.core.services import create_user_account
|
from lnbits.core.services import create_user_account
|
||||||
from lnbits.core.services.users import update_user_account
|
from lnbits.core.services.users import (
|
||||||
|
check_register_activation_settings,
|
||||||
|
update_user_account,
|
||||||
|
)
|
||||||
from lnbits.decorators import (
|
from lnbits.decorators import (
|
||||||
access_token_payload,
|
access_token_payload,
|
||||||
check_account_exists,
|
check_account_exists,
|
||||||
|
check_admin,
|
||||||
check_user_exists,
|
check_user_exists,
|
||||||
)
|
)
|
||||||
from lnbits.helpers import (
|
from lnbits.helpers import (
|
||||||
@@ -84,6 +89,7 @@ async def login(data: LoginUsernamePassword) -> JSONResponse:
|
|||||||
account = await get_account_by_username_or_email(data.username)
|
account = await get_account_by_username_or_email(data.username)
|
||||||
if not account or not account.verify_password(data.password):
|
if not account or not account.verify_password(data.password):
|
||||||
raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")
|
raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")
|
||||||
|
|
||||||
return _auth_success_response(account.username, account.id, account.email)
|
return _auth_success_response(account.username, account.id, account.email)
|
||||||
|
|
||||||
|
|
||||||
@@ -92,7 +98,7 @@ async def nostr_login(request: Request) -> JSONResponse:
|
|||||||
if not settings.is_auth_method_allowed(AuthMethods.nostr_auth_nip98):
|
if not settings.is_auth_method_allowed(AuthMethods.nostr_auth_nip98):
|
||||||
raise HTTPException(HTTPStatus.FORBIDDEN, "Login with Nostr Auth not allowed.")
|
raise HTTPException(HTTPStatus.FORBIDDEN, "Login with Nostr Auth not allowed.")
|
||||||
event = _nostr_nip98_event(request)
|
event = _nostr_nip98_event(request)
|
||||||
account = await get_account_by_pubkey(event["pubkey"])
|
account = await get_account_by_pubkey(event["pubkey"], active_only=False)
|
||||||
if not account:
|
if not account:
|
||||||
account = Account(
|
account = Account(
|
||||||
id=uuid4().hex,
|
id=uuid4().hex,
|
||||||
@@ -100,6 +106,8 @@ async def nostr_login(request: Request) -> JSONResponse:
|
|||||||
extra=UserExtra(provider="nostr"),
|
extra=UserExtra(provider="nostr"),
|
||||||
)
|
)
|
||||||
await create_user_account(account)
|
await create_user_account(account)
|
||||||
|
if not account.activated:
|
||||||
|
raise HTTPException(HTTPStatus.UNAUTHORIZED, "User is not activated.")
|
||||||
return _auth_success_response(account.username or "", account.id, account.email)
|
return _auth_success_response(account.username or "", account.id, account.email)
|
||||||
|
|
||||||
|
|
||||||
@@ -120,6 +128,63 @@ async def login_usr(data: LoginUsr) -> JSONResponse:
|
|||||||
return _auth_success_response(account.username, account.id, account.email)
|
return _auth_success_response(account.username, account.id, account.email)
|
||||||
|
|
||||||
|
|
||||||
|
@auth_router.post("/impersonate", description="Login via the User ID of another user")
|
||||||
|
async def impersonate_user(
|
||||||
|
data: LoginUsr,
|
||||||
|
user: User = Depends(check_admin),
|
||||||
|
cookie_access_token: Annotated[str | None, Cookie()] = None,
|
||||||
|
) -> JSONResponse:
|
||||||
|
if not cookie_access_token:
|
||||||
|
raise HTTPException(
|
||||||
|
HTTPStatus.UNAUTHORIZED, "Only cookie based impersonation is allowed."
|
||||||
|
)
|
||||||
|
if data.usr == user.id:
|
||||||
|
raise HTTPException(HTTPStatus.FORBIDDEN, "You cannot impersonate yourself.")
|
||||||
|
if settings.is_admin_user(data.usr):
|
||||||
|
# this check includes the superuser
|
||||||
|
raise HTTPException(
|
||||||
|
HTTPStatus.FORBIDDEN, "You cannot impersonate another admin user."
|
||||||
|
)
|
||||||
|
|
||||||
|
account = await get_account(data.usr)
|
||||||
|
if not account:
|
||||||
|
raise HTTPException(HTTPStatus.UNAUTHORIZED, "User ID does not exist.")
|
||||||
|
|
||||||
|
response = _auth_success_response(account.username, account.id, account.email)
|
||||||
|
|
||||||
|
max_age = settings.auth_token_expire_minutes * 60
|
||||||
|
response.set_cookie(
|
||||||
|
"admin_access_token", cookie_access_token, httponly=True, max_age=max_age
|
||||||
|
)
|
||||||
|
response.set_cookie("is_lnbits_user_impersonated", "true", max_age=max_age)
|
||||||
|
return response
|
||||||
|
|
||||||
|
|
||||||
|
@auth_router.delete(
|
||||||
|
"/impersonate", description="Stop impersonation and go back to admin"
|
||||||
|
)
|
||||||
|
async def stop_impersonate_user(
|
||||||
|
user: User = Depends(check_user_exists),
|
||||||
|
admin_access_token: Annotated[str | None, Cookie()] = None,
|
||||||
|
) -> JSONResponse:
|
||||||
|
if not admin_access_token:
|
||||||
|
raise HTTPException(
|
||||||
|
HTTPStatus.UNAUTHORIZED,
|
||||||
|
"No admin access token found to stop impersonation.",
|
||||||
|
)
|
||||||
|
response = JSONResponse(
|
||||||
|
{"access_token": admin_access_token, "token_type": "bearer"}
|
||||||
|
)
|
||||||
|
max_age = settings.auth_token_expire_minutes * 60
|
||||||
|
response.set_cookie(
|
||||||
|
"cookie_access_token", admin_access_token, httponly=True, max_age=max_age
|
||||||
|
)
|
||||||
|
response.delete_cookie("admin_access_token")
|
||||||
|
response.delete_cookie("is_access_token_expired")
|
||||||
|
response.delete_cookie("is_lnbits_user_impersonated")
|
||||||
|
return response
|
||||||
|
|
||||||
|
|
||||||
@auth_router.get("/acl")
|
@auth_router.get("/acl")
|
||||||
async def api_get_user_acls(
|
async def api_get_user_acls(
|
||||||
request: Request,
|
request: Request,
|
||||||
@@ -298,12 +363,14 @@ async def register(data: RegisterUser) -> JSONResponse:
|
|||||||
if not is_valid_username(data.username):
|
if not is_valid_username(data.username):
|
||||||
raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid username.")
|
raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid username.")
|
||||||
|
|
||||||
if await get_account_by_username(data.username):
|
if await get_account_by_username(data.username, active_only=False):
|
||||||
raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")
|
raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")
|
||||||
|
|
||||||
if data.email and not is_valid_email_address(data.email):
|
if data.email and not is_valid_email_address(data.email):
|
||||||
raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")
|
raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")
|
||||||
|
|
||||||
|
await check_register_activation_settings(data)
|
||||||
|
|
||||||
account = Account(
|
account = Account(
|
||||||
id=uuid4().hex,
|
id=uuid4().hex,
|
||||||
email=data.email,
|
email=data.email,
|
||||||
@@ -408,7 +475,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:
|
||||||
@@ -424,10 +491,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.")
|
||||||
@@ -446,7 +535,7 @@ async def _handle_sso_login(userinfo: OpenID, verified_user_id: str | None = Non
|
|||||||
raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")
|
raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")
|
||||||
|
|
||||||
redirect_path = "/wallet"
|
redirect_path = "/wallet"
|
||||||
account = await get_account_by_email(email)
|
account = await get_account_by_email(email, active_only=False)
|
||||||
|
|
||||||
if verified_user_id:
|
if verified_user_id:
|
||||||
if account:
|
if account:
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
@@ -42,54 +42,38 @@ async def robots():
|
|||||||
|
|
||||||
|
|
||||||
@generic_router.get(
|
@generic_router.get(
|
||||||
"/extensions/builder/preview/{ext_id}",
|
"/extensions/builder/preview/{ext_id}/{resource}",
|
||||||
name="extensions builder",
|
name="extensions builder",
|
||||||
dependencies=[Depends(check_extension_builder)],
|
dependencies=[Depends(check_extension_builder)],
|
||||||
)
|
)
|
||||||
async def extensions_builder_preview(
|
async def extensions_builder_preview(
|
||||||
request: Request,
|
|
||||||
ext_id: str,
|
ext_id: str,
|
||||||
|
resource: str | None = None,
|
||||||
page_name: str | None = None,
|
page_name: str | None = None,
|
||||||
user: User = Depends(check_user_exists),
|
user: User = Depends(check_user_exists),
|
||||||
) -> HTMLResponse:
|
) -> FileResponse:
|
||||||
working_dir_name = "preview_" + sha256(user.id.encode("utf-8")).hexdigest()
|
working_dir_name = "preview_" + sha256(user.id.encode("utf-8")).hexdigest()
|
||||||
html_file_name = "index.html"
|
|
||||||
if page_name == "public_page":
|
|
||||||
html_file_name = "public_page.html"
|
|
||||||
|
|
||||||
html_file_path = Path(
|
file_name = "index"
|
||||||
|
if page_name == "public_page":
|
||||||
|
file_name = "public_page"
|
||||||
|
|
||||||
|
resource_path = Path(
|
||||||
|
settings.extension_builder_working_dir_path,
|
||||||
"extension_builder_stub",
|
"extension_builder_stub",
|
||||||
ext_id,
|
ext_id,
|
||||||
working_dir_name,
|
working_dir_name,
|
||||||
ext_id,
|
ext_id,
|
||||||
"templates",
|
"static",
|
||||||
ext_id,
|
|
||||||
html_file_name,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
html_file_full_path = Path(
|
file_ext = ".vue" if resource == "template" else ".js"
|
||||||
settings.extension_builder_working_dir_path, html_file_path
|
file_full_path = Path(resource_path, file_name + file_ext)
|
||||||
)
|
|
||||||
|
|
||||||
if not html_file_full_path.is_file():
|
if not file_full_path.is_file():
|
||||||
return template_renderer().TemplateResponse(
|
raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
|
||||||
request,
|
|
||||||
"error.html",
|
|
||||||
{
|
|
||||||
"status_code": 404,
|
|
||||||
"message": f"Extension {ext_id} not found, refresh Preview.",
|
|
||||||
},
|
|
||||||
status_code=HTTPStatus.NOT_FOUND,
|
|
||||||
)
|
|
||||||
|
|
||||||
response = template_renderer().TemplateResponse(
|
|
||||||
request,
|
|
||||||
html_file_path.as_posix(),
|
|
||||||
{
|
|
||||||
"user": user.json(),
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
|
response = FileResponse(file_full_path.absolute().as_posix())
|
||||||
response.headers["Content-Security-Policy"] = (
|
response.headers["Content-Security-Policy"] = (
|
||||||
"default-src 'self'; "
|
"default-src 'self'; "
|
||||||
"style-src 'self' 'unsafe-inline'; "
|
"style-src 'self' 'unsafe-inline'; "
|
||||||
@@ -208,6 +192,9 @@ admin_ui_checks = [Depends(check_admin), Depends(check_admin_ui)]
|
|||||||
@generic_router.get(
|
@generic_router.get(
|
||||||
"/extensions/builder", dependencies=[Depends(check_extension_builder)]
|
"/extensions/builder", dependencies=[Depends(check_extension_builder)]
|
||||||
)
|
)
|
||||||
|
@generic_router.get(
|
||||||
|
"/extensions/builder/preview", dependencies=[Depends(check_extension_builder)]
|
||||||
|
)
|
||||||
async def index(
|
async def index(
|
||||||
request: Request, user: User = Depends(check_user_exists)
|
request: Request, user: User = Depends(check_user_exists)
|
||||||
) -> HTMLResponse:
|
) -> HTMLResponse:
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ from lnbits.core.crud import (
|
|||||||
update_admin_settings,
|
update_admin_settings,
|
||||||
update_wallet,
|
update_wallet,
|
||||||
)
|
)
|
||||||
|
from lnbits.core.crud.users import clear_user_id_cache, get_account, update_account
|
||||||
from lnbits.core.crud.wallets import delete_wallet_by_id
|
from lnbits.core.crud.wallets import delete_wallet_by_id
|
||||||
from lnbits.core.models import (
|
from lnbits.core.models import (
|
||||||
AccountFilters,
|
AccountFilters,
|
||||||
@@ -73,7 +74,7 @@ async def api_get_users(
|
|||||||
summary="Get user by Id",
|
summary="Get user by Id",
|
||||||
)
|
)
|
||||||
async def api_get_user(user_id: str) -> User:
|
async def api_get_user(user_id: str) -> User:
|
||||||
user = await get_user(user_id)
|
user = await get_user(user_id, active_only=False)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(HTTPStatus.NOT_FOUND, "User not found.")
|
raise HTTPException(HTTPStatus.NOT_FOUND, "User not found.")
|
||||||
return user
|
return user
|
||||||
@@ -197,7 +198,7 @@ async def api_users_reset_password(user_id: str) -> str:
|
|||||||
return f"reset_key_{reset_key_b64}"
|
return f"reset_key_{reset_key_b64}"
|
||||||
|
|
||||||
|
|
||||||
@users_router.get(
|
@users_router.put(
|
||||||
"/user/{user_id}/admin",
|
"/user/{user_id}/admin",
|
||||||
dependencies=[Depends(check_super_user)],
|
dependencies=[Depends(check_super_user)],
|
||||||
name="Give or revoke admin permsisions to a user",
|
name="Give or revoke admin permsisions to a user",
|
||||||
@@ -220,6 +221,43 @@ async def api_users_toggle_admin(user_id: str) -> SimpleStatus:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@users_router.put(
|
||||||
|
"/user/{user_id}/activate",
|
||||||
|
name="Activate or deactivate a user",
|
||||||
|
)
|
||||||
|
async def api_users_toggle_activated(
|
||||||
|
user_id: str, admin_account: Account = Depends(check_admin)
|
||||||
|
) -> SimpleStatus:
|
||||||
|
if user_id == settings.super_user:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.BAD_REQUEST,
|
||||||
|
detail="Cannot deactivate super user.",
|
||||||
|
)
|
||||||
|
if user_id == admin_account.id:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.BAD_REQUEST,
|
||||||
|
detail="You cannot deactivate yourself.",
|
||||||
|
)
|
||||||
|
|
||||||
|
if settings.is_admin_user(user_id):
|
||||||
|
settings.lnbits_admin_users.remove(user_id)
|
||||||
|
|
||||||
|
user_account = await get_account(user_id, active_only=False)
|
||||||
|
if not user_account:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.NOT_FOUND,
|
||||||
|
detail="User not found.",
|
||||||
|
)
|
||||||
|
user_account.activated = not user_account.activated
|
||||||
|
await update_account(user_account)
|
||||||
|
await clear_user_id_cache(user_id)
|
||||||
|
|
||||||
|
return SimpleStatus(
|
||||||
|
success=True,
|
||||||
|
message=f"User {'activated' if user_account.activated else 'deactivated'}.",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@users_router.get("/user/{user_id}/wallet", name="Get wallets for user")
|
@users_router.get("/user/{user_id}/wallet", name="Get wallets for user")
|
||||||
async def api_users_get_user_wallet(user_id: str) -> list[Wallet]:
|
async def api_users_get_user_wallet(user_id: str) -> list[Wallet]:
|
||||||
return await get_wallets(user_id, deleted=None)
|
return await get_wallets(user_id, deleted=None)
|
||||||
@@ -245,7 +283,7 @@ async def api_users_create_user_wallet(
|
|||||||
"/user/{user_id}/wallet/{wallet}/undelete", name="Reactivate deleted wallet"
|
"/user/{user_id}/wallet/{wallet}/undelete", name="Reactivate deleted wallet"
|
||||||
)
|
)
|
||||||
async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> SimpleStatus:
|
async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> SimpleStatus:
|
||||||
wal = await get_wallet(wallet)
|
wal = await get_wallet(wallet, deleted=True)
|
||||||
if not wal:
|
if not wal:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=HTTPStatus.NOT_FOUND,
|
status_code=HTTPStatus.NOT_FOUND,
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ from fastapi import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
from lnbits.core.crud.wallets import (
|
from lnbits.core.crud.wallets import (
|
||||||
|
clear_wallet_cache,
|
||||||
create_wallet,
|
create_wallet,
|
||||||
get_wallets_paginated,
|
get_wallets_paginated,
|
||||||
)
|
)
|
||||||
@@ -37,7 +38,6 @@ from lnbits.decorators import (
|
|||||||
require_invoice_key,
|
require_invoice_key,
|
||||||
)
|
)
|
||||||
from lnbits.helpers import generate_filter_params_openapi
|
from lnbits.helpers import generate_filter_params_openapi
|
||||||
from lnbits.utils.cache import cache
|
|
||||||
|
|
||||||
from ..crud import (
|
from ..crud import (
|
||||||
delete_wallet,
|
delete_wallet,
|
||||||
@@ -134,9 +134,7 @@ async def api_reset_wallet_keys(
|
|||||||
if not wallet or wallet.user != account_id.id:
|
if not wallet or wallet.user != account_id.id:
|
||||||
raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Wallet not found")
|
raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Wallet not found")
|
||||||
|
|
||||||
cache.pop(f"auth:wallet:{wallet.id}")
|
clear_wallet_cache(wallet)
|
||||||
cache.pop(f"auth:x-api-key:{wallet.adminkey}")
|
|
||||||
cache.pop(f"auth:x-api-key:{wallet.inkey}")
|
|
||||||
|
|
||||||
wallet.adminkey = uuid4().hex
|
wallet.adminkey = uuid4().hex
|
||||||
wallet.inkey = uuid4().hex
|
wallet.inkey = uuid4().hex
|
||||||
|
|||||||
+9
-37
@@ -12,7 +12,6 @@ from typing import Any, Generic, Literal, TypeVar, get_origin
|
|||||||
|
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
from pydantic import BaseModel, ValidationError, root_validator
|
from pydantic import BaseModel, ValidationError, root_validator
|
||||||
from sqlalchemy import event
|
|
||||||
from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine
|
from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine
|
||||||
from sqlalchemy.sql import text
|
from sqlalchemy.sql import text
|
||||||
|
|
||||||
@@ -56,14 +55,6 @@ def compat_timestamp_placeholder(key: str):
|
|||||||
return f":{key}"
|
return f":{key}"
|
||||||
|
|
||||||
|
|
||||||
def get_placeholder(model: Any, field: str) -> str:
|
|
||||||
type_ = model.__fields__[field].type_
|
|
||||||
if type_ == datetime:
|
|
||||||
return compat_timestamp_placeholder(field)
|
|
||||||
else:
|
|
||||||
return f":{field}"
|
|
||||||
|
|
||||||
|
|
||||||
class Compat:
|
class Compat:
|
||||||
type: str | None = "<inherited>"
|
type: str | None = "<inherited>"
|
||||||
schema: str | None = "<inherited>"
|
schema: str | None = "<inherited>"
|
||||||
@@ -326,30 +317,7 @@ class Database(Compat):
|
|||||||
self.engine: AsyncEngine = create_async_engine(
|
self.engine: AsyncEngine = create_async_engine(
|
||||||
database_uri, echo=settings.debug_database
|
database_uri, echo=settings.debug_database
|
||||||
)
|
)
|
||||||
|
|
||||||
if self.type in {POSTGRES, COCKROACH}:
|
|
||||||
|
|
||||||
@event.listens_for(self.engine.sync_engine, "connect")
|
|
||||||
def register_custom_types(dbapi_connection, *_):
|
|
||||||
def _parse_date(value) -> datetime:
|
|
||||||
if value is None:
|
|
||||||
value = "1970-01-01 00:00:00"
|
|
||||||
f = "%Y-%m-%d %H:%M:%S.%f"
|
|
||||||
if "." not in value:
|
|
||||||
f = "%Y-%m-%d %H:%M:%S"
|
|
||||||
return datetime.strptime(value, f)
|
|
||||||
|
|
||||||
dbapi_connection.run_async(
|
|
||||||
lambda connection: connection.set_type_codec(
|
|
||||||
"TIMESTAMP",
|
|
||||||
encoder=datetime,
|
|
||||||
decoder=_parse_date,
|
|
||||||
schema="pg_catalog",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
self.lock = asyncio.Lock()
|
self.lock = asyncio.Lock()
|
||||||
|
|
||||||
logger.trace(f"database {self.type} added for {self.name}")
|
logger.trace(f"database {self.type} added for {self.name}")
|
||||||
|
|
||||||
@asynccontextmanager
|
@asynccontextmanager
|
||||||
@@ -662,7 +630,7 @@ def insert_query(table_name: str, model: BaseModel) -> str:
|
|||||||
placeholders = []
|
placeholders = []
|
||||||
keys = model_to_dict(model).keys()
|
keys = model_to_dict(model).keys()
|
||||||
for field in keys:
|
for field in keys:
|
||||||
placeholders.append(get_placeholder(model, field))
|
placeholders.append(f":{field}")
|
||||||
# add quotes to keys to avoid SQL conflicts (e.g. `user` is a reserved keyword)
|
# add quotes to keys to avoid SQL conflicts (e.g. `user` is a reserved keyword)
|
||||||
fields = ", ".join([f'"{key}"' for key in keys])
|
fields = ", ".join([f'"{key}"' for key in keys])
|
||||||
values = ", ".join(placeholders)
|
values = ", ".join(placeholders)
|
||||||
@@ -680,9 +648,8 @@ def update_query(
|
|||||||
"""
|
"""
|
||||||
fields = []
|
fields = []
|
||||||
for field in model_to_dict(model).keys():
|
for field in model_to_dict(model).keys():
|
||||||
placeholder = get_placeholder(model, field)
|
|
||||||
# add quotes to keys to avoid SQL conflicts (e.g. `user` is a reserved keyword)
|
# add quotes to keys to avoid SQL conflicts (e.g. `user` is a reserved keyword)
|
||||||
fields.append(f'"{field}" = {placeholder}')
|
fields.append(f'"{field}" = :{field}')
|
||||||
query = ", ".join(fields)
|
query = ", ".join(fields)
|
||||||
return f"UPDATE {table_name} SET {query} {where}" # noqa: S608
|
return f"UPDATE {table_name} SET {query} {where}" # noqa: S608
|
||||||
|
|
||||||
@@ -700,7 +667,12 @@ def model_to_dict(model: BaseModel) -> dict:
|
|||||||
if model.__fields__[key].field_info.extra.get("no_database", False):
|
if model.__fields__[key].field_info.extra.get("no_database", False):
|
||||||
continue
|
continue
|
||||||
if isinstance(value, datetime):
|
if isinstance(value, datetime):
|
||||||
_dict[key] = value.timestamp()
|
if DB_TYPE == SQLITE:
|
||||||
|
_dict[key] = value.timestamp()
|
||||||
|
else:
|
||||||
|
# remove tz. postgres and cockroach TIMESTAMP is not tz aware
|
||||||
|
# so it will throw if we dont remove the UTC.
|
||||||
|
_dict[key] = value.replace(tzinfo=None)
|
||||||
continue
|
continue
|
||||||
if (
|
if (
|
||||||
type(type_) is type(BaseModel)
|
type(type_) is type(BaseModel)
|
||||||
@@ -756,7 +728,7 @@ def dict_to_model(_row: dict, model: type[TModel]) -> TModel: # noqa: C901
|
|||||||
if DB_TYPE == SQLITE:
|
if DB_TYPE == SQLITE:
|
||||||
_dict[key] = datetime.fromtimestamp(value, timezone.utc)
|
_dict[key] = datetime.fromtimestamp(value, timezone.utc)
|
||||||
else:
|
else:
|
||||||
_dict[key] = value
|
_dict[key] = value.replace(tzinfo=timezone.utc)
|
||||||
continue
|
continue
|
||||||
if issubclass(type_, BaseModel):
|
if issubclass(type_, BaseModel):
|
||||||
_dict[key] = dict_to_submodel(type_, value)
|
_dict[key] = dict_to_submodel(type_, value)
|
||||||
|
|||||||
@@ -261,6 +261,7 @@ async def check_account_id_exists(
|
|||||||
account_id,
|
account_id,
|
||||||
expiry=settings.auth_authentication_cache_minutes * 60,
|
expiry=settings.auth_authentication_cache_minutes * 60,
|
||||||
)
|
)
|
||||||
|
cache.set(f"auth:user:cache_key:{sha256s(account.id)}", cache_key)
|
||||||
|
|
||||||
return account_id
|
return account_id
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ def register_exception_handlers(app: FastAPI): # noqa: C901
|
|||||||
logger.error(f"RequestValidationError: {exc!s}")
|
logger.error(f"RequestValidationError: {exc!s}")
|
||||||
return render_html_error(request, exc) or JSONResponse(
|
return render_html_error(request, exc) or JSONResponse(
|
||||||
status_code=HTTPStatus.BAD_REQUEST,
|
status_code=HTTPStatus.BAD_REQUEST,
|
||||||
content={"detail": str(exc)},
|
content={"detail": [dict(e) for e in exc.errors()]},
|
||||||
)
|
)
|
||||||
|
|
||||||
@app.exception_handler(HTTPException)
|
@app.exception_handler(HTTPException)
|
||||||
|
|||||||
+16
-51
@@ -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
|
||||||
|
|
||||||
|
|
||||||
@@ -391,6 +348,14 @@ def camel_to_snake(name: str) -> str:
|
|||||||
return name.lower()
|
return name.lower()
|
||||||
|
|
||||||
|
|
||||||
|
def snake_to_camel(name: str, capitalize_first: bool | None = False) -> str:
|
||||||
|
components = name.split("_")
|
||||||
|
camel = components[0] + "".join(x.capitalize() for x in components[1:])
|
||||||
|
if capitalize_first:
|
||||||
|
camel = camel[0].upper() + camel[1:]
|
||||||
|
return camel
|
||||||
|
|
||||||
|
|
||||||
def is_camel_case(v: str) -> bool:
|
def is_camel_case(v: str) -> bool:
|
||||||
return re.match(r"^[A-Z][a-z0-9]+([A-Z][a-z0-9]+)*$", v) is not None
|
return re.match(r"^[A-Z][a-z0-9]+([A-Z][a-z0-9]+)*$", v) is not None
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,14 @@ class UsersSettings(LNbitsSettings):
|
|||||||
lnbits_admin_users: list[str] = Field(default=[])
|
lnbits_admin_users: list[str] = Field(default=[])
|
||||||
lnbits_allowed_users: list[str] = Field(default=[])
|
lnbits_allowed_users: list[str] = Field(default=[])
|
||||||
lnbits_allow_new_accounts: bool = Field(default=True)
|
lnbits_allow_new_accounts: bool = Field(default=True)
|
||||||
|
lnbits_require_user_activation: bool = Field(default=False)
|
||||||
|
|
||||||
|
lnbits_user_activation_by_email: bool = Field(default=False)
|
||||||
|
lnbits_user_activation_by_payment: bool = Field(default=False)
|
||||||
|
lnbits_user_activation_by_invitation_code: bool = Field(default=False)
|
||||||
|
|
||||||
|
lnbits_register_reusable_activation_code: str = Field(default="")
|
||||||
|
lnbits_register_one_time_activation_codes: list[str] = Field(default=[])
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def new_accounts_allowed(self) -> bool:
|
def new_accounts_allowed(self) -> bool:
|
||||||
@@ -252,6 +260,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(
|
||||||
@@ -306,6 +319,10 @@ class AssetSettings(LNbitsSettings):
|
|||||||
"heic",
|
"heic",
|
||||||
"heif",
|
"heif",
|
||||||
"heics",
|
"heics",
|
||||||
|
"text/plain",
|
||||||
|
"text/json" "text/xml",
|
||||||
|
"application/json",
|
||||||
|
"application/pdf",
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
lnbits_asset_thumbnail_width: int = Field(default=128, ge=0)
|
lnbits_asset_thumbnail_width: int = Field(default=128, ge=0)
|
||||||
@@ -974,6 +991,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)
|
||||||
@@ -1122,6 +1140,123 @@ 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")
|
||||||
|
lnbits_user_activation_by_email: bool = Field(alias="userActivationByEmail")
|
||||||
|
lnbits_user_activation_by_payment: bool = Field(alias="userActivationByPayment")
|
||||||
|
lnbits_user_activation_by_invitation_code: bool = Field(
|
||||||
|
alias="userActivationByInvitationCode"
|
||||||
|
)
|
||||||
|
|
||||||
|
@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,
|
||||||
|
userActivationByEmail=settings.lnbits_user_activation_by_email,
|
||||||
|
userActivationByPayment=settings.lnbits_user_activation_by_payment,
|
||||||
|
userActivationByInvitationCode=settings.lnbits_user_activation_by_invitation_code,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class SuperSettings(EditableSettings):
|
class SuperSettings(EditableSettings):
|
||||||
super_user: str
|
super_user: str
|
||||||
|
|||||||
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -171,6 +171,7 @@ window.localisation.en = {
|
|||||||
drop_db: 'Remove Data',
|
drop_db: 'Remove Data',
|
||||||
enable: 'Enable',
|
enable: 'Enable',
|
||||||
enabled: 'Enabled',
|
enabled: 'Enabled',
|
||||||
|
disabled: 'Disabled',
|
||||||
pay_to_enable: 'Pay To Enable',
|
pay_to_enable: 'Pay To Enable',
|
||||||
enable_extension_details: 'Enable extension for current user',
|
enable_extension_details: 'Enable extension for current user',
|
||||||
disable: 'Disable',
|
disable: 'Disable',
|
||||||
@@ -178,6 +179,8 @@ window.localisation.en = {
|
|||||||
installed: 'Installed',
|
installed: 'Installed',
|
||||||
activated: 'Activated',
|
activated: 'Activated',
|
||||||
deactivated: 'Deactivated',
|
deactivated: 'Deactivated',
|
||||||
|
activate: 'Activate',
|
||||||
|
deactivate: 'Deactivate',
|
||||||
release_notes: 'Release Notes',
|
release_notes: 'Release Notes',
|
||||||
activate_extension_details: 'Make extension available/unavailable for users',
|
activate_extension_details: 'Make extension available/unavailable for users',
|
||||||
featured: 'Featured',
|
featured: 'Featured',
|
||||||
@@ -186,6 +189,8 @@ window.localisation.en = {
|
|||||||
only_admins_can_create_extensions:
|
only_admins_can_create_extensions:
|
||||||
'Only admin accounts can create extensions',
|
'Only admin accounts can create extensions',
|
||||||
admin_only: 'Admin Only',
|
admin_only: 'Admin Only',
|
||||||
|
make_user_admin: 'Make User Admin',
|
||||||
|
revoke_admin: 'Revoke Admin',
|
||||||
new_version: 'New Version',
|
new_version: 'New Version',
|
||||||
reviews_url: 'Reviews URL',
|
reviews_url: 'Reviews URL',
|
||||||
reviews_url_label: 'Reviews server URL',
|
reviews_url_label: 'Reviews server URL',
|
||||||
@@ -280,7 +285,7 @@ window.localisation.en = {
|
|||||||
'Nip5 identifier to send notifications to',
|
'Nip5 identifier to send notifications to',
|
||||||
notifications_nostr_identifiers: 'Nostr Identifiers',
|
notifications_nostr_identifiers: 'Nostr Identifiers',
|
||||||
notifications_nostr_identifiers_desc:
|
notifications_nostr_identifiers_desc:
|
||||||
'List of identifiers to send notifications to',
|
'List of identifiers to send notifications to.',
|
||||||
|
|
||||||
notifications_telegram_config: 'Telegram Configuration',
|
notifications_telegram_config: 'Telegram Configuration',
|
||||||
notifications_enable_telegram: 'Enable Telegram',
|
notifications_enable_telegram: 'Enable Telegram',
|
||||||
@@ -518,6 +523,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 +664,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',
|
||||||
@@ -694,7 +709,28 @@ window.localisation.en = {
|
|||||||
allowed_users_label: 'User ID',
|
allowed_users_label: 'User ID',
|
||||||
allow_creation_user: 'Allow creation of new users',
|
allow_creation_user: 'Allow creation of new users',
|
||||||
allow_creation_user_desc: 'Allow creation of new users on the index page',
|
allow_creation_user_desc: 'Allow creation of new users on the index page',
|
||||||
|
require_user_activation: 'Require user activation',
|
||||||
|
require_user_activation_desc:
|
||||||
|
'New users will be activated only after they pass one of the confirmation methods. Admins can activate users manually from the admin panel.',
|
||||||
|
reusable_activation_code: 'Reusable activation code',
|
||||||
|
reusable_activation_code_label: 'Reusable activation code',
|
||||||
|
reusable_activation_code_hint:
|
||||||
|
'This activation code can be used multiple times by different users.',
|
||||||
|
one_time_activation_code: 'One-time activation codes',
|
||||||
|
one_time_activation_code_label: 'Add activation code',
|
||||||
|
one_time_activation_code_hint:
|
||||||
|
'List of one-time activation codes. Each code can be used only once, then will be reomved from the list.',
|
||||||
|
invitation_code: 'Invitation Code',
|
||||||
|
invitation_code_hint: 'The invitation code that you have received.',
|
||||||
|
email: 'Email',
|
||||||
|
email_confirmation_hint: 'Email address to send the confirmation code to.',
|
||||||
|
nostr_identifier: 'Nostr Identifier',
|
||||||
|
nostr_identifier_hint:
|
||||||
|
'Nostr nip5 identifier or <npub> to send the confirmation code to.',
|
||||||
|
|
||||||
new_user_not_allowed: 'Registration is disabled.',
|
new_user_not_allowed: 'Registration is disabled.',
|
||||||
|
start_user_impersonation: 'Impersonate this user',
|
||||||
|
stop_user_impersonation: 'Stop User Impersonation',
|
||||||
components: 'Components',
|
components: 'Components',
|
||||||
long_running_endpoints: 'Top 5 Long Running Endpoints',
|
long_running_endpoints: 'Top 5 Long Running Endpoints',
|
||||||
http_request_methods: 'HTTP Request Methods',
|
http_request_methods: 'HTTP Request Methods',
|
||||||
|
|||||||
+20
-3
@@ -66,7 +66,7 @@ window._lnbitsApi = {
|
|||||||
name: name
|
name: name
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
register(username, email, password, password_repeat) {
|
register(username, email, password, password_repeat, invitation_code) {
|
||||||
return axios({
|
return axios({
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: '/api/v1/auth/register',
|
url: '/api/v1/auth/register',
|
||||||
@@ -74,7 +74,8 @@ window._lnbitsApi = {
|
|||||||
username,
|
username,
|
||||||
email,
|
email,
|
||||||
password,
|
password,
|
||||||
password_repeat
|
password_repeat,
|
||||||
|
invitation_code
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -123,6 +124,19 @@ window._lnbitsApi = {
|
|||||||
url: '/api/v1/auth/logout'
|
url: '/api/v1/auth/logout'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
impersonateUser(usr) {
|
||||||
|
return axios({
|
||||||
|
method: 'POST',
|
||||||
|
url: '/api/v1/auth/impersonate',
|
||||||
|
data: {usr}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
stopImpersonation() {
|
||||||
|
return axios({
|
||||||
|
method: 'DELETE',
|
||||||
|
url: '/api/v1/auth/impersonate'
|
||||||
|
})
|
||||||
|
},
|
||||||
getAuthenticatedUser() {
|
getAuthenticatedUser() {
|
||||||
return this.request('get', '/api/v1/auth')
|
return this.request('get', '/api/v1/auth')
|
||||||
},
|
},
|
||||||
@@ -134,13 +148,16 @@ window._lnbitsApi = {
|
|||||||
name: name,
|
name: name,
|
||||||
wallet_type: walletType,
|
wallet_type: walletType,
|
||||||
...opts
|
...opts
|
||||||
}).catch(LNbits.utils.notifyApiError)
|
})
|
||||||
},
|
},
|
||||||
updateWallet(name, wallet) {
|
updateWallet(name, wallet) {
|
||||||
return this.request('patch', '/api/v1/wallet', wallet.adminkey, {
|
return this.request('patch', '/api/v1/wallet', wallet.adminkey, {
|
||||||
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 => {
|
||||||
|
|||||||
@@ -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) => {
|
||||||
|
|||||||
@@ -33,41 +33,8 @@ window.app.component('lnbits-extension-rating', {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
window.app.component('lnbits-fsat', {
|
|
||||||
template: '<span>{{ fsat }}</span>',
|
|
||||||
props: {
|
|
||||||
amount: {
|
|
||||||
type: Number,
|
|
||||||
default: 0
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
fsat() {
|
|
||||||
return LNbits.utils.formatSat(this.amount)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
window.app.component('lnbits-manage', {
|
window.app.component('lnbits-manage', {
|
||||||
mixins: [window.windowMixin],
|
|
||||||
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
|
||||||
@@ -81,10 +48,8 @@ window.app.component('lnbits-manage', {
|
|||||||
})
|
})
|
||||||
|
|
||||||
window.app.component('lnbits-payment-details', {
|
window.app.component('lnbits-payment-details', {
|
||||||
mixins: [window.windowMixin],
|
|
||||||
template: '#lnbits-payment-details',
|
template: '#lnbits-payment-details',
|
||||||
props: ['payment'],
|
props: ['payment'],
|
||||||
mixins: [window.windowMixin],
|
|
||||||
computed: {
|
computed: {
|
||||||
hasPreimage() {
|
hasPreimage() {
|
||||||
return (
|
return (
|
||||||
@@ -128,7 +93,6 @@ window.app.component('lnbits-payment-details', {
|
|||||||
})
|
})
|
||||||
|
|
||||||
window.app.component('lnbits-lnurlpay-success-action', {
|
window.app.component('lnbits-lnurlpay-success-action', {
|
||||||
mixins: [window.windowMixin],
|
|
||||||
template: '#lnbits-lnurlpay-success-action',
|
template: '#lnbits-lnurlpay-success-action',
|
||||||
props: ['payment', 'success_action'],
|
props: ['payment', 'success_action'],
|
||||||
data() {
|
data() {
|
||||||
@@ -148,7 +112,6 @@ window.app.component('lnbits-lnurlpay-success-action', {
|
|||||||
|
|
||||||
window.app.component('lnbits-notifications-btn', {
|
window.app.component('lnbits-notifications-btn', {
|
||||||
template: '#lnbits-notifications-btn',
|
template: '#lnbits-notifications-btn',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: ['pubkey'],
|
props: ['pubkey'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -319,7 +282,6 @@ window.app.component('lnbits-notifications-btn', {
|
|||||||
|
|
||||||
window.app.component('lnbits-dynamic-fields', {
|
window.app.component('lnbits-dynamic-fields', {
|
||||||
template: '#lnbits-dynamic-fields',
|
template: '#lnbits-dynamic-fields',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: ['options', 'modelValue'],
|
props: ['options', 'modelValue'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -352,7 +314,6 @@ window.app.component('lnbits-dynamic-fields', {
|
|||||||
|
|
||||||
window.app.component('lnbits-dynamic-chips', {
|
window.app.component('lnbits-dynamic-chips', {
|
||||||
template: '#lnbits-dynamic-chips',
|
template: '#lnbits-dynamic-chips',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: ['modelValue'],
|
props: ['modelValue'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -383,7 +344,6 @@ window.app.component('lnbits-dynamic-chips', {
|
|||||||
|
|
||||||
window.app.component('lnbits-update-balance', {
|
window.app.component('lnbits-update-balance', {
|
||||||
template: '#lnbits-update-balance',
|
template: '#lnbits-update-balance',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: ['wallet_id', 'small_btn'],
|
props: ['wallet_id', 'small_btn'],
|
||||||
computed: {
|
computed: {
|
||||||
admin() {
|
admin() {
|
||||||
@@ -422,7 +382,6 @@ window.app.component('lnbits-update-balance', {
|
|||||||
|
|
||||||
window.app.component('user-id-only', {
|
window.app.component('user-id-only', {
|
||||||
template: '#user-id-only',
|
template: '#user-id-only',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: {
|
props: {
|
||||||
allowed_new_users: Boolean,
|
allowed_new_users: Boolean,
|
||||||
authAction: String,
|
authAction: String,
|
||||||
@@ -466,7 +425,6 @@ window.app.component('user-id-only', {
|
|||||||
|
|
||||||
window.app.component('username-password', {
|
window.app.component('username-password', {
|
||||||
template: '#username-password',
|
template: '#username-password',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: {
|
props: {
|
||||||
allowed_new_users: Boolean,
|
allowed_new_users: Boolean,
|
||||||
authMethods: Array,
|
authMethods: Array,
|
||||||
@@ -474,8 +432,10 @@ window.app.component('username-password', {
|
|||||||
username: String,
|
username: String,
|
||||||
password_1: String,
|
password_1: String,
|
||||||
password_2: String,
|
password_2: String,
|
||||||
|
invitationCode: String,
|
||||||
resetKey: String
|
resetKey: String
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
oauth: [
|
oauth: [
|
||||||
@@ -488,8 +448,10 @@ window.app.component('username-password', {
|
|||||||
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',
|
confirmationMethod: 'code',
|
||||||
keycloakIcon: LNBITS_AUTH_KEYCLOAK_ICON
|
confirmationEmail: '',
|
||||||
|
confirmationCode: this.invitationCode || '',
|
||||||
|
showConfirmationCode: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -502,6 +464,7 @@ window.app.component('username-password', {
|
|||||||
this.$emit('update:userName', this.username)
|
this.$emit('update:userName', this.username)
|
||||||
this.$emit('update:password_1', this.password)
|
this.$emit('update:password_1', this.password)
|
||||||
this.$emit('update:password_2', this.passwordRepeat)
|
this.$emit('update:password_2', this.passwordRepeat)
|
||||||
|
this.$emit('update:invitationCode', this.confirmationCode)
|
||||||
this.$emit('register')
|
this.$emit('register')
|
||||||
},
|
},
|
||||||
reset() {
|
reset() {
|
||||||
@@ -593,6 +556,25 @@ window.app.component('username-password', {
|
|||||||
computed: {
|
computed: {
|
||||||
showOauth() {
|
showOauth() {
|
||||||
return this.oauth.some(m => this.authMethods.includes(m))
|
return this.oauth.some(m => this.authMethods.includes(m))
|
||||||
|
},
|
||||||
|
disableRegister() {
|
||||||
|
const usernameOK = !!this.username
|
||||||
|
const passwordOK = !!this.password && this.password.length >= 8
|
||||||
|
const passwordsMatch = this.password === this.passwordRepeat
|
||||||
|
const codeOk =
|
||||||
|
this.confirmationMethodsCount === 0 ||
|
||||||
|
this.confirmationMethod !== 'code' ||
|
||||||
|
this.confirmationCode.length > 0
|
||||||
|
|
||||||
|
return !usernameOK || !passwordOK || !passwordsMatch || !codeOk
|
||||||
|
},
|
||||||
|
confirmationMethodsCount() {
|
||||||
|
const methods = [
|
||||||
|
this.g.settings.userActivationByEmail,
|
||||||
|
this.g.settings.userActivationByPayment,
|
||||||
|
this.g.settings.userActivationByInvitationCode
|
||||||
|
]
|
||||||
|
return methods.filter(Boolean).length
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {}
|
created() {}
|
||||||
@@ -704,7 +686,6 @@ window.app.component('lnbits-stat', {
|
|||||||
|
|
||||||
window.app.component('lnbits-node-qrcode', {
|
window.app.component('lnbits-node-qrcode', {
|
||||||
props: ['info'],
|
props: ['info'],
|
||||||
mixins: [window.windowMixin],
|
|
||||||
template: `
|
template: `
|
||||||
<q-card class="my-card">
|
<q-card class="my-card">
|
||||||
<q-card-section>
|
<q-card-section>
|
||||||
@@ -783,7 +764,6 @@ window.app.component('lnbits-node-info', {
|
|||||||
showDialog: false
|
showDialog: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mixins: [window.windowMixin],
|
|
||||||
methods: {
|
methods: {
|
||||||
shortenNodeId(nodeId) {
|
shortenNodeId(nodeId) {
|
||||||
return nodeId
|
return nodeId
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-assets-config', {
|
window.app.component('lnbits-admin-assets-config', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-assets-config',
|
template: '#lnbits-admin-assets-config',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
newAllowedAssetMimeType: '',
|
newAllowedAssetMimeType: '',
|
||||||
@@ -17,6 +16,7 @@ window.app.component('lnbits-admin-assets-config', {
|
|||||||
this.newAllowedAssetMimeType
|
this.newAllowedAssetMimeType
|
||||||
)
|
)
|
||||||
this.newAllowedAssetMimeType = ''
|
this.newAllowedAssetMimeType = ''
|
||||||
|
this.formData.touch = null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
removeAllowedAssetMimeType(type) {
|
removeAllowedAssetMimeType(type) {
|
||||||
@@ -24,18 +24,21 @@ window.app.component('lnbits-admin-assets-config', {
|
|||||||
if (index !== -1) {
|
if (index !== -1) {
|
||||||
this.formData.lnbits_assets_allowed_mime_types.splice(index, 1)
|
this.formData.lnbits_assets_allowed_mime_types.splice(index, 1)
|
||||||
}
|
}
|
||||||
|
this.formData.touch = null
|
||||||
},
|
},
|
||||||
addNewNoLimitUser() {
|
addNewNoLimitUser() {
|
||||||
if (this.newNoLimitUser) {
|
if (this.newNoLimitUser) {
|
||||||
this.removeNoLimitUser(this.newNoLimitUser)
|
this.removeNoLimitUser(this.newNoLimitUser)
|
||||||
this.formData.lnbits_assets_no_limit_users.push(this.newNoLimitUser)
|
this.formData.lnbits_assets_no_limit_users.push(this.newNoLimitUser)
|
||||||
this.newNoLimitUser = ''
|
this.newNoLimitUser = ''
|
||||||
|
this.formData.touch = null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
removeNoLimitUser(user) {
|
removeNoLimitUser(user) {
|
||||||
if (user) {
|
if (user) {
|
||||||
this.formData.lnbits_assets_no_limit_users =
|
this.formData.lnbits_assets_no_limit_users =
|
||||||
this.formData.lnbits_assets_no_limit_users.filter(u => u !== user)
|
this.formData.lnbits_assets_no_limit_users.filter(u => u !== user)
|
||||||
|
this.formData.touch = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-audit', {
|
window.app.component('lnbits-admin-audit', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-audit',
|
template: '#lnbits-admin-audit',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
formAddIncludePath: '',
|
formAddIncludePath: '',
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-exchange-providers', {
|
window.app.component('lnbits-admin-exchange-providers', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-exchange-providers',
|
template: '#lnbits-admin-exchange-providers',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
exchangeData: {
|
exchangeData: {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-extensions', {
|
window.app.component('lnbits-admin-extensions', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-extensions',
|
template: '#lnbits-admin-extensions',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
formAddExtensionsManifest: ''
|
formAddExtensionsManifest: ''
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-fiat-providers', {
|
window.app.component('lnbits-admin-fiat-providers', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-fiat-providers',
|
template: '#lnbits-admin-fiat-providers',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
formAddStripeUser: '',
|
formAddStripeUser: '',
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-admin-funding-sources', {
|
window.app.component('lnbits-admin-funding-sources', {
|
||||||
template: '#lnbits-admin-funding-sources',
|
template: '#lnbits-admin-funding-sources',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: ['form-data', 'allowed-funding-sources'],
|
props: ['form-data', 'allowed-funding-sources'],
|
||||||
methods: {
|
methods: {
|
||||||
getFundingSourceLabel(item) {
|
getFundingSourceLabel(item) {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-funding', {
|
window.app.component('lnbits-admin-funding', {
|
||||||
props: ['is-super-user', 'form-data', 'settings'],
|
props: ['is-super-user', 'form-data', 'settings'],
|
||||||
template: '#lnbits-admin-funding',
|
template: '#lnbits-admin-funding',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
auditData: []
|
auditData: []
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-notifications', {
|
window.app.component('lnbits-admin-notifications', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-notifications',
|
template: '#lnbits-admin-notifications',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
nostrNotificationIdentifier: '',
|
nostrNotificationIdentifier: '',
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-security', {
|
window.app.component('lnbits-admin-security', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-security',
|
template: '#lnbits-admin-security',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
logs: [],
|
logs: [],
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
window.app.component('lnbits-admin-server', {
|
window.app.component('lnbits-admin-server', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-server',
|
template: '#lnbits-admin-server'
|
||||||
mixins: [window.windowMixin]
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-admin-site-customisation', {
|
window.app.component('lnbits-admin-site-customisation', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-site-customisation',
|
template: '#lnbits-admin-site-customisation',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
lnbits_theme_options: [
|
lnbits_theme_options: [
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
window.app.component('lnbits-admin-users', {
|
window.app.component('lnbits-admin-users', {
|
||||||
props: ['form-data'],
|
props: ['form-data'],
|
||||||
template: '#lnbits-admin-users',
|
template: '#lnbits-admin-users',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
formAddUser: '',
|
formAddUser: '',
|
||||||
formAddAdmin: ''
|
formAddAdmin: '',
|
||||||
|
formAddActivationCode: '',
|
||||||
|
showReusableActivationCode: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -32,6 +33,24 @@ window.app.component('lnbits-admin-users', {
|
|||||||
removeAdminUser(user) {
|
removeAdminUser(user) {
|
||||||
let admin_users = this.formData.lnbits_admin_users
|
let admin_users = this.formData.lnbits_admin_users
|
||||||
this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
|
this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
|
||||||
|
},
|
||||||
|
addOneTimeActivationCode() {
|
||||||
|
const code = this.formAddActivationCode
|
||||||
|
const activationCodes =
|
||||||
|
this.formData.lnbits_register_one_time_activation_codes
|
||||||
|
if (code?.length && !activationCodes.includes(code)) {
|
||||||
|
this.formData.lnbits_register_one_time_activation_codes = [
|
||||||
|
...activationCodes,
|
||||||
|
code
|
||||||
|
]
|
||||||
|
this.formAddActivationCode = ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
removeOneTimeActivationCode(code) {
|
||||||
|
const codes = this.formData.lnbits_register_one_time_activation_codes
|
||||||
|
this.formData.lnbits_register_one_time_activation_codes = codes.filter(
|
||||||
|
u => u !== code
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-disclaimer', {
|
window.app.component('lnbits-disclaimer', {
|
||||||
template: '#lnbits-disclaimer',
|
template: '#lnbits-disclaimer',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
computed: {
|
computed: {
|
||||||
showDisclaimer() {
|
showDisclaimer() {
|
||||||
return !g.disclaimerShown && g.isUserAuthorized
|
return !g.disclaimerShown && g.isUserAuthorized
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
window.app.component('lnbits-drawer', {
|
window.app.component('lnbits-drawer', {
|
||||||
template: '#lnbits-drawer',
|
template: '#lnbits-drawer'
|
||||||
mixins: [window.windowMixin]
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-error', {
|
window.app.component('lnbits-error', {
|
||||||
template: '#lnbits-error',
|
template: '#lnbits-error',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: ['dynamic', 'code', 'message'],
|
props: ['dynamic', 'code', 'message'],
|
||||||
computed: {
|
computed: {
|
||||||
isExtension() {
|
isExtension() {
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
window.app.component('lnbits-footer', {
|
window.app.component('lnbits-footer', {
|
||||||
template: '#lnbits-footer',
|
template: '#lnbits-footer',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
window.app.component('lnbits-header-wallets', {
|
window.app.component('lnbits-header-wallets', {
|
||||||
template: '#lnbits-header-wallets',
|
template: '#lnbits-header-wallets'
|
||||||
mixins: [window.windowMixin]
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,49 +1,9 @@
|
|||||||
window.app.component('lnbits-header', {
|
window.app.component('lnbits-header', {
|
||||||
template: '#lnbits-header',
|
template: '#lnbits-header',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
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 ||
|
||||||
@@ -61,5 +21,28 @@ window.app.component('lnbits-header', {
|
|||||||
return 'User'
|
return 'User'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
async stopImpersonation() {
|
||||||
|
try {
|
||||||
|
await LNbits.api.stopImpersonation()
|
||||||
|
LNbits.utils.restoreLocalStorage('impersonation')
|
||||||
|
window.location = '/users'
|
||||||
|
} catch (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)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-home-logos', {
|
window.app.component('lnbits-home-logos', {
|
||||||
template: '#lnbits-home-logos',
|
template: '#lnbits-home-logos',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
logos: [
|
logos: [
|
||||||
@@ -96,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,7 +1,6 @@
|
|||||||
window.app.component('lnbits-label-selector', {
|
window.app.component('lnbits-label-selector', {
|
||||||
template: '#lnbits-label-selector',
|
template: '#lnbits-label-selector',
|
||||||
props: ['labels'],
|
props: ['labels'],
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
labelFilter: '',
|
labelFilter: '',
|
||||||
|
|||||||
@@ -1,6 +1,16 @@
|
|||||||
window.app.component('lnbits-language-dropdown', {
|
window.app.component('lnbits-language-dropdown', {
|
||||||
template: '#lnbits-language-dropdown',
|
template: '#lnbits-language-dropdown',
|
||||||
mixins: [window.windowMixin],
|
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
|
||||||
@@ -9,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,5 +1,4 @@
|
|||||||
window.app.component('lnbits-manage-extension-list', {
|
window.app.component('lnbits-manage-extension-list', {
|
||||||
mixins: [window.windowMixin],
|
|
||||||
template: '#lnbits-manage-extension-list',
|
template: '#lnbits-manage-extension-list',
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-manage-wallet-list', {
|
window.app.component('lnbits-manage-wallet-list', {
|
||||||
template: '#lnbits-manage-wallet-list',
|
template: '#lnbits-manage-wallet-list',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
activeWalletId: null
|
activeWalletId: null
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
window.app.component('lnbits-payment-list', {
|
window.app.component('lnbits-payment-list', {
|
||||||
template: '#lnbits-payment-list',
|
template: '#lnbits-payment-list',
|
||||||
props: ['wallet', 'paymentFilter'],
|
props: ['wallet', 'paymentFilter'],
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
payments: [],
|
payments: [],
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-qrcode-lnurl', {
|
window.app.component('lnbits-qrcode-lnurl', {
|
||||||
template: '#lnbits-qrcode-lnurl',
|
template: '#lnbits-qrcode-lnurl',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: {
|
props: {
|
||||||
url: {
|
url: {
|
||||||
required: true,
|
required: true,
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
window.app.component('lnbits-qrcode', {
|
window.app.component('lnbits-qrcode', {
|
||||||
mixins: [window.windowMixin],
|
|
||||||
template: '#lnbits-qrcode',
|
template: '#lnbits-qrcode',
|
||||||
components: {
|
components: {
|
||||||
QrcodeVue: QrcodeVue.default
|
QrcodeVue: QrcodeVue.default
|
||||||
@@ -35,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() {
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
window.app.component('lnbits-theme', {
|
window.app.component('lnbits-theme', {
|
||||||
mixins: [window.windowMixin],
|
|
||||||
watch: {
|
watch: {
|
||||||
'g.walletFlip'(val) {
|
'g.walletFlip'(val) {
|
||||||
this.$q.localStorage.setItem('lnbits.walletFlip', val)
|
this.$q.localStorage.setItem('lnbits.walletFlip', val)
|
||||||
@@ -10,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)
|
||||||
},
|
},
|
||||||
@@ -124,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()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-wallet-api-docs', {
|
window.app.component('lnbits-wallet-api-docs', {
|
||||||
template: '#lnbits-wallet-api-docs',
|
template: '#lnbits-wallet-api-docs',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
methods: {
|
methods: {
|
||||||
resetKeys() {
|
resetKeys() {
|
||||||
LNbits.utils
|
LNbits.utils
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-wallet-charts', {
|
window.app.component('lnbits-wallet-charts', {
|
||||||
template: '#lnbits-wallet-charts',
|
template: '#lnbits-wallet-charts',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
props: ['paymentFilter', 'chartConfig'],
|
props: ['paymentFilter', 'chartConfig'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ window.app.component('lnbits-wallet-extra', {
|
|||||||
'lnbits.exchangeRate.' + this.g.wallet.currency,
|
'lnbits.exchangeRate.' + this.g.wallet.currency,
|
||||||
this.g.exchangeRate
|
this.g.exchangeRate
|
||||||
)
|
)
|
||||||
|
if (this.g.exchangeRate <= 0) {
|
||||||
|
this.g.fiatTracking = false
|
||||||
|
this.g.isFiatPriority = false
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch(e => console.error(e))
|
.catch(e => console.error(e))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-wallet-icon', {
|
window.app.component('lnbits-wallet-icon', {
|
||||||
template: '#lnbits-wallet-icon',
|
template: '#lnbits-wallet-icon',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
icon: {
|
icon: {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-wallet-new', {
|
window.app.component('lnbits-wallet-new', {
|
||||||
template: '#lnbits-wallet-new',
|
template: '#lnbits-wallet-new',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
walletTypes: [{label: 'Lightning Wallet', value: 'lightning'}],
|
walletTypes: [{label: 'Lightning Wallet', value: 'lightning'}],
|
||||||
@@ -98,6 +97,7 @@ window.app.component('lnbits-wallet-new', {
|
|||||||
this.g.lastWalletId = res.data.id
|
this.g.lastWalletId = res.data.id
|
||||||
this.$router.push(`/wallet/${res.data.id}`)
|
this.$router.push(`/wallet/${res.data.id}`)
|
||||||
})
|
})
|
||||||
|
.catch(LNbits.utils.notifyApiError)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-wallet-paylinks', {
|
window.app.component('lnbits-wallet-paylinks', {
|
||||||
template: '#lnbits-wallet-paylinks',
|
template: '#lnbits-wallet-paylinks',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
storedPaylinks: []
|
storedPaylinks: []
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.app.component('lnbits-wallet-share', {
|
window.app.component('lnbits-wallet-share', {
|
||||||
template: '#lnbits-wallet-share',
|
template: '#lnbits-wallet-share',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
computed: {
|
computed: {
|
||||||
walletApprovedShares() {
|
walletApprovedShares() {
|
||||||
return this.g.wallet.extra.shared_with.filter(
|
return this.g.wallet.extra.shared_with.filter(
|
||||||
|
|||||||
+35
-39
@@ -9,25 +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,
|
||||||
offline: !navigator.onLine,
|
isSatsDenomination: SETTINGS.denomination == 'sats',
|
||||||
hasCamera: false,
|
// local storage vars
|
||||||
visibleDrawer: false,
|
themeChoice: localStore('lnbits.theme', SETTINGS.defaultTheme),
|
||||||
extensions: WINDOW_SETTINGS.EXTENSIONS,
|
borderChoice: localStore('lnbits.border', SETTINGS.defaultBorder),
|
||||||
fiatBalance: 0,
|
gradientChoice: localStore('lnbits.gradientBg', SETTINGS.defaultGradient),
|
||||||
exchangeRate: 0,
|
reactionChoice: localStore('lnbits.reactions', SETTINGS.defaultReaction),
|
||||||
fiatTracking: false,
|
bgimageChoice: localStore(
|
||||||
payments: [],
|
'lnbits.backgroundImage',
|
||||||
walletEventListeners: [],
|
SETTINGS.defaultBgimage || ''
|
||||||
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),
|
||||||
@@ -35,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
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -106,6 +106,11 @@ const routes = [
|
|||||||
name: 'ExtensionsBuilder',
|
name: 'ExtensionsBuilder',
|
||||||
component: PageExtensionBuilder
|
component: PageExtensionBuilder
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/extensions/builder/preview',
|
||||||
|
name: 'ExtensionsBuilderPreview',
|
||||||
|
component: PageExtensionBuilderPreview
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/extensions',
|
path: '/extensions',
|
||||||
name: 'Extensions',
|
name: 'Extensions',
|
||||||
@@ -152,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
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageAccount = {
|
window.PageAccount = {
|
||||||
template: '#page-account',
|
template: '#page-account',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
untouchedUser: null,
|
untouchedUser: null,
|
||||||
@@ -40,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',
|
||||||
@@ -214,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({
|
||||||
@@ -610,7 +610,7 @@ window.PageAccount = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
copyAssetLinkToClipboard(asset) {
|
copyAssetLinkToClipboard(asset) {
|
||||||
const assetUrl = `${window.location.origin}/api/v1/assets/${asset.id}/binary`
|
const assetUrl = `${window.location.origin}/api/v1/assets/${asset.id}/data`
|
||||||
this.utils.copyText(assetUrl)
|
this.utils.copyText(assetUrl)
|
||||||
},
|
},
|
||||||
addUserLabel() {
|
addUserLabel() {
|
||||||
@@ -681,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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -694,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)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageAdmin = {
|
window.PageAdmin = {
|
||||||
template: '#page-admin',
|
template: '#page-admin',
|
||||||
mixins: [windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tab: 'funding',
|
tab: 'funding',
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageAudit = {
|
window.PageAudit = {
|
||||||
template: '#page-audit',
|
template: '#page-audit',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
chartsReady: false,
|
chartsReady: false,
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
window.PageError = {
|
window.PageError = {
|
||||||
template: '#page-error',
|
template: '#page-error'
|
||||||
mixins: [window.windowMixin]
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageExtensions = {
|
window.PageExtensions = {
|
||||||
template: '#page-extensions',
|
template: '#page-extensions',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
extbuilderEnabled: false,
|
extbuilderEnabled: false,
|
||||||
@@ -843,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'
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageExtensionBuilder = {
|
window.PageExtensionBuilder = {
|
||||||
template: '#page-extension-builder',
|
template: '#page-extension-builder',
|
||||||
mixins: [windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
step: 1,
|
step: 1,
|
||||||
@@ -288,11 +287,10 @@ window.PageExtensionBuilder = {
|
|||||||
`/api/v1/extension/${stub_ext_id}/releases`
|
`/api/v1/extension/${stub_ext_id}/releases`
|
||||||
)
|
)
|
||||||
|
|
||||||
this.extensionStubVersions = data.sort((a, b) =>
|
this.extensionStubVersions = data
|
||||||
a.version < b.version ? 1 : -1
|
const validVersions = data.filter(v => v.is_version_compatible)
|
||||||
)
|
this.extensionData.stub_version = validVersions[0]
|
||||||
this.extensionData.stub_version = this.extensionStubVersions[0]
|
? validVersions[0].version
|
||||||
? this.extensionStubVersions[0].version
|
|
||||||
: ''
|
: ''
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
LNbits.utils.notifyApiError(error)
|
LNbits.utils.notifyApiError(error)
|
||||||
@@ -311,7 +309,20 @@ window.PageExtensionBuilder = {
|
|||||||
iframeDoc.body.style.transform = 'scale(0.8)'
|
iframeDoc.body.style.transform = 'scale(0.8)'
|
||||||
iframeDoc.body.style.transformOrigin = 'center top'
|
iframeDoc.body.style.transformOrigin = 'center top'
|
||||||
}
|
}
|
||||||
iframe.src = `/extensions/builder/preview/${this.extensionData.id}?page_name=${previewPageName}`
|
|
||||||
|
let componentName =
|
||||||
|
'Page' +
|
||||||
|
this.extensionData.id
|
||||||
|
.toLowerCase()
|
||||||
|
.split('_')
|
||||||
|
.map(word => word.charAt(0).toUpperCase() + word.slice(1))
|
||||||
|
.join('')
|
||||||
|
if (previewPageName === 'public_page') componentName += 'Public'
|
||||||
|
iframe.src =
|
||||||
|
`/extensions/builder/preview?` +
|
||||||
|
`ext_id=${this.extensionData.id}` +
|
||||||
|
`&page=${previewPageName}` +
|
||||||
|
`&component=${componentName}`
|
||||||
},
|
},
|
||||||
initBasicData() {
|
initBasicData() {
|
||||||
this.extensionData.owner_data.fields = [
|
this.extensionData.owner_data.fields = [
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
window.PageExtensionBuilderPreview = {
|
||||||
|
template: '#page-extension-builder-preview',
|
||||||
|
mixins: [windowMixin],
|
||||||
|
watch: {
|
||||||
|
name: 'reload'
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
extId: '',
|
||||||
|
pageName: '',
|
||||||
|
componentName: null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
async reload() {
|
||||||
|
await LNbits.utils.loadTemplate(
|
||||||
|
`/extensions/builder/preview/${this.extId}/template?page_name=${this.pageName}`
|
||||||
|
)
|
||||||
|
await LNbits.utils.loadScript(
|
||||||
|
`/extensions/builder/preview/${this.extId}/component?page_name=${this.pageName}`
|
||||||
|
)
|
||||||
|
|
||||||
|
this._component = window[this.componentName]
|
||||||
|
console.log(
|
||||||
|
'LNbits preview reloaded componentName:',
|
||||||
|
this.componentName,
|
||||||
|
!!this._component
|
||||||
|
)
|
||||||
|
this.$forceUpdate()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async created() {
|
||||||
|
const urlParams = new URLSearchParams(window.location.search)
|
||||||
|
this.extId = urlParams.get('ext_id') || ''
|
||||||
|
this.pageName = urlParams.get('page') || ''
|
||||||
|
this.componentName = urlParams.get('component') || ''
|
||||||
|
|
||||||
|
await this.reload()
|
||||||
|
},
|
||||||
|
render() {
|
||||||
|
if (this._component) {
|
||||||
|
return Vue.h(this._component)
|
||||||
|
}
|
||||||
|
return Vue.h('div', 'Loading...')
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageFirstInstall = {
|
window.PageFirstInstall = {
|
||||||
template: '#page-first-install',
|
template: '#page-first-install',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
loginData: {
|
loginData: {
|
||||||
@@ -8,7 +7,8 @@ window.PageFirstInstall = {
|
|||||||
isPwdRepeat: true,
|
isPwdRepeat: true,
|
||||||
username: '',
|
username: '',
|
||||||
password: '',
|
password: '',
|
||||||
passwordRepeat: ''
|
passwordRepeat: '',
|
||||||
|
firstInstallToken: ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -18,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') || ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageHome = {
|
window.PageHome = {
|
||||||
template: '#page-home',
|
template: '#page-home',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
lnurl: '',
|
lnurl: '',
|
||||||
@@ -12,6 +11,7 @@ window.PageHome = {
|
|||||||
email: '',
|
email: '',
|
||||||
password: '',
|
password: '',
|
||||||
passwordRepeat: '',
|
passwordRepeat: '',
|
||||||
|
invitationCode: '',
|
||||||
walletName: '',
|
walletName: '',
|
||||||
signup: false
|
signup: false
|
||||||
}
|
}
|
||||||
@@ -20,40 +20,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: {
|
||||||
@@ -66,6 +41,7 @@ window.PageHome = {
|
|||||||
this.username = null
|
this.username = null
|
||||||
this.password = null
|
this.password = null
|
||||||
this.passwordRepeat = null
|
this.passwordRepeat = null
|
||||||
|
this.invitationCode = null
|
||||||
|
|
||||||
this.authAction = 'register'
|
this.authAction = 'register'
|
||||||
this.authMethod = authMethod
|
this.authMethod = authMethod
|
||||||
@@ -77,7 +53,8 @@ window.PageHome = {
|
|||||||
this.username,
|
this.username,
|
||||||
this.email,
|
this.email,
|
||||||
this.password,
|
this.password,
|
||||||
this.passwordRepeat
|
this.passwordRepeat,
|
||||||
|
this.invitationCode
|
||||||
)
|
)
|
||||||
this.refreshAuthUser()
|
this.refreshAuthUser()
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageNodePublic = {
|
window.PageNodePublic = {
|
||||||
template: '#page-node-public',
|
template: '#page-node-public',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
window.PageNode = {
|
window.PageNode = {
|
||||||
mixins: [window.windowMixin],
|
|
||||||
template: '#page-node',
|
template: '#page-node',
|
||||||
config: {
|
config: {
|
||||||
globalProperties: {
|
globalProperties: {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PagePayments = {
|
window.PagePayments = {
|
||||||
template: '#page-payments',
|
template: '#page-payments',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
payments: [],
|
payments: [],
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageUsers = {
|
window.PageUsers = {
|
||||||
template: '#page-users',
|
template: '#page-users',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
paymentsWallet: {},
|
paymentsWallet: {},
|
||||||
@@ -71,10 +70,10 @@ window.PageUsers = {
|
|||||||
usersTable: {
|
usersTable: {
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
name: 'admin',
|
name: 'activated',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: 'Admin',
|
label: this.$t('activated'),
|
||||||
field: 'admin',
|
field: 'activated',
|
||||||
sortable: false
|
sortable: false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -402,7 +401,7 @@ window.PageUsers = {
|
|||||||
|
|
||||||
toggleAdmin(userId) {
|
toggleAdmin(userId) {
|
||||||
LNbits.api
|
LNbits.api
|
||||||
.request('GET', `/users/api/v1/user/${userId}/admin`)
|
.request('PUT', `/users/api/v1/user/${userId}/admin`)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
this.fetchUsers()
|
this.fetchUsers()
|
||||||
Quasar.Notify.create({
|
Quasar.Notify.create({
|
||||||
@@ -413,6 +412,19 @@ window.PageUsers = {
|
|||||||
})
|
})
|
||||||
.catch(LNbits.utils.notifyApiError)
|
.catch(LNbits.utils.notifyApiError)
|
||||||
},
|
},
|
||||||
|
toggleUserActivated(userId) {
|
||||||
|
LNbits.api
|
||||||
|
.request('PUT', `/users/api/v1/user/${userId}/activate`)
|
||||||
|
.then(res => {
|
||||||
|
this.fetchUsers()
|
||||||
|
Quasar.Notify.create({
|
||||||
|
type: 'positive',
|
||||||
|
message: res.data.message,
|
||||||
|
icon: null
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.catch(LNbits.utils.notifyApiError)
|
||||||
|
},
|
||||||
async showAccountPage(user_id) {
|
async showAccountPage(user_id) {
|
||||||
this.activeUser.showPassword = false
|
this.activeUser.showPassword = false
|
||||||
this.activeUser.showUserId = false
|
this.activeUser.showUserId = false
|
||||||
@@ -439,6 +451,20 @@ window.PageUsers = {
|
|||||||
this.activeUser.show = false
|
this.activeUser.show = false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
async impersonateUser(user_id) {
|
||||||
|
try {
|
||||||
|
await LNbits.api.impersonateUser(user_id)
|
||||||
|
LNbits.utils.backupLocalStorage('impersonation', true)
|
||||||
|
this.$q.localStorage.setItem('lnbits.disclaimerShown', true)
|
||||||
|
window.location = '/wallet'
|
||||||
|
} catch (error) {
|
||||||
|
console.warn(error)
|
||||||
|
Quasar.Notify.create({
|
||||||
|
type: 'warning',
|
||||||
|
message: 'Failed to impersonate user!'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
async showWalletPayments(walletId) {
|
async showWalletPayments(walletId) {
|
||||||
this.activeUser.show = false
|
this.activeUser.show = false
|
||||||
await this.fetchWallets(this.users[0].id)
|
await this.fetchWallets(this.users[0].id)
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageWallet = {
|
window.PageWallet = {
|
||||||
template: '#page-wallet',
|
template: '#page-wallet',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
parse: {
|
parse: {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
window.PageWallets = {
|
window.PageWallets = {
|
||||||
template: '#page-wallets',
|
template: '#page-wallets',
|
||||||
mixins: [window.windowMixin],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
user: null,
|
user: null,
|
||||||
|
|||||||
+58
-13
@@ -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) {
|
||||||
@@ -67,6 +67,29 @@ window._lnbitsUtils = {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
backupLocalStorage(backupKey, cleanup = false) {
|
||||||
|
const lnbitsEntries =
|
||||||
|
Object.entries(Quasar.LocalStorage.getAll()).filter(
|
||||||
|
([k, v]) => k.startsWith('lnbits.') && k !== `lnbits.${backupKey}`
|
||||||
|
) || []
|
||||||
|
|
||||||
|
Quasar.LocalStorage.setItem(`lnbits.${backupKey}`, lnbitsEntries)
|
||||||
|
if (cleanup) {
|
||||||
|
lnbitsEntries.forEach(([k, v]) => Quasar.LocalStorage.remove(k))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
restoreLocalStorage(backupKey) {
|
||||||
|
Object.entries(Quasar.LocalStorage.getAll())
|
||||||
|
.filter(
|
||||||
|
([k, v]) => k.startsWith('lnbits.') && k !== `lnbits.${backupKey}`
|
||||||
|
)
|
||||||
|
.forEach(([k, v]) => Quasar.LocalStorage.remove(k))
|
||||||
|
|
||||||
|
const lnbitsEntries =
|
||||||
|
Quasar.LocalStorage.getItem(`lnbits.${backupKey}`) || []
|
||||||
|
lnbitsEntries.forEach(([k, v]) => Quasar.LocalStorage.setItem(k, v))
|
||||||
|
Quasar.LocalStorage.remove(`lnbits.${backupKey}`)
|
||||||
|
},
|
||||||
async digestMessage(message) {
|
async digestMessage(message) {
|
||||||
const msgUint8 = new TextEncoder().encode(message)
|
const msgUint8 = new TextEncoder().encode(message)
|
||||||
const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8)
|
const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8)
|
||||||
@@ -114,7 +137,14 @@ window._lnbitsUtils = {
|
|||||||
formatMsat(value) {
|
formatMsat(value) {
|
||||||
return this.formatSat(value / 1000)
|
return this.formatSat(value / 1000)
|
||||||
},
|
},
|
||||||
notifyApiError(error) {
|
parseJSONSafe(str) {
|
||||||
|
try {
|
||||||
|
return JSON.parse(str)
|
||||||
|
} catch (e) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async notifyApiError(error) {
|
||||||
if (!error.response) {
|
if (!error.response) {
|
||||||
return console.error(error)
|
return console.error(error)
|
||||||
}
|
}
|
||||||
@@ -123,17 +153,32 @@ window._lnbitsUtils = {
|
|||||||
401: 'warning',
|
401: 'warning',
|
||||||
500: 'negative'
|
500: 'negative'
|
||||||
}
|
}
|
||||||
Quasar.Notify.create({
|
let messages = error.response.data.detail
|
||||||
timeout: 5000,
|
if (!messages) {
|
||||||
type: types[error.response.status] || 'warning',
|
const text = await error.response.data?.text()
|
||||||
message:
|
messages = this.parseJSONSafe(text)?.detail
|
||||||
error.response.data.message || error.response.data.detail || null,
|
}
|
||||||
caption:
|
if (messages) {
|
||||||
[error.response.status, ' ', error.response.statusText]
|
messages = Array.isArray(messages)
|
||||||
.join('')
|
? messages.map(e => e.msg + ` (${e.loc?.join('/')})`)
|
||||||
.toUpperCase() || null,
|
: (messages = [messages])
|
||||||
icon: null
|
} else {
|
||||||
})
|
messages = [error.response.data.message || error.response.data.detail]
|
||||||
|
}
|
||||||
|
|
||||||
|
messages.forEach(message =>
|
||||||
|
Quasar.Notify.create({
|
||||||
|
timeout: 5000,
|
||||||
|
type: types[error.response.status] || 'warning',
|
||||||
|
message,
|
||||||
|
caption:
|
||||||
|
[error.response.status, ' ', error.response.statusText]
|
||||||
|
.join('')
|
||||||
|
.toUpperCase() || null,
|
||||||
|
icon: null,
|
||||||
|
closeBtn: true
|
||||||
|
})
|
||||||
|
)
|
||||||
},
|
},
|
||||||
search(data, q, field, separator) {
|
search(data, q, field, separator) {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -45,6 +45,8 @@
|
|||||||
"js/pages/error.js",
|
"js/pages/error.js",
|
||||||
"js/pages/home.js",
|
"js/pages/home.js",
|
||||||
"js/pages/extensions_builder.js",
|
"js/pages/extensions_builder.js",
|
||||||
|
"js/pages/extensions_builder.js",
|
||||||
|
"js/pages/extensions_builder_preview.js",
|
||||||
"js/pages/extensions.js",
|
"js/pages/extensions.js",
|
||||||
"js/pages/first-install.js",
|
"js/pages/first-install.js",
|
||||||
"js/pages/payments.js",
|
"js/pages/payments.js",
|
||||||
|
|||||||
+5
-1
@@ -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
|
||||||
|
|||||||
@@ -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') %}
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -814,16 +814,90 @@ include('components/lnbits-error.vue') %}
|
|||||||
type="password"
|
type="password"
|
||||||
:rules="[val => !val || val.length >= 8 || $t('invalid_password')]"
|
:rules="[val => !val || val.length >= 8 || $t('invalid_password')]"
|
||||||
></q-input>
|
></q-input>
|
||||||
|
<div
|
||||||
|
v-if="confirmationMethodsCount > 1"
|
||||||
|
class="row justify-center q-mb-md"
|
||||||
|
>
|
||||||
|
<q-tabs
|
||||||
|
v-model="confirmationMethod"
|
||||||
|
dense
|
||||||
|
active-color="primary"
|
||||||
|
indicator-color="primary"
|
||||||
|
>
|
||||||
|
<q-tab
|
||||||
|
v-if="g.settings.userActivationByInvitationCode"
|
||||||
|
name="code"
|
||||||
|
icon="confirmation_number"
|
||||||
|
label="Code"
|
||||||
|
></q-tab>
|
||||||
|
<q-tab
|
||||||
|
v-if="g.settings.userActivationByPayment"
|
||||||
|
name="payment"
|
||||||
|
icon="bolt"
|
||||||
|
label="Payment"
|
||||||
|
></q-tab>
|
||||||
|
<q-tab
|
||||||
|
v-if="g.settings.userActivationByEmail"
|
||||||
|
name="email"
|
||||||
|
icon="email"
|
||||||
|
label="Email"
|
||||||
|
></q-tab>
|
||||||
|
</q-tabs>
|
||||||
|
</div>
|
||||||
|
<div v-if="confirmationMethodsCount > 0" class="q-mb-md">
|
||||||
|
<q-tab-panels v-model="confirmationMethod">
|
||||||
|
<q-tab-panel name="code" class="q-pa-none">
|
||||||
|
<div
|
||||||
|
class="q-my-md q-pa-sm text-body2 text-grey-4 bg-grey-9 rounded-borders"
|
||||||
|
>
|
||||||
|
<q-icon name="info" color="orange-4" class="q-mr-xs"></q-icon>
|
||||||
|
You need an invitation code to register.
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<q-input
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
v-model="confirmationCode"
|
||||||
|
:label="$t('invitation_code')"
|
||||||
|
:type="showConfirmationCode ? 'text' : 'password'"
|
||||||
|
:hint="$t('invitation_code_hint')"
|
||||||
|
>
|
||||||
|
<q-btn
|
||||||
|
@click="showConfirmationCode = !showConfirmationCode"
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
:icon="
|
||||||
|
showConfirmationCode ? 'visibility_off' : 'visibility'
|
||||||
|
"
|
||||||
|
color="grey"
|
||||||
|
></q-btn>
|
||||||
|
</q-input>
|
||||||
|
</div>
|
||||||
|
</q-tab-panel>
|
||||||
|
<q-tab-panel name="payment">
|
||||||
|
<div>payment</div>
|
||||||
|
</q-tab-panel>
|
||||||
|
|
||||||
|
<q-tab-panel name="email" class="q-pa-none">
|
||||||
|
<div>
|
||||||
|
<q-input
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
v-model="confirmationEmail"
|
||||||
|
:label="$t('email')"
|
||||||
|
:hint="$t('email_confirmation_hint')"
|
||||||
|
>
|
||||||
|
</q-input>
|
||||||
|
</div>
|
||||||
|
</q-tab-panel>
|
||||||
|
</q-tab-panels>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="row justify-end">
|
<div class="row justify-end">
|
||||||
<q-btn
|
<q-btn
|
||||||
unelevated
|
unelevated
|
||||||
color="primary"
|
color="primary"
|
||||||
:disable="
|
:disable="disableRegister"
|
||||||
!password ||
|
|
||||||
!passwordRepeat ||
|
|
||||||
!username ||
|
|
||||||
password !== passwordRepeat
|
|
||||||
"
|
|
||||||
type="submit"
|
type="submit"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
:label="$t('create_account')"
|
:label="$t('create_account')"
|
||||||
@@ -960,9 +1034,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 +1044,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>
|
||||||
|
|||||||
@@ -30,7 +30,6 @@
|
|||||||
>
|
>
|
||||||
</q-chip>
|
</q-chip>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-12 col-md-6">
|
||||||
<p><span v-text="$t('allowed_users')"></span></p>
|
<p><span v-text="$t('allowed_users')"></span></p>
|
||||||
@@ -57,7 +56,10 @@
|
|||||||
>
|
>
|
||||||
</q-chip>
|
</q-chip>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-12 col-md-6 q-mt-sm">
|
||||||
<q-item tag="label" v-ripple>
|
<q-item tag="label" v-ripple>
|
||||||
<q-item-section>
|
<q-item-section>
|
||||||
<q-item-label v-text="$t('allow_creation_user')"></q-item-label>
|
<q-item-label v-text="$t('allow_creation_user')"></q-item-label>
|
||||||
@@ -76,8 +78,237 @@
|
|||||||
/>
|
/>
|
||||||
</q-item-section>
|
</q-item-section>
|
||||||
</q-item>
|
</q-item>
|
||||||
<br />
|
</div>
|
||||||
|
<div class="col-12 col-md-6 q-mt-sm">
|
||||||
|
<q-item tag="label" v-ripple>
|
||||||
|
<q-item-section>
|
||||||
|
<q-item-label v-text="$t('require_user_activation')"></q-item-label>
|
||||||
|
<q-item-label
|
||||||
|
caption
|
||||||
|
v-text="$t('require_user_activation_desc')"
|
||||||
|
></q-item-label>
|
||||||
|
</q-item-section>
|
||||||
|
<q-item-section avatar>
|
||||||
|
<q-toggle
|
||||||
|
size="md"
|
||||||
|
v-model="formData.lnbits_require_user_activation"
|
||||||
|
checked-icon="check"
|
||||||
|
color="green"
|
||||||
|
unchecked-icon="clear"
|
||||||
|
/>
|
||||||
|
</q-item-section>
|
||||||
|
</q-item>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
<div v-if="formData.lnbits_require_user_activation" class="row">
|
||||||
|
<div class="col">
|
||||||
|
<q-list bordered class="rounded-borders">
|
||||||
|
<q-expansion-item header-class="text-primary text-bold">
|
||||||
|
<template v-slot:header>
|
||||||
|
<q-item-section avatar>
|
||||||
|
<q-icon name="confirmation_number" size="md"></q-icon>
|
||||||
|
</q-item-section>
|
||||||
|
|
||||||
|
<q-item-section> Invitation Code </q-item-section>
|
||||||
|
|
||||||
|
<q-item-section side>
|
||||||
|
<div class="row items-center">
|
||||||
|
<q-toggle
|
||||||
|
size="md"
|
||||||
|
:label="
|
||||||
|
formData.lnbits_user_activation_by_invitation_code
|
||||||
|
? $t('enabled')
|
||||||
|
: $t('disabled')
|
||||||
|
"
|
||||||
|
v-model="formData.lnbits_user_activation_by_invitation_code"
|
||||||
|
color="green"
|
||||||
|
unchecked-icon="clear"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</q-item-section>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<q-card class="q-pb-xl">
|
||||||
|
<q-card-section>
|
||||||
|
<div
|
||||||
|
class="q-my-md q-pa-sm text-body2 text-grey-4 bg-grey-9 rounded-borders"
|
||||||
|
>
|
||||||
|
<q-icon
|
||||||
|
name="info"
|
||||||
|
color="orange-4"
|
||||||
|
size="18px"
|
||||||
|
class="q-mr-xs"
|
||||||
|
></q-icon>
|
||||||
|
Users will need to provide a valid invitation code during
|
||||||
|
registration to activate their account.
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
<q-card-section>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-12 col-md-6 q-pr-sm">
|
||||||
|
<p><span v-text="$t('reusable_activation_code')"></span></p>
|
||||||
|
<q-input
|
||||||
|
filled
|
||||||
|
v-model="formData.lnbits_register_reusable_activation_code"
|
||||||
|
:type="showReusableActivationCode ? 'text' : 'password'"
|
||||||
|
:label="$t('reusable_activation_code_label')"
|
||||||
|
:hint="$t('reusable_activation_code_hint')"
|
||||||
|
>
|
||||||
|
<q-btn
|
||||||
|
@click="
|
||||||
|
showReusableActivationCode = !showReusableActivationCode
|
||||||
|
"
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
:icon="
|
||||||
|
showReusableActivationCode
|
||||||
|
? 'visibility_off'
|
||||||
|
: 'visibility'
|
||||||
|
"
|
||||||
|
color="grey"
|
||||||
|
></q-btn>
|
||||||
|
<q-btn
|
||||||
|
@click="
|
||||||
|
utils.copyText(
|
||||||
|
formData.lnbits_register_reusable_activation_code
|
||||||
|
)
|
||||||
|
"
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
icon="content_copy"
|
||||||
|
color="grey"
|
||||||
|
></q-btn>
|
||||||
|
</q-input>
|
||||||
|
</div>
|
||||||
|
<div class="col-12 col-md-6">
|
||||||
|
<p><span v-text="$t('one_time_activation_code')"></span></p>
|
||||||
|
<q-input
|
||||||
|
filled
|
||||||
|
v-model="formAddActivationCode"
|
||||||
|
@keydown.enter="addOneTimeActivationCode"
|
||||||
|
type="text"
|
||||||
|
:label="$t('one_time_activation_code_label')"
|
||||||
|
:hint="$t('one_time_activation_code_hint')"
|
||||||
|
>
|
||||||
|
<q-btn
|
||||||
|
@click="addOneTimeActivationCode"
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
icon="add"
|
||||||
|
></q-btn>
|
||||||
|
</q-input>
|
||||||
|
<div>
|
||||||
|
<q-chip
|
||||||
|
v-for="code in formData.lnbits_register_one_time_activation_codes"
|
||||||
|
:key="code"
|
||||||
|
removable
|
||||||
|
@remove="removeOneTimeActivationCode(code)"
|
||||||
|
color="primary"
|
||||||
|
text-color="white"
|
||||||
|
:label="code"
|
||||||
|
class="ellipsis"
|
||||||
|
>
|
||||||
|
</q-chip>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
</q-card>
|
||||||
|
</q-expansion-item>
|
||||||
|
<q-separator></q-separator>
|
||||||
|
|
||||||
|
<q-expansion-item header-class="text-primary text-bold">
|
||||||
|
<template v-slot:header>
|
||||||
|
<q-item-section avatar>
|
||||||
|
<q-avatar>
|
||||||
|
<q-icon name="bolt" size="md"></q-icon>
|
||||||
|
</q-avatar>
|
||||||
|
</q-item-section>
|
||||||
|
|
||||||
|
<q-item-section> Payment </q-item-section>
|
||||||
|
|
||||||
|
<q-item-section side>
|
||||||
|
<div class="row items-center">
|
||||||
|
<q-toggle
|
||||||
|
size="md"
|
||||||
|
disable
|
||||||
|
:label="
|
||||||
|
formData.lnbits_user_activation_by_payment
|
||||||
|
? $t('enabled')
|
||||||
|
: $t('disabled')
|
||||||
|
"
|
||||||
|
v-model="formData.lnbits_user_activation_by_payment"
|
||||||
|
color="green"
|
||||||
|
unchecked-icon="clear"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</q-item-section>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<q-card class="q-pb-xl">
|
||||||
|
<q-card-section>
|
||||||
|
<div
|
||||||
|
class="q-my-md q-pa-sm text-body2 text-grey-4 bg-grey-9 rounded-borders"
|
||||||
|
>
|
||||||
|
<q-icon
|
||||||
|
name="info"
|
||||||
|
color="orange-4"
|
||||||
|
size="18px"
|
||||||
|
class="q-mr-xs"
|
||||||
|
></q-icon>
|
||||||
|
Users will need to make a payment during registration to
|
||||||
|
activate their account.
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
</q-card>
|
||||||
|
</q-expansion-item>
|
||||||
|
<q-separator></q-separator>
|
||||||
|
<q-expansion-item header-class="text-primary text-bold">
|
||||||
|
<template v-slot:header>
|
||||||
|
<q-item-section avatar>
|
||||||
|
<q-avatar>
|
||||||
|
<q-icon name="email"></q-icon>
|
||||||
|
</q-avatar>
|
||||||
|
</q-item-section>
|
||||||
|
|
||||||
|
<q-item-section> Email </q-item-section>
|
||||||
|
|
||||||
|
<q-item-section side>
|
||||||
|
<div class="row items-center">
|
||||||
|
<q-toggle
|
||||||
|
disable
|
||||||
|
size="md"
|
||||||
|
:label="
|
||||||
|
formData.lnbits_user_activation_by_email
|
||||||
|
? $t('enabled')
|
||||||
|
: $t('disabled')
|
||||||
|
"
|
||||||
|
v-model="formData.lnbits_user_activation_by_email"
|
||||||
|
color="green"
|
||||||
|
unchecked-icon="clear"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</q-item-section>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<q-card class="q-pb-xl">
|
||||||
|
<q-card-section>
|
||||||
|
<div
|
||||||
|
class="q-my-md q-pa-sm text-body2 text-grey-4 bg-grey-9 rounded-borders"
|
||||||
|
>
|
||||||
|
<q-icon
|
||||||
|
name="info"
|
||||||
|
color="orange-4"
|
||||||
|
size="18px"
|
||||||
|
class="q-mr-xs"
|
||||||
|
></q-icon>
|
||||||
|
Users will receive a confirmation email.
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
</q-card>
|
||||||
|
</q-expansion-item>
|
||||||
|
</q-list>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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,9 +77,11 @@
|
|||||||
<span>OFFLINE</span>
|
<span>OFFLINE</span>
|
||||||
</q-badge>
|
</q-badge>
|
||||||
|
|
||||||
<lnbits-language-dropdown></lnbits-language-dropdown>
|
<lnbits-language-dropdown
|
||||||
|
@language-changed="handleLanguageChanged({locale: $event})"
|
||||||
|
></lnbits-language-dropdown>
|
||||||
|
|
||||||
<q-btn-dropdown v-if="g.user" flat rounded size="sm" class="q-pl-sm">
|
<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 !== ''"
|
||||||
@@ -136,6 +144,20 @@
|
|||||||
</q-item>
|
</q-item>
|
||||||
</q-list>
|
</q-list>
|
||||||
</q-btn-dropdown>
|
</q-btn-dropdown>
|
||||||
|
<q-btn
|
||||||
|
v-if="g.isUserImpersonated"
|
||||||
|
@click="stopImpersonation"
|
||||||
|
rounded
|
||||||
|
size="sm"
|
||||||
|
class="q-pl-sm"
|
||||||
|
color="negative"
|
||||||
|
icon="face_retouching_off"
|
||||||
|
label="Stop"
|
||||||
|
>
|
||||||
|
<q-tooltip
|
||||||
|
><span v-text="$t('stop_user_impersonation')"></span
|
||||||
|
></q-tooltip>
|
||||||
|
</q-btn>
|
||||||
</q-toolbar>
|
</q-toolbar>
|
||||||
</q-header>
|
</q-header>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -941,7 +974,7 @@
|
|||||||
v-if="props.row.thumbnail_base64"
|
v-if="props.row.thumbnail_base64"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
style="color: inherit"
|
style="color: inherit"
|
||||||
:href="`/api/v1/assets/${props.row.id}/binary`"
|
:href="`/api/v1/assets/${props.row.id}/data`"
|
||||||
>
|
>
|
||||||
<q-img
|
<q-img
|
||||||
:src="
|
:src="
|
||||||
|
|||||||
@@ -178,7 +178,7 @@
|
|||||||
"
|
"
|
||||||
:clickable="!!reviewsUrl"
|
:clickable="!!reviewsUrl"
|
||||||
@click="openReviews(extension)"
|
@click="openReviews(extension)"
|
||||||
/>
|
></lnbits-extension-rating>
|
||||||
<q-btn-group size="xs" style="margin: 5px 0">
|
<q-btn-group size="xs" style="margin: 5px 0">
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="extension.hasFreeRelease"
|
v-if="extension.hasFreeRelease"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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,12 +57,13 @@
|
|||||||
<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"
|
||||||
v-model:password_2="passwordRepeat"
|
v-model:password_2="passwordRepeat"
|
||||||
|
v-model:invitation-code="invitationCode"
|
||||||
v-model:reset-key="reset_key"
|
v-model:reset-key="reset_key"
|
||||||
@login="login"
|
@login="login"
|
||||||
@register="register"
|
@register="register"
|
||||||
@@ -70,7 +74,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 +86,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 +107,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 +120,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 +158,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>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user