[feat] Nostr Login (#2703)
--------- Co-authored-by: dni ⚡ <office@dnilabs.com>
This commit is contained in:
Vlad Stan
Vendored
+9
-9
File diff suppressed because one or more lines are too long
@@ -214,6 +214,7 @@ window.localisation.en = {
|
||||
login_to_account: 'Login to your account',
|
||||
create_account: 'Create account',
|
||||
account_settings: 'Account Settings',
|
||||
signin_with_nostr: 'Continue with Nostr',
|
||||
signin_with_google: 'Sign in with Google',
|
||||
signin_with_github: 'Sign in with GitHub',
|
||||
signin_with_keycloak: 'Sign in with Keycloak',
|
||||
@@ -222,11 +223,14 @@ window.localisation.en = {
|
||||
password_config: 'Password Config',
|
||||
password_repeat: 'Password repeat',
|
||||
change_password: 'Change Password',
|
||||
update_credentials: 'Update Credentials',
|
||||
update_pubkey: 'Update Public Key',
|
||||
set_password: 'Set Password',
|
||||
invalid_password: 'Password must have at least 8 characters',
|
||||
login: 'Login',
|
||||
register: 'Register',
|
||||
username: 'Username',
|
||||
pubkey: 'Public Key',
|
||||
user_id: 'User ID',
|
||||
email: 'Email',
|
||||
first_name: 'First Name',
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M4.04502 6.46189C3.1858 7.47829 2.51519 8.66234 2.10654 9.96165C4.43272 9.43773 7.52382 9.31199 9.27369 9.17577C9.81856 6.93342 11.3694 5.22546 13.968 5.34072C15.0891 5.39311 16.0741 6.11611 16.7552 7.22681C17.2582 6.69242 17.9288 6.33615 18.8194 6.21042C18.8823 6.21042 19.0185 6.19994 19.1233 6.19994C17.2791 4.1881 14.6491 2.90975 11.7047 2.90975C11.1703 2.90975 10.6464 2.96214 10.1224 3.04597C10.0177 3.04597 9.88143 3.06693 9.7033 3.10884C9.69282 3.10884 9.67187 3.10884 9.66139 3.10884C9.65091 3.10884 9.64043 3.10884 9.61948 3.10884C7.58669 3.60132 6.05685 3.20314 5.18716 2.0191C5.09285 1.89336 4.72611 1.33801 4.61085 0.363525C3.97167 1.02366 3.55254 2.1134 3.9088 3.27649C4.19172 4.19858 4.72611 4.69106 5.30242 4.97398C4.42224 5.02637 3.68876 4.85871 2.95528 4.30337C2.52567 3.97854 2.25323 3.62228 1.80267 2.68971C1.38353 3.34984 1.42545 4.08332 1.50927 4.46054C1.61406 4.9635 1.87601 5.52933 2.21132 5.85415C2.72476 6.35711 3.45824 6.47237 4.0555 6.46189H4.04502Z" fill="white"/>
|
||||
<path d="M13.9782 15.1276C15.2803 15.1276 16.3358 13.3215 16.3358 11.0935C16.3358 8.86547 15.2803 7.05933 13.9782 7.05933C12.6761 7.05933 11.6206 8.86547 11.6206 11.0935C11.6206 13.3215 12.6761 15.1276 13.9782 15.1276Z" fill="white"/>
|
||||
<path d="M19.165 14.1532C20.1835 14.1532 21.0092 12.7177 21.0092 10.9468C21.0092 9.17601 20.1835 7.74048 19.165 7.74048C18.1465 7.74048 17.3208 9.17601 17.3208 10.9468C17.3208 12.7177 18.1465 14.1532 19.165 14.1532Z" fill="white"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.0339 31.9777C10.0445 31.5085 10.2194 30.0309 11.7152 27.0729C12.3753 25.7841 13.8737 24.0028 14.9949 23.0387C15.5922 22.5148 16.1894 22.0747 16.7762 21.6661C17.0801 21.488 17.363 21.2993 17.6354 21.1003C22.5434 18.0911 26.876 18.7195 30.4704 19.2408L30.5761 19.2561C30.5761 19.2561 31.4354 16.6994 27.8937 15.3791C25.9657 14.6666 23.6919 14.0903 21.7953 13.6921C21.5229 14.1846 21.1771 14.6037 20.7684 14.9181C20.7628 14.9223 20.7571 14.9266 20.7512 14.931C20.4473 15.1594 19.7267 15.7009 18.4213 15.5468C17.7507 15.4629 17.2373 15.1905 16.8286 14.7923C16.137 15.9345 15.1416 16.6784 13.989 16.7832C10.7931 17.0556 9.17945 14.3732 9.07466 11.4078C6.67513 11.6384 3.4059 13.1158 1.6665 13.975L1.6755 29.386C3.89486 30.2461 7.22426 31.3076 10.0339 31.9777Z" fill="white"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
+45
-16
@@ -13,11 +13,13 @@ window.app = Vue.createApp({
|
||||
'confettiStars'
|
||||
],
|
||||
tab: 'user',
|
||||
passwordData: {
|
||||
credentialsData: {
|
||||
show: false,
|
||||
oldPassword: null,
|
||||
newPassword: null,
|
||||
newPasswordRepeat: null
|
||||
newPasswordRepeat: null,
|
||||
username: null,
|
||||
pubkey: null
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -94,6 +96,7 @@ window.app = Vue.createApp({
|
||||
}
|
||||
)
|
||||
this.user = data
|
||||
this.hasUsername = !!data.username
|
||||
Quasar.Notify.create({
|
||||
type: 'positive',
|
||||
message: 'Account updated.'
|
||||
@@ -102,11 +105,19 @@ window.app = Vue.createApp({
|
||||
LNbits.utils.notifyApiError(e)
|
||||
}
|
||||
},
|
||||
disableUpdatePassword: function () {
|
||||
return (
|
||||
!this.credentialsData.newPassword ||
|
||||
!this.credentialsData.newPasswordRepeat ||
|
||||
this.credentialsData.newPassword !==
|
||||
this.credentialsData.newPasswordRepeat
|
||||
)
|
||||
},
|
||||
updatePassword: async function () {
|
||||
if (!this.user.username) {
|
||||
if (!this.credentialsData.username) {
|
||||
Quasar.Notify.create({
|
||||
type: 'warning',
|
||||
message: 'Please set a username first.'
|
||||
message: 'Please set a username.'
|
||||
})
|
||||
return
|
||||
}
|
||||
@@ -117,14 +128,15 @@ window.app = Vue.createApp({
|
||||
null,
|
||||
{
|
||||
user_id: this.user.id,
|
||||
username: this.user.username,
|
||||
password_old: this.passwordData.oldPassword,
|
||||
password: this.passwordData.newPassword,
|
||||
password_repeat: this.passwordData.newPasswordRepeat
|
||||
username: this.credentialsData.username,
|
||||
password_old: this.credentialsData.oldPassword,
|
||||
password: this.credentialsData.newPassword,
|
||||
password_repeat: this.credentialsData.newPasswordRepeat
|
||||
}
|
||||
)
|
||||
this.user = data
|
||||
this.passwordData.show = false
|
||||
this.hasUsername = !!data.username
|
||||
this.credentialsData.show = false
|
||||
Quasar.Notify.create({
|
||||
type: 'positive',
|
||||
message: 'Password updated.'
|
||||
@@ -133,17 +145,34 @@ window.app = Vue.createApp({
|
||||
LNbits.utils.notifyApiError(e)
|
||||
}
|
||||
},
|
||||
showChangePassword: function () {
|
||||
if (!this.user.username) {
|
||||
Quasar.Notify.create({
|
||||
type: 'warning',
|
||||
message: 'Please set a username first.'
|
||||
updatePubkey: async function () {
|
||||
try {
|
||||
const {data} = await LNbits.api.request(
|
||||
'PUT',
|
||||
'/api/v1/auth/pubkey',
|
||||
null,
|
||||
{
|
||||
user_id: this.user.id,
|
||||
pubkey: this.credentialsData.pubkey
|
||||
}
|
||||
)
|
||||
this.user = data
|
||||
this.hasUsername = !!data.username
|
||||
this.credentialsData.show = false
|
||||
this.$q.notify({
|
||||
type: 'positive',
|
||||
message: 'Public key updated.'
|
||||
})
|
||||
return
|
||||
} catch (e) {
|
||||
LNbits.utils.notifyApiError(e)
|
||||
}
|
||||
this.passwordData = {
|
||||
},
|
||||
showUpdateCredentials: function () {
|
||||
this.credentialsData = {
|
||||
show: true,
|
||||
oldPassword: null,
|
||||
username: this.user.username,
|
||||
pubkey: this.user.pubkey,
|
||||
newPassword: null,
|
||||
newPasswordRepeat: null
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ window.app = Vue.createApp({
|
||||
formAddExtensionsManifest: '',
|
||||
formAllowedIPs: '',
|
||||
formBlockedIPs: '',
|
||||
nostrAcceptedUrl: '',
|
||||
isSuperUser: false,
|
||||
wallet: {},
|
||||
cancel: {},
|
||||
@@ -181,6 +182,16 @@ window.app = Vue.createApp({
|
||||
b => b !== blocked_ip
|
||||
)
|
||||
},
|
||||
addNostrUrl() {
|
||||
const url = this.nostrAcceptedUrl.trim()
|
||||
this.removeNostrUrl(url)
|
||||
this.formData.nostr_absolute_request_urls.push(url)
|
||||
this.nostrAcceptedUrl = ''
|
||||
},
|
||||
removeNostrUrl(url) {
|
||||
this.formData.nostr_absolute_request_urls =
|
||||
this.formData.nostr_absolute_request_urls.filter(b => b !== url)
|
||||
},
|
||||
restartServer() {
|
||||
LNbits.api
|
||||
.request('GET', '/admin/api/v1/restart/')
|
||||
|
||||
@@ -17,6 +17,9 @@ window.LNbits = {
|
||||
data: data
|
||||
})
|
||||
},
|
||||
getServerHealth: function () {
|
||||
return this.request('get', '/api/v1/health')
|
||||
},
|
||||
createInvoice: async function (
|
||||
wallet,
|
||||
amount,
|
||||
@@ -85,6 +88,14 @@ window.LNbits = {
|
||||
data: {username, password}
|
||||
})
|
||||
},
|
||||
loginByProvider: function (provider, headers, data) {
|
||||
return axios({
|
||||
method: 'POST',
|
||||
url: `/api/v1/auth/${provider}`,
|
||||
headers: headers,
|
||||
data
|
||||
})
|
||||
},
|
||||
loginUsr: function (usr) {
|
||||
return axios({
|
||||
method: 'POST',
|
||||
|
||||
@@ -42,6 +42,79 @@ window.app = Vue.createApp({
|
||||
this.authAction = 'register'
|
||||
this.authMethod = authMethod
|
||||
},
|
||||
signInWithNostr: async function () {
|
||||
try {
|
||||
const nostrToken = await this.createNostrToken()
|
||||
if (!nostrToken) {
|
||||
return
|
||||
}
|
||||
resp = await LNbits.api.loginByProvider(
|
||||
'nostr',
|
||||
{Authorization: nostrToken},
|
||||
{}
|
||||
)
|
||||
window.location.href = '/wallet'
|
||||
} catch (error) {
|
||||
console.warn(error)
|
||||
const details = error?.response?.data?.detail || `${error}`
|
||||
Quasar.Notify.create({
|
||||
type: 'negative',
|
||||
message: 'Failed to sign in with Nostr.',
|
||||
caption: details
|
||||
})
|
||||
}
|
||||
},
|
||||
createNostrToken: async function () {
|
||||
try {
|
||||
async function _signEvent(e) {
|
||||
try {
|
||||
const {data} = await LNbits.api.getServerHealth()
|
||||
e.created_at = data.server_time
|
||||
return await window.nostr.signEvent(e)
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
Quasar.Notify.create({
|
||||
type: 'negative',
|
||||
message: 'Failed to sign nostr event.',
|
||||
caption: `${error}`
|
||||
})
|
||||
}
|
||||
}
|
||||
if (!window.nostr?.signEvent) {
|
||||
Quasar.Notify.create({
|
||||
type: 'negative',
|
||||
message: 'No Nostr signing app detected.',
|
||||
caption: 'Is "window.nostr" present?'
|
||||
})
|
||||
return
|
||||
}
|
||||
const tagU = `${window.location}nostr`
|
||||
const tagMethod = 'POST'
|
||||
const nostrToken = await NostrTools.nip98.getToken(
|
||||
tagU,
|
||||
tagMethod,
|
||||
e => _signEvent(e),
|
||||
true
|
||||
)
|
||||
const isTokenValid = await NostrTools.nip98.validateToken(
|
||||
nostrToken,
|
||||
tagU,
|
||||
tagMethod
|
||||
)
|
||||
if (!isTokenValid) {
|
||||
throw new Error('Invalid signed token!')
|
||||
}
|
||||
|
||||
return nostrToken
|
||||
} catch (error) {
|
||||
console.warn(error)
|
||||
Quasar.Notify.create({
|
||||
type: 'negative',
|
||||
message: 'Failed create Nostr event.',
|
||||
caption: `${error}`
|
||||
})
|
||||
}
|
||||
},
|
||||
register: async function () {
|
||||
try {
|
||||
await LNbits.api.register(
|
||||
@@ -69,6 +142,7 @@ window.app = Vue.createApp({
|
||||
this.usr = ''
|
||||
window.location.href = '/wallet'
|
||||
} catch (e) {
|
||||
console.warn(e)
|
||||
LNbits.utils.notifyApiError(e)
|
||||
}
|
||||
},
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
"vendor/qrcode.vue.browser.js",
|
||||
"vendor/chart.umd.js",
|
||||
"vendor/showdown.js",
|
||||
"vendor/nostr.bundle.js",
|
||||
"i18n/i18n.js",
|
||||
"i18n/de.js",
|
||||
"i18n/en.js",
|
||||
|
||||
Vendored
+6342
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user