VSinerva/freesewing
1
0
Fork 0
Code Activity

wip(backend): More consistency in string names

Browse source
This commit is contained in:
Joost De Cock 2022-12-22 18:42:02 +01:00
parent 53a0316b39
commit 3f3e316eb4
3 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sites/backend/src/models/apikey.mjs
View file

@ -63,6 +63,7 @@ ApikeyModel.prototype.guardedRead = async function ({ params, user }) {
apikey: {
key: this.record.id,
level: this.record.level,
createdAt: this.record.createdAt,
expiresAt: this.record.expiresAt,
name: this.record.name,
userId: this.record.userId,
@ -141,6 +142,7 @@ ApikeyModel.prototype.create = async function ({ body, user }) {
key: this.record.id,
secret,
level: this.record.level,
createdAt: this.record.createdAt,
expiresAt: this.record.expiresAt,
name: this.record.name,
userId: this.record.userId,

16
sites/backend/src/models/pattern.mjs
View file

@ -11,22 +11,6 @@ export function PatternModel(tools) {
return this
}
/*
id Int @id @default(autoincrement())
createdAt DateTime @default(now())
data String
design String
img String?
person Person? @relation(fields: [personId], references: [id])
personId Int?
name String @default("")
notes String
public
settings String
user User @relation(fields: [userId], references: [id])
userId Int
updatedAt DateTime @updatedAt
*/
PatternModel.prototype.guardedCreate = async function ({ body, user }) {
if (user.level < 3) return this.setResponse(403, 'insufficientAccessLevel')

8
sites/backend/src/models/user.mjs
View file

@ -265,7 +265,7 @@ UserModel.prototype.passwordLogin = async function (req) {
* Confirms a user account
*/
UserModel.prototype.confirm = async function ({ body, params }) {
if (!params.id) return this.setResponse(404, 'missingConfirmationId')
if (!params.id) return this.setResponse(404, 'confirmationIdMissing')
if (Object.keys(body) < 1) return this.setResponse(400, 'postBodyMissing')
if (!body.consent || typeof body.consent !== 'number' || body.consent < 1)
return this.setResponse(400, 'consentRequired')
@ -338,7 +338,7 @@ UserModel.prototype.guardedUpdate = async function ({ body, user }) {
if (typeof body.bio === 'string') data.bio = body.bio
// Consent
if ([0, 1, 2, 3].includes(body.consent)) data.consent = body.consent
// Consent
// Control
if ([1, 2, 3, 4, 5].includes(body.control)) data.control = body.control
// Github
if (typeof body.github === 'string') data.github = body.github.split('@').pop()
@ -442,8 +442,8 @@ UserModel.prototype.guardedMfaUpdate = async function ({ body, user, ip }) {
// Disable
if (body.mfa === false) {
if (!body.token) return this.setResponse(400, 'mfaTokenRequired')
if (!body.password) return this.setResponse(400, 'passwordRequired')
if (!body.token) return this.setResponse(400, 'mfaTokenMissing')
if (!body.password) return this.setResponse(400, 'passwordMissing')
// Check password
const [valid] = verifyPassword(body.password, this.record.password)
if (!valid) {