Michilis/lnbits
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: the username and picture (#3638)

Browse Source 
Co-authored-by: dni ⚡ <office@dnilabs.com>
This commit is contained in:
Tiago Vasconcelos
2025-12-08 15:03:29 +01:00
committed by GitHub
co-authored by dni ⚡
parent b4c0cdbc7c
commit 7b635a31e5
7 changed files with 60 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lnbits/static/bundle-components.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lnbits/static/bundle.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lnbits/static/js/base.js
+1
View File
@@ -6,6 +6,7 @@ window.LNbits = {
user(data) {
const obj = {
id: data.id,
username: data.username,
admin: data.admin,
email: data.email,
extensions: data.extensions,
lnbits/static/js/components/lnbits-header.js
+1 -6
View File
@@ -38,12 +38,6 @@ window.app.component('lnbits-header', {
customLogoUrl() {
return this.USE_CUSTOM_LOGO || null
},
userPictureUrl() {
return this.g.user.extra.picture
},
hasUserPicture() {
return this.g.user && this.g.user.extra && this.g.user.extra.picture != ''
},
showAdmin() {
return this.g.user && (this.g.user.super_user || this.g.user.admin)
},
@@ -53,6 +47,7 @@ window.app.component('lnbits-header', {
displayName() {
return (
this.g.user?.extra?.display_name ||
this.g.user.username ||
this.g.user?.extra?.first_name ||
'Anon'
)
lnbits/static/js/pages/account.js
+22 -32
View File
@@ -3,7 +3,6 @@ window.PageAccount = {
mixins: [window.windowMixin],
data() {
return {
user: null,
untouchedUser: null,
hasUsername: false,
showUserId: false,
@@ -211,7 +210,7 @@ window.PageAccount = {
},
computed: {
isUserTouched() {
return JSON.stringify(this.user) !== JSON.stringify(this.untouchedUser)
return !_.isEqual(this.g.user, this.untouchedUser)
}
},
methods: {
@@ -229,14 +228,13 @@ window.PageAccount = {
'/api/v1/auth/update',
null,
{
user_id: this.user.id,
username: this.user.username,
email: this.user.email,
extra: this.user.extra
user_id: this.g.user.id,
username: this.g.user.username,
email: this.g.user.email,
extra: this.g.user.extra
}
)
this.user = data
this.untouchedUser = JSON.parse(JSON.stringify(data))
this.untouchedUser = JSON.parse(JSON.stringify(this.g.user))
this.hasUsername = !!data.username
Quasar.Notify.create({
type: 'positive',
@@ -268,14 +266,13 @@ window.PageAccount = {
'/api/v1/auth/password',
null,
{
user_id: this.user.id,
user_id: this.g.user.id,
username: this.credentialsData.username,
password_old: this.credentialsData.oldPassword,
password: this.credentialsData.newPassword,
password_repeat: this.credentialsData.newPasswordRepeat
}
)
this.user = data
this.untouchedUser = JSON.parse(JSON.stringify(data))
this.hasUsername = !!data.username
this.credentialsData.show = false
@@ -294,11 +291,10 @@ window.PageAccount = {
'/api/v1/auth/pubkey',
null,
{
user_id: this.user.id,
user_id: this.g.user.id,
pubkey: this.credentialsData.pubkey
}
)
this.user = data
this.untouchedUser = JSON.parse(JSON.stringify(data))
this.hasUsername = !!data.username
this.credentialsData.show = false
@@ -314,8 +310,8 @@ window.PageAccount = {
this.credentialsData = {
show: true,
oldPassword: null,
username: this.user.username,
pubkey: this.user.pubkey,
username: this.g.user.username,
pubkey: this.g.user.pubkey,
newPassword: null,
newPasswordRepeat: null
}
@@ -431,7 +427,7 @@ window.PageAccount = {
'/api/v1/auth/acl',
null,
{
id: this.user.id,
id: this.g.user.id,
password: this.apiAcl.password,
...this.selectedApiAcl
}
@@ -632,8 +628,8 @@ window.PageAccount = {
})
return
}
this.user.extra.labels = this.user.extra.labels || []
const duplicate = this.user.extra.labels.find(
this.g.user.extra.labels = this.g.user.extra.labels || []
const duplicate = this.g.user.extra.labels.find(
label => label.name === this.labelsDialog.data.name
)
if (duplicate) {
@@ -643,7 +639,7 @@ window.PageAccount = {
})
return
}
this.user.extra.labels.unshift({...this.labelsDialog.data})
this.g.user.extra.labels.unshift({...this.labelsDialog.data})
this.labelsDialog.show = false
return true
},
@@ -665,13 +661,15 @@ window.PageAccount = {
},
updateUserLabel() {
const label = this.labelsDialog.data
const existingLabels = JSON.parse(JSON.stringify(this.user.extra.labels))
this.user.extra.labels = this.user.extra.labels.filter(
const existingLabels = JSON.parse(
JSON.stringify(this.g.user.extra.labels)
)
this.g.user.extra.labels = this.g.user.extra.labels.filter(
l => l.name !== label.name
)
const labelUpdated = this.addUserLabel()
if (!labelUpdated) {
this.user.extra.labels = existingLabels
this.g.user.extra.labels = existingLabels
}
this.labelsDialog.show = false
},
@@ -679,7 +677,7 @@ window.PageAccount = {
LNbits.utils
.confirmDialog('Are you sure you want to delete this label?')
.onOk(() => {
this.user.extra.labels = this.user.extra.labels.filter(
this.g.user.extra.labels = this.g.user.extra.labels.filter(
l => l.name !== label.name
)
})
@@ -687,21 +685,13 @@ window.PageAccount = {
},
async created() {
try {
const {data} = await LNbits.api.getAuthenticatedUser()
this.user = data
this.untouchedUser = JSON.parse(JSON.stringify(data))
this.hasUsername = !!data.username
if (!this.user.extra) this.user.extra = {}
} catch (e) {
LNbits.utils.notifyApiError(e)
}
this.untouchedUser = JSON.parse(JSON.stringify(this.g.user))
this.hasUsername = !!this.g.user.username
if (this.$route.hash.length > 1) {
this.tab = this.$route.hash.replace('#', '')
}
await this.getApiACLs()
await this.getUserAssets()
// filter out themes that are not allowed
this.themeOptions = this.themeOptions.filter(theme =>
this.LNBITS_THEME_OPTIONS.includes(theme.name)
lnbits/templates/components/lnbits-header.vue
+5 -5
View File
@@ -81,16 +81,16 @@
class="q-pl-sm"
>
<template v-slot:label>
<q-avatar v-if="hasUserPicture" size="18px">
<q-img :src="userPictureUrl"></q-img>
<q-avatar v-if="g.user?.extra?.picture !== ''" size="18px">
<q-img :src="g.user?.extra?.picture"></q-img>
</q-avatar>
<q-avatar v-else icon="account_circle"></q-avatar>
<q-avatar v-else icon="account_circle" size="18px"></q-avatar>
</template>
<q-list style="max-width: 200px">
<q-item>
<q-item-section avatar v-if="hasUserPicture">
<q-item-section avatar v-if="g.user?.extra?.picture !== ''">
<q-avatar size="md">
<img :src="userPictureUrl" />
<img :src="g.user?.extra?.picture" />
</q-avatar>
</q-item-section>
<q-item-section>
lnbits/templates/pages/account.vue
+29 -29
View File
@@ -90,7 +90,7 @@
</template>
<template v-slot:after>
<q-scroll-area style="height: 80vh">
<q-tab-panels v-if="user" v-model="tab">
<q-tab-panels v-if="g.user" v-model="tab">
<q-tab-panel name="user">
<div v-if="credentialsData.show">
<q-card-section>
@@ -102,9 +102,9 @@
</div>
<div class="col">
<q-img
v-if="user.extra.picture"
v-if="g.user.extra.picture"
style="max-width: 100px"
:src="user.extra.picture"
:src="g.user.extra.picture"
class="float-right"
></q-img>
</div>
@@ -120,7 +120,7 @@
class="q-mb-md"
></q-input>
<q-input
v-if="user.has_password"
v-if="g.user.has_password"
v-model="credentialsData.oldPassword"
type="password"
autocomplete="off"
@@ -202,12 +202,12 @@
</q-card-section>
</div>
<div v-else>
<q-card-section v-if="user.extra.picture">
<q-card-section v-if="g.user.extra.picture">
<div class="row">
<div class="col">
<q-img
style="max-width: 100px"
:src="user.extra.picture"
:src="g.user.extra.picture"
class="float-right"
></q-img>
</div>
@@ -216,7 +216,7 @@
<q-card-section>
<q-input
v-model="user.id"
v-model="g.user.id"
:label="$t('user_id')"
filled
dense
@@ -232,7 +232,7 @@
></q-btn>
</q-input>
<q-input
v-model="user.username"
v-model="g.user.username"
:label="$t('username')"
filled
dense
@@ -241,7 +241,7 @@
>
</q-input>
<q-input
v-model="user.pubkey"
v-model="g.user.pubkey"
:label="$t('pubkey')"
filled
dense
@@ -250,7 +250,7 @@
>
</q-input>
<q-input
v-model="user.email"
v-model="g.user.email"
:label="$t('email')"
filled
dense
@@ -258,8 +258,8 @@
class="q-mb-md"
>
</q-input>
<div v-if="!user.email" class="row"></div>
<div v-if="!user.email" class="row">
<div v-if="!g.user.email" class="row"></div>
<div v-if="!g.user.email" class="row">
{% if "google-auth" in LNBITS_AUTH_METHODS or
"github-auth" in LNBITS_AUTH_METHODS %}
<div class="col q-pa-sm text-h6">
@@ -268,7 +268,7 @@
{%endif%} {% if "google-auth" in LNBITS_AUTH_METHODS %}
<div class="col q-pa-sm">
<q-btn
:href="`/api/v1/auth/google?user_id=${user.id}`"
:href="`/api/v1/auth/google?user_id=${g.user.id}`"
type="a"
outline
no-caps
@@ -287,7 +287,7 @@
{%endif%} {% if "github-auth" in LNBITS_AUTH_METHODS %}
<div class="col q-pa-sm">
<q-btn
:href="`/api/v1/auth/github?user_id=${user.id}`"
:href="`/api/v1/auth/github?user_id=${g.user.id}`"
type="a"
outline
no-caps
@@ -307,9 +307,9 @@
</div>
</q-card-section>
<q-card-section v-if="user.extra">
<q-card-section v-if="g.user.extra">
<q-input
v-model="user.extra.first_name"
v-model="g.user.extra.first_name"
:label="$t('first_name')"
filled
dense
@@ -317,7 +317,7 @@
>
</q-input>
<q-input
v-model="user.extra.last_name"
v-model="g.user.extra.last_name"
:label="$t('last_name')"
filled
dense
@@ -325,7 +325,7 @@
>
</q-input>
<q-input
v-model="user.extra.provider"
v-model="g.user.extra.provider"
:label="$t('auth_provider')"
filled
dense
@@ -334,7 +334,7 @@
>
</q-input>
<q-input
v-model="user.external_id"
v-model="g.user.external_id"
:label="$t('external_id')"
filled
dense
@@ -344,7 +344,7 @@
</q-input>
<q-input
v-model="user.extra.picture"
v-model="g.user.extra.picture"
:label="$t('picture')"
:hint="$t('user_picture_desc')"
filled
@@ -389,7 +389,7 @@
</div>
<div class="col-8">
<q-input
v-model="user.extra.visible_wallet_count"
v-model="g.user.extra.visible_wallet_count"
:label="$t('visible_wallet_count')"
filled
dense
@@ -533,7 +533,7 @@
<q-input
filled
dense
v-model="user.extra.notifications.nostr_identifier"
v-model="g.user.extra.notifications.nostr_identifier"
:hint="$t('notifications_nostr_identifier_desc')"
>
</q-input>
@@ -553,7 +553,7 @@
<q-input
filled
dense
v-model="user.extra.notifications.telegram_chat_id"
v-model="g.user.extra.notifications.telegram_chat_id"
:hint="$t('notifications_chat_id_desc')"
/>
</div>
@@ -573,7 +573,7 @@
min="0"
step="1"
v-model="
user.extra.notifications.outgoing_payments_sats
g.user.extra.notifications.outgoing_payments_sats
"
:hint="$t('notification_outgoing_payment_desc')"
/>
@@ -593,7 +593,7 @@
min="0"
step="1"
v-model="
user.extra.notifications.incoming_payments_sats
g.user.extra.notifications.incoming_payments_sats
"
:hint="$t('notification_incoming_payment_desc')"
/>
@@ -610,7 +610,7 @@
emit-value
map-options
multiple
v-model="user.extra.notifications.excluded_wallets"
v-model="g.user.extra.notifications.excluded_wallets"
:options="g.user.walletOptions"
:label="$t('exclude_wallets')"
:hint="$t('notifications_excluded_wallets_desc')"
@@ -623,7 +623,7 @@
</q-tab-panel>
<q-tab-panel name="api_acls">
<div class="row q-mb-md">
<q-badge v-if="user.admin">
<q-badge v-if="g.user.admin">
<span
v-text="$t('access_control_list_admin_warning')"
></span>
@@ -1081,7 +1081,7 @@
<q-separator></q-separator>
<q-card-section>
<q-table
:rows="user.extra.labels"
:rows="g.user.extra.labels"
:columns="labelsTable.columns"
v-model:pagination="labelsTable.pagination"
:loading="labelsTable.loading"
@@ -1327,7 +1327,7 @@
></q-btn>
<q-btn
v-if="
user.extra.labels.some(
g.user.extra.labels.some(
label => label.name === labelsDialog.data.name
)
"