oportunistic linting stuff
This commit is contained in:
parent
983c9644bf
commit
4c28cebdce
GPG key ID:
883EDBAA726BD96C
6 changed files with 143 additions and 113 deletions
1
.eslintignore
Normal file
1
.eslintignore
Normal file
|
|
@ -0,0 +1 @@
|
|||
public/javascript/*
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
'use strict';
|
||||
|
||||
const { query } = require('express');
|
||||
|
||||
module.exports = {
|
||||
up: (queryInterface, Sequelize) => {
|
||||
return queryInterface.sequelize.transaction((t) => {
|
||||
|
|
|
|||
|
|
@ -3,106 +3,146 @@ module.exports = {
|
|||
up: (queryInterface, Sequelize) => {
|
||||
return queryInterface.sequelize.transaction((t) => {
|
||||
return Promise.all([
|
||||
queryInterface.addConstraint('login_challenge_created', {
|
||||
fields: ['nostr_challenge_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_created',
|
||||
field: 'uuid',
|
||||
queryInterface.addConstraint(
|
||||
'login_challenge_created',
|
||||
{
|
||||
fields: ['nostr_challenge_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_created',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('nostr_challenge_completed', {
|
||||
fields: ['challenge'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_created',
|
||||
field: 'challenge',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'nostr_challenge_completed',
|
||||
{
|
||||
fields: ['challenge'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_created',
|
||||
field: 'challenge',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('login_challenge_completed', {
|
||||
fields: ['nostr_challenge_completed_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_completed',
|
||||
field: 'uuid',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'login_challenge_completed',
|
||||
{
|
||||
fields: ['nostr_challenge_completed_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_completed',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('offer_deleted', {
|
||||
fields: ['offer_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'offer_created',
|
||||
field: 'uuid',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'offer_deleted',
|
||||
{
|
||||
fields: ['offer_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'offer_created',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('offer_details_set', {
|
||||
fields: ['offer_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'offer_created',
|
||||
field: 'uuid',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'offer_details_set',
|
||||
{
|
||||
fields: ['offer_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'offer_created',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('session_related_to_public_key', {
|
||||
fields: ['session_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'session_created',
|
||||
field: 'uuid',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'session_related_to_public_key',
|
||||
{
|
||||
fields: ['session_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'session_created',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('sign_up_challenge_created', {
|
||||
fields: ['nostr_challenge_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_created',
|
||||
field: 'uuid',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'sign_up_challenge_created',
|
||||
{
|
||||
fields: ['nostr_challenge_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_created',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('sign_up_challenge_created', {
|
||||
fields: ['app_invite_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'app_invite_created',
|
||||
field: 'uuid',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'sign_up_challenge_created',
|
||||
{
|
||||
fields: ['app_invite_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'app_invite_created',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('sign_up_challenge_completed', {
|
||||
fields: ['nostr_challenge_completed_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_completed',
|
||||
field: 'uuid',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'sign_up_challenge_completed',
|
||||
{
|
||||
fields: ['nostr_challenge_completed_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'nostr_challenge_completed',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
queryInterface.addConstraint('sign_up_challenge_completed', {
|
||||
fields: ['app_invite_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'app_invite_created',
|
||||
field: 'uuid',
|
||||
{ transaction: t }
|
||||
),
|
||||
queryInterface.addConstraint(
|
||||
'sign_up_challenge_completed',
|
||||
{
|
||||
fields: ['app_invite_uuid'],
|
||||
type: 'foreign key',
|
||||
references: {
|
||||
table: 'app_invite_created',
|
||||
field: 'uuid',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
},
|
||||
onDelete: 'cascade',
|
||||
onUpdate: 'cascade',
|
||||
}),
|
||||
{ transaction: t }
|
||||
),
|
||||
]);
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ const NostrSignupButton = require('../components/NostrSignupButton');
|
|||
|
||||
const warningsContainer = document.getElementById('warnings-container');
|
||||
const nostrSignupArea = document.getElementById('nostr-signup-area');
|
||||
const noExtensionNudges = document.getElementById('no-extension-nudges');
|
||||
const signUpSuccessNotification = document.getElementById('sign-up-success');
|
||||
|
||||
class WarningDiv {
|
||||
|
|
@ -120,8 +119,13 @@ const invitesFunction = () => {
|
|||
}
|
||||
|
||||
async function acceptInvite() {
|
||||
const verifyResponse =
|
||||
await signupService.requestAndRespondSignUpChallenge();
|
||||
const verifyResponse = await signupService.requestAndRespondSignUpChallenge(
|
||||
{
|
||||
onNostrErrorCallback: () => {
|
||||
rejectedNostrWarning.display();
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
if (verifyResponse.ok) {
|
||||
showConfirmationAndRedirect();
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const requestAndRespondSignUpChallenge = async () => {
|
||||
const requestAndRespondSignUpChallenge = async ({ onNostrErrorCallback }) => {
|
||||
let challengeResponse;
|
||||
try {
|
||||
challengeResponse = await fetch('/api/signup/nostr-challenge', {
|
||||
|
|
@ -18,7 +18,7 @@ const requestAndRespondSignUpChallenge = async () => {
|
|||
try {
|
||||
pubkey = await window.nostr.getPublicKey();
|
||||
} catch (error) {
|
||||
document.querySelector('#rejected-nostr-nudges').style.display = 'block';
|
||||
onNostrErrorCallback();
|
||||
return;
|
||||
}
|
||||
const event = {
|
||||
|
|
@ -33,7 +33,7 @@ const requestAndRespondSignUpChallenge = async () => {
|
|||
try {
|
||||
signedEvent = await window.nostr.signEvent(event);
|
||||
} catch (error) {
|
||||
document.querySelector('#rejected-nostr-nudges').style.display = 'block';
|
||||
onNostrErrorCallback();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,21 +21,8 @@
|
|||
/>
|
||||
</figure>
|
||||
<p>Usa tu extensión de Nostr para darte de alta:</p>
|
||||
<div id="nostr-signup-area">
|
||||
</div>
|
||||
<div id="warnings-container">
|
||||
<div
|
||||
id="rejected-nostr-nudges"
|
||||
class="card-secondary"
|
||||
style="display: none"
|
||||
>
|
||||
<p>
|
||||
Ups, parece que no has aceptado que usemos tus claves. Si te has
|
||||
equivocado, puedes intentarlo de nuevo.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div id="nostr-signup-area"></div>
|
||||
<div id="warnings-container"></div>
|
||||
<div id="sign-up-success" class="top-notification-good">
|
||||
<img src="/img/circle-check-white.svg" />
|
||||
<p>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue