HerrHase
3 years ago
10 changed files with 156 additions and 249 deletions
Unified View
Diff Options
-
+6 -6public/js/bucket-single.js
-
+6 -6public/js/create-bucket.js
-
+29 -27public/js/users.js
-
+3 -3resources/js/components/users.riot
-
+6 -3resources/js/components/users/form.riot
-
+3 -3server.ts
-
+0 -149src/http/api/user.ts
-
+49 -49src/http/api/users.ts
-
+51 -0src/middleware/users.ts
-
+3 -3src/repositories/user.ts
+ 6
- 6
public/js/bucket-single.js
View File
+ 6
- 6
public/js/create-bucket.js
View File
+ 29
- 27
public/js/users.js
View File
+ 3
- 3
resources/js/components/users.riot
View File
+ 6
- 3
resources/js/components/users/form.riot
View File
+ 3
- 3
server.ts
View File
+ 0
- 149
src/http/api/user.ts
View File
| @ -1,149 +0,0 @@ | |||||
| import { v4 } from "https://deno.land/std@0.99.0/uuid/mod.ts"; | |||||
| import { validate, required, isIn, maxLength } from 'https://deno.land/x/validasaur@v0.15.0/mod.ts' | |||||
| import { Database } from 'https://deno.land/x/aloedb@0.9.0/mod.ts' | |||||
| import { UserSchema } from './../../stores/user.ts' | |||||
| import { Router } from 'https://deno.land/x/opine@1.5.3/mod.ts' | |||||
| const router = Router() | |||||
| /** | |||||
| * get all users | |||||
| * | |||||
| * @param request | |||||
| * @param response | |||||
| * @return | |||||
| * | |||||
| */ | |||||
| router.get('/', async function(request, response) | |||||
| { | |||||
| const userRepository = new UserRepository() | |||||
| const users = await userRepository.db.findAll() | |||||
| response.json({ | |||||
| data: user | |||||
| }) | |||||
| }) | |||||
| /** | |||||
| * create user | |||||
| * | |||||
| * @param request | |||||
| * @param response | |||||
| * @return | |||||
| * | |||||
| */ | |||||
| router.get('/:id', async function(request, response) | |||||
| { | |||||
| const userRepository = new UserRepository() | |||||
| const [ valid, errors ] = await validate(request.params, { | |||||
| id: [ required, uuid ] | |||||
| }) | |||||
| if (valid) { | |||||
| const user = await userRepository.db.findOne({ | |||||
| '_id': request.params.id | |||||
| }) | |||||
| if (!user) { | |||||
| response.setStatus(404) | |||||
| } | |||||
| } else { | |||||
| response.setStatus(405) | |||||
| } | |||||
| response.json({ | |||||
| data: user | |||||
| }) | |||||
| }) | |||||
| /** | |||||
| * create user | |||||
| * | |||||
| * @param request | |||||
| * @param response | |||||
| * @return | |||||
| * | |||||
| */ | |||||
| router.post('/', async function(request, response) | |||||
| { | |||||
| const body = request.body | |||||
| const userRepository = new UserRepository() | |||||
| const [ valid, errors ] = await validate(body, { | |||||
| email: [ email, required ] | |||||
| }) | |||||
| if (valid) { | |||||
| user = await userRepository.create(body) | |||||
| } | |||||
| response.json({ | |||||
| data: user | |||||
| }) | |||||
| }) | |||||
| /** | |||||
| * | |||||
| * | |||||
| * @param request | |||||
| * @param response | |||||
| * @return | |||||
| */ | |||||
| router.put('/:id', async function(request, response, next) | |||||
| { | |||||
| const body = request.body | |||||
| const userRepository = new UserRepository() | |||||
| let user = false | |||||
| const [ valid, errors ] = await validate(body, { | |||||
| _id: [ required, uuid, exists ], | |||||
| email: [ email, required, unique ], | |||||
| password: [ maxLength(64) ], | |||||
| displayname: [ maxLength(128) ], | |||||
| role: [ array() ] | |||||
| }) | |||||
| if (valid) { | |||||
| user = userRepository.update(body) | |||||
| } | |||||
| response.json({ | |||||
| data: user | |||||
| }) | |||||
| }) | |||||
| /** | |||||
| * | |||||
| * | |||||
| * @param request | |||||
| * @param response | |||||
| * @return | |||||
| * | |||||
| */ | |||||
| router.delete('/:id', function(request, response) | |||||
| { | |||||
| const userRepository = new UserRepository() | |||||
| let user = false | |||||
| const [ valid, errors ] = await validate(request.params, { | |||||
| '_id': [ required, uuid, exists ] | |||||
| }) | |||||
| if (valid) { | |||||
| user = userRepository.db.deleteOne({ | |||||
| '_id': request.params._id | |||||
| }) | |||||
| } | |||||
| response.json({ | |||||
| data: user | |||||
| }) | |||||
| }) | |||||
| export default router | |||||
+ 49
- 49
src/http/api/users.ts
View File
+ 51
- 0
src/middleware/users.ts
View File
| @ -0,0 +1,51 @@ | |||||
| import { Router } from 'https://deno.land/x/opine@1.5.3/mod.ts' | |||||
| import { validate, required } from 'https://deno.land/x/validasaur@v0.15.0/mod.ts' | |||||
| import { uuid } from '../rules/uuid.ts' | |||||
| import UserRepository from '../repositories/user.ts' | |||||
| const router = Router() | |||||
| /** | |||||
| * check every route for single bucket | |||||
| * | |||||
| * @param request | |||||
| * @param response | |||||
| * @param next | |||||
| * @return | |||||
| */ | |||||
| async function usersMiddleware(request: any, response: any, next: any) | |||||
| { | |||||
| // max for id | |||||
| request.params.id = request.params.id.slice(0, 128) | |||||
| // only dash, numbers & letters are allowed | |||||
| request.params.id = request.params.id.replace(/[^a-z0-9-]/gi, '') | |||||
| const [ valid, errors ] = await validate(request.params, { | |||||
| id: [ uuid ] | |||||
| }) | |||||
| // if invalid send 404 | |||||
| if (!valid) { | |||||
| response | |||||
| .setStatus(404) | |||||
| .send() | |||||
| } | |||||
| // getting | |||||
| const userRepository = new UserRepository() | |||||
| const user = await userRepository.db.findOne({ '_id': request.params.id }) | |||||
| // if not exists send 404 | |||||
| if (!user) { | |||||
| response | |||||
| .setStatus(404) | |||||
| .send() | |||||
| } | |||||
| response.locals.user = user | |||||
| next() | |||||
| } | |||||
| export default usersMiddleware | |||||