1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-24 15:49:46 +02:00

Code formatting with prettier, change eslint config for the server

This commit is contained in:
Maksim Eltyshev 2019-11-05 18:01:42 +05:00
parent b7f37f0f96
commit a11f6260c0
191 changed files with 4321 additions and 2880 deletions

View file

@ -1,7 +1,7 @@
const Errors = {
USER_EXIST: {
conflict: 'User is already exist'
}
conflict: 'User is already exist',
},
};
module.exports = {
@ -9,25 +9,25 @@ module.exports = {
email: {
type: 'string',
isEmail: true,
required: true
required: true,
},
password: {
type: 'string',
required: true
required: true,
},
name: {
type: 'string',
required: true
}
required: true,
},
},
exits: {
conflict: {
responseType: 'conflict'
}
responseType: 'conflict',
},
},
fn: async function(inputs, exits) {
async fn(inputs, exits) {
const values = _.pick(inputs, ['email', 'password', 'name']);
const user = await sails.helpers
@ -35,7 +35,7 @@ module.exports = {
.intercept('conflict', () => Errors.USER_EXIST);
return exits.success({
item: user
item: user,
});
}
},
};

View file

@ -1,7 +1,7 @@
const Errors = {
USER_NOT_FOUND: {
notFound: 'User is not found'
}
notFound: 'User is not found',
},
};
module.exports = {
@ -9,17 +9,17 @@ module.exports = {
id: {
type: 'string',
regex: /^[0-9]+$/,
required: true
}
required: true,
},
},
exits: {
notFound: {
responseType: 'notFound'
}
responseType: 'notFound',
},
},
fn: async function(inputs, exits) {
async fn(inputs, exits) {
let user = await sails.helpers.getUser(inputs.id);
if (!user) {
@ -33,7 +33,7 @@ module.exports = {
}
return exits.success({
item: user
item: user,
});
}
},
};

View file

@ -1,9 +1,9 @@
module.exports = {
fn: async function(inputs, exits) {
async fn(inputs, exits) {
const users = await sails.helpers.getUsers();
return exits.success({
items: users
items: users,
});
}
},
};

View file

@ -1,5 +1,5 @@
module.exports = {
fn: async function(inputs, exits) {
async fn(inputs, exits) {
// TODO: allow over HTTP without subscription
if (!this.req.isSocket) {
return this.res.badRequest();
@ -10,7 +10,7 @@ module.exports = {
sails.sockets.join(this.req, `user:${currentUser.id}`); // TODO: only when subscription needed
return exits.success({
item: currentUser
item: currentUser,
});
}
},
};

View file

@ -2,14 +2,14 @@ const bcrypt = require('bcrypt');
const Errors = {
USER_NOT_FOUND: {
notFound: 'User is not found'
notFound: 'User is not found',
},
CURRENT_PASSWORD_NOT_VALID: {
forbidden: 'Current password is not valid'
forbidden: 'Current password is not valid',
},
USER_EXIST: {
conflict: 'User is already exist'
}
conflict: 'User is already exist',
},
};
module.exports = {
@ -17,32 +17,32 @@ module.exports = {
id: {
type: 'string',
regex: /^[0-9]+$/,
required: true
required: true,
},
email: {
type: 'string',
isEmail: true,
required: true
required: true,
},
currentPassword: {
type: 'string',
isNotEmptyString: true
}
isNotEmptyString: true,
},
},
exits: {
notFound: {
responseType: 'notFound'
responseType: 'notFound',
},
forbidden: {
responseType: 'forbidden'
responseType: 'forbidden',
},
conflict: {
responseType: 'conflict'
}
responseType: 'conflict',
},
},
fn: async function(inputs, exits) {
async fn(inputs, exits) {
const { currentUser } = this.req;
if (inputs.id === currentUser.id) {
@ -60,8 +60,8 @@ module.exports = {
}
if (
inputs.id === currentUser.id &&
!bcrypt.compareSync(inputs.currentPassword, user.password)
inputs.id === currentUser.id
&& !bcrypt.compareSync(inputs.currentPassword, user.password)
) {
throw Errors.CURRENT_PASSWORD_NOT_VALID;
}
@ -77,7 +77,7 @@ module.exports = {
}
return exits.success({
item: user.email
item: user.email,
});
}
},
};

View file

