revert the shit i did when i started the other way around
This commit is contained in:
parent
966d951490
commit
54cb13d1e5
3 changed files with 31 additions and 39 deletions
|
|
@ -1,7 +1,4 @@
|
||||||
const profileServiceProvider = require('../services/profileService');
|
const profileService = require('../services/profileService');
|
||||||
const ContactDetailsSet = require('../models/ContactDetailsSet');
|
|
||||||
const NymSet = require('../models/NymSet');
|
|
||||||
const profileService = profileServiceProvider(ContactDetailsSet, NymSet);
|
|
||||||
|
|
||||||
async function redirectIfMissingProfileDetailsMiddleware(req, res, next) {
|
async function redirectIfMissingProfileDetailsMiddleware(req, res, next) {
|
||||||
const publicKey = req.cookies.publicKey;
|
const publicKey = req.cookies.publicKey;
|
||||||
|
|
|
||||||
|
|
@ -4,14 +4,10 @@ const invitesService = require('../services/invitesService');
|
||||||
const nostrService = require('../services/nostrService');
|
const nostrService = require('../services/nostrService');
|
||||||
const loginService = require('../services/loginService');
|
const loginService = require('../services/loginService');
|
||||||
const sessionService = require('../services/sessionService');
|
const sessionService = require('../services/sessionService');
|
||||||
const profileServiceProvider = require('../services/profileService');
|
const profileService = require('../services/profileService');
|
||||||
const offerService = require('../services/offerService');
|
const offerService = require('../services/offerService');
|
||||||
const errors = require('../errors');
|
const errors = require('../errors');
|
||||||
|
|
||||||
const ContactDetailsSet = require('../models/ContactDetailsSet');
|
|
||||||
const NymSet = require('../models/NymSet');
|
|
||||||
const profileService = profileServiceProvider(ContactDetailsSet, NymSet);
|
|
||||||
|
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
class ApiRoutesProvider {
|
class ApiRoutesProvider {
|
||||||
|
|
|
||||||
|
|
@ -1,35 +1,34 @@
|
||||||
const uuid = require('uuid');
|
const uuid = require('uuid');
|
||||||
|
const ContactDetailsSet = require('../models/ContactDetailsSet');
|
||||||
|
const NymSet = require('../models/NymSet');
|
||||||
|
|
||||||
const profileServicesProvider = (ContactDetailsSet, NymSet) => {
|
async function setContactDetails(publicKey, encryptedContactDetails) {
|
||||||
async function setContactDetails(publicKey, encryptedContactDetails) {
|
return await ContactDetailsSet.create({
|
||||||
return await ContactDetailsSet.create({
|
uuid: uuid.v7(),
|
||||||
uuid: uuid.v7(),
|
public_key: publicKey,
|
||||||
|
encrypted_contact_details: encryptedContactDetails,
|
||||||
|
created_at: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function setNym(publicKey, nym) {
|
||||||
|
return await NymSet.create({
|
||||||
|
uuid: uuid.v7(),
|
||||||
|
public_key: publicKey,
|
||||||
|
nym: nym,
|
||||||
|
created_at: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function areProfileDetailsComplete(publicKey) {
|
||||||
|
const isNymSet = await NymSet.findOne({ where: { public_key: publicKey } });
|
||||||
|
const areContactDetailsSet = await ContactDetailsSet.findOne({
|
||||||
|
where: {
|
||||||
public_key: publicKey,
|
public_key: publicKey,
|
||||||
encrypted_contact_details: encryptedContactDetails,
|
},
|
||||||
created_at: new Date().toISOString(),
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function setNym(publicKey, nym) {
|
return isNymSet && areContactDetailsSet;
|
||||||
return await NymSet.create({
|
}
|
||||||
uuid: uuid.v7(),
|
|
||||||
public_key: publicKey,
|
|
||||||
nym: nym,
|
|
||||||
created_at: new Date().toISOString(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function areProfileDetailsComplete(publicKey) {
|
module.exports = { setContactDetails, setNym, areProfileDetailsComplete };
|
||||||
const isNymSet = await NymSet.findOne({ where: { public_key: publicKey } });
|
|
||||||
const areContactDetailsSet = await ContactDetailsSet.findOne({
|
|
||||||
where: {
|
|
||||||
public_key: publicKey,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return isNymSet && areContactDetailsSet;
|
|
||||||
}
|
|
||||||
|
|
||||||
return { setContactDetails, setNym, areProfileDetailsComplete };
|
|
||||||
};
|
|
||||||
module.exports = profileServicesProvider;
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue