feat: better wording

lnbits/core/services/users.py

@@ -3,8 +3,10 @@ from uuid import uuid4
 
 from loguru import logger
 
+from lnbits.core.crud.settings import set_settings_field
 from lnbits.core.db import db
 from lnbits.core.models.extensions import UserExtension
+from lnbits.core.models.users import RegisterUser
 from lnbits.db import Connection
 from lnbits.settings import (
     EditableSettings,
@@ -192,3 +194,22 @@ async def init_admin_settings(super_user: str | None = None) -> SuperSettings:
 
     editable_settings = EditableSettings.from_dict(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 and data.invitation_code:
+        code = data.invitation_code.strip()
+        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.")

lnbits/core/views/auth_api.py

@@ -12,7 +12,6 @@ from fastapi.responses import JSONResponse, RedirectResponse
 from fastapi_sso.sso.base import OpenID, SSOBase
 from loguru import logger
 
-from lnbits.core.crud.settings import set_settings_field
 from lnbits.core.crud.users import (
     get_user_access_control_lists,
     update_user_access_control_list,
@@ -27,7 +26,10 @@ from lnbits.core.models.users import (
     UpdateAccessControlList,
 )
 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 (
     access_token_payload,
     check_account_exists,
@@ -379,25 +381,6 @@ async def register(data: RegisterUser) -> JSONResponse:
     return _auth_success_response(account.username, account.id, account.email)
 
 
-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 and data.invitation_code:
-        code = data.invitation_code.strip()
-        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.")
-
-
 @auth_router.put("/pubkey")
 async def update_pubkey(
     data: UpdateUserPubkey,

lnbits/static/i18n/en.js

@@ -720,8 +720,8 @@ window.localisation.en = {
   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.',
-  confirmation_code: 'Confirmation Code',
-  confirmation_code_hint: 'The confirmation code that you have received.',
+  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',

lnbits/templates/components.vue

@@ -814,17 +814,6 @@ include('components/lnbits-error.vue') %}
           type="password"
           :rules="[val => !val || val.length >= 8 || $t('invalid_password')]"
         ></q-input>
-        <div
-          v-if="confirmationMethodsCount > 0"
-          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>
-
-          Confirmation required before you can log in.
-          <div v-if="confirmationMethodsCount > 1">
-            Please choose one of the methods below.
-          </div>
-        </div>
         <div
           v-if="confirmationMethodsCount > 1"
           class="row justify-center q-mb-md"
@@ -864,14 +853,20 @@ include('components/lnbits-error.vue') %}
         <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('confirmation_code')"
+                  :label="$t('invitation_code')"
                   :type="showConfirmationCode ? 'text' : 'password'"
-                  :hint="$t('confirmation_code_hint')"
+                  :hint="$t('invitation_code_hint')"
                 >
                   <q-btn
                     @click="showConfirmationCode = !showConfirmationCode"
@@ -889,6 +884,13 @@ include('components/lnbits-error.vue') %}
               <div>payment</div>
             </q-tab-panel>
             <q-tab-panel name="nostr" 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 will receive a confirmation link at the provided Nostr
+                identifier or NPub.
+              </div>
               <div>
                 <q-input
                   dense