@ -2,11 +2,11 @@ const bcrypt = require('bcrypt');
const Errors = {
USER_NOT_FOUND: {
notFound: 'User is not found'
notFound: 'User is not found',
},
CURRENT_PASSWORD_NOT_VALID: {
forbidden: 'Current password is not valid'
}
forbidden: 'Current password is not valid',
},
};
module.exports = {
@ -14,28 +14,28 @@ module.exports = {
id: {
type: 'string',
regex: /^[0-9]+$/,
required: true
required: true,
},
password: {
type: 'string',
required: true
required: true,
},
currentPassword: {
type: 'string',
isNotEmptyString: true
}
isNotEmptyString: true,
},
},
exits: {
notFound: {
responseType: 'notFound'
responseType: 'notFound',
},
forbidden: {
responseType: 'forbidden'
}
responseType: 'forbidden',
},
},
fn: async function(inputs, exits) {
async fn(inputs, exits) {
const { currentUser } = this.req;
if (inputs.id === currentUser.id) {
@ -53,8 +53,8 @@ module.exports = {
}
if (
inputs.id === currentUser.id &&
!bcrypt.compareSync(inputs.currentPassword, user.password)
inputs.id === currentUser.id
&& !bcrypt.compareSync(inputs.currentPassword, user.password)
) {
throw Errors.CURRENT_PASSWORD_NOT_VALID;
}
@ -68,7 +68,7 @@ module.exports = {
}
return exits.success({
item: null
item: null,
});
}
},
};

View file

@ -1,7 +1,7 @@
const Errors = {
USER_NOT_FOUND: {
notFound: 'User is not found'
}
notFound: 'User is not found',
},
};
module.exports = {
@ -9,28 +9,28 @@ module.exports = {
id: {
type: 'string',
regex: /^[0-9]+$/,
required: true
required: true,
},
isAdmin: {
type: 'boolean'
type: 'boolean',
},
name: {
type: 'string',
isNotEmptyString: true
isNotEmptyString: true,
},
avatar: {
type: 'json',
custom: value => _.isNull(value)
}
custom: (value) => _.isNull(value),
},
},
exits: {
notFound: {
responseType: 'notFound'
}
responseType: 'notFound',
},
},
fn: async function(inputs, exits) {
async fn(inputs, exits) {
const { currentUser } = this.req;
if (!currentUser.isAdmin) {
@ -56,7 +56,7 @@ module.exports = {
}
return exits.success({
item: user
item: user,
});
}
},
};

View file

@ -1,27 +1,31 @@
const stream = require('stream');
const fs = require('fs');
const path = require('path');
const util = require('util');
const stream = require('stream');
const uuid = require('uuid/v4');
const sharp = require('sharp');
const Errors = {
USER_NOT_FOUND: {
notFound: 'User is not found'
}
notFound: 'User is not found',
},
};
const pipeline = util.promisify(stream.pipeline);
const createReceiver = () => {
const receiver = require('stream').Writable({ objectMode: true });
const receiver = stream.Writable({ objectMode: true });
let firstFileHandled = false;
receiver._write = (file, encoding, done) => {
// eslint-disable-next-line no-underscore-dangle
receiver._write = async (file, receiverEncoding, done) => {
if (firstFileHandled) {
file.pipe(
new stream.Writable({
write(chunk, encoding, callback) {
write(chunk, streamEncoding, callback) {
callback();
}
})
},
}),
);
return done();
@ -33,30 +37,25 @@ const createReceiver = () => {
.jpeg();
const transform = new stream.Transform({
transform(chunk, encoding, callback) {
transform(chunk, streamEncoding, callback) {
callback(null, chunk);
}
},
});
stream.pipeline(file, resize, transform, error => {
if (error) {
return done(error.message);
}
try {
await pipeline(file, resize, transform);
file.fd = `${uuid()}.jpg`;
const output = fs.createWriteStream(
path.join(sails.config.custom.uploadsPath, file.fd)
await pipeline(
transform,
fs.createWriteStream(path.join(sails.config.custom.uploadsPath, file.fd)),
);
stream.pipeline(transform, output, error => {
if (error) {
return done(error);
}
done();
});
});
return done();
} catch (error) {
return done(error);
}
};
return receiver;
@ -67,20 +66,20 @@ module.exports = {
id: {
type: 'string',
regex: /^[0-9]+$/,
required: true
}
required: true,
},
},
exits: {
notFound: {
responseType: 'notFound'
responseType: 'notFound',
},
unprocessableEntity: {
responseType: 'unprocessableEntity'
}
responseType: 'unprocessableEntity',
},
},
fn: async function(inputs, exits) {
async fn(inputs, exits) {
const { currentUser } = this.req;
let user;
@ -98,7 +97,7 @@ module.exports = {
this.req.file('file').upload(createReceiver(), async (error, files) => {
if (error) {
return exits.unprocessableEntity(error);
return exits.unprocessableEntity(error.message);
}
if (files.length === 0) {
@ -108,18 +107,18 @@ module.exports = {
user = await sails.helpers.updateUser(
user,
{
avatar: files[0].fd
avatar: files[0].fd,
},
this.req
this.req,
);
if (!user) {
throw Errors.USER_NOT_FOUND;
}
return this.res.json({
item: user.avatar
return exits.success({
item: user.toJSON().avatar,
});
});
}
},
};