user and users fix

Vic
Vic 2 years ago
parent d30014b432
commit 728a0a59db

@ -7,7 +7,7 @@ const SECRET = process.env.TOKEN_SECRET as Secret
const userRoutes = (app: express.Application) => {
app.get('/users', index)
app.get('/users/:id', read)
app.post('/users/create', verifyAuthToken, create)
app.post('/users/create', create)
app.put('/users/:id', verifyAuthToken, update)
app.delete('/users/:id', verifyAuthToken, destroy)
app.post("/users/auth", authenticate)
@ -65,14 +65,18 @@ const read = async (req: Request, res: Response) => {
const create = async (req: Request, res: Response) => {
const userInfo: User = {
firstName: req.body.fristName,
lastName: req.body.lastName,
firstname: req.body.firstname,
lastname: req.body.lastname,
username: req.body.username,
password: req.body.password
}
console.log(userInfo)
try {
console.log('create model exec')
const newUser = await store.create(userInfo)
console.log('Create function passed')
res.json(verifyUserToken(newUser))
} catch(err) {
res.status(400)
@ -84,8 +88,8 @@ const update = async (req: Request, res: Response) => {
try {
const user = await store.update(req.body)
res.json({
firstName: req.body.fristName,
lastName: req.body.lastName,
firstname: req.body.firstname,
lastname: req.body.lastname,
username: req.body.username,
password: req.body.password
})

@ -7,25 +7,25 @@ const saltRounds = SALT_ROUNDS
export type User = {
id?: number;
firstName?: string;
lastName?: string;
firstname?: string;
lastname?: string;
username: string;
password: string;
}
export class UserStore {
async index(): Promise<User> {
async index(): Promise<User[]> {
try {
const conn = await client.connect()
const sql = 'SELECT * FROM users'
const result = await conn.query(sql)
const user = result.rows[0]
const users = result.rows
conn.release()
return user
return users
} catch (err) {
throw new Error(`Cannot get any users ${err}`)
@ -53,13 +53,13 @@ export class UserStore {
try {
const conn = await client.connect()
const sql = 'INSERT INTO users (firstName, lastName, username, password) VALUES ($1, $2, 3$, 4$) RETURNING *'
const sql = 'INSERT INTO users (firstname, lastname, username, password_digest) VALUES ($1, $2, $3, $4) RETURNING *'
const hash = bcrypt.hashSync(
u.password + pepper,
parseInt(saltRounds as string, 10)
)
const result = await conn.query(sql, [u.firstName, u.lastName, u.username, hash])
const result = await conn.query(sql, [u.firstname, u.lastname, u.username, hash])
const user = result.rows[0]
conn.release()
@ -67,7 +67,7 @@ export class UserStore {
return user
} catch(err) {
throw new Error(`Could not add a new user ${u.firstName}. Error: ${err}`)
throw new Error(`Could not add a new user ${u.firstname}. Error: ${err}`)
}
}
@ -77,7 +77,7 @@ export class UserStore {
const conn = await client.connect()
const sql = 'UPDATE users SET fristName=$1, lastName=$2, username=$3, password=$4 WHERE id=$5 RETURNING *'
const result = await conn.query(sql, [u.firstName, u.lastName, u.username, u.password, u.id])
const result = await conn.query(sql, [u.firstname, u.lastname, u.username, u.password, u.id])
const user = result.rows[0]
conn.release()
@ -85,7 +85,7 @@ export class UserStore {
return user
} catch (err) {
throw new Error(`Could not update user ${u.firstName}. Error: ${err}`)
throw new Error(`Could not update user ${u.firstname}. Error: ${err}`)
}
}

Loading…
Cancel
Save