bubble/educt-server
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/educt-server.git synced 2026-10-11 10:19:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: bubble:develop
Branches Tags
bubble:develop
bubble:main
bubble:heroku
bubble:v1.4.5
bubble:v1.4.4
bubble:v1.4.3
bubble:v1.4.2
bubble:v1.3.2
bubble:v1.3.1
bubble:v1.2.1
bubble:v1.1.0
bubble:v1.0.1
bubble:v1.0.0
..
compare: bubble:v1.2.1
Branches Tags
bubble:develop
bubble:main
bubble:heroku
bubble:v1.4.5
bubble:v1.4.4
bubble:v1.4.3
bubble:v1.4.2
bubble:v1.3.2
bubble:v1.3.1
bubble:v1.2.1
bubble:v1.1.0
bubble:v1.0.1
bubble:v1.0.0

No commits in common. "develop" and "v1.2.1" have entirely different histories.
develop ... v1.2.1

59 changed files with 2952 additions and 13996 deletions
Show Stats Expand all files Collapse all files

22
.dockerignore
View File

@ -1,20 +1,6 @@
# Adonis default .gitignore ignores
node_modules
build build
coverage node_modules
.vscode
.DS_STORE
.env
tmp
uploads
# Additional .gitignore ignores (any custom file you wish)
.idea
# Additional good to have ignores for dockerignore
Dockerfile*
docker-compose*
.dockerignore
*.md
.git .git
.gitignore *.log
.env
Dockerfile

2
.env.example
View File

@ -19,8 +19,8 @@ SMTP_PASSWORD=<password>
MAILGUN_API_KEY=<mailgun-api-key> MAILGUN_API_KEY=<mailgun-api-key>
MAILGUN_DOMAIN=<your-domain> MAILGUN_DOMAIN=<your-domain>
CACHE_VIEWS=false CACHE_VIEWS=false
DRIVE_DISK=local
S3_KEY=dummyKey S3_KEY=dummyKey
S3_SECRET=dummySecret S3_SECRET=dummySecret
S3_BUCKET=dummyBucket S3_BUCKET=dummyBucket
S3_REGION=dummyRegion S3_REGION=dummyRegion
S3_ENDPOINT=dummyEndpoint

2
.eslintrc.json
View File

@ -15,7 +15,7 @@
"project": "./tsconfig.json", "project": "./tsconfig.json",
"include": ["src/**/*.ts", "src/**/*.js", "test/**/*.ts"] "include": ["src/**/*.ts", "src/**/*.js", "test/**/*.ts"]
}, },
"plugins": ["@typescript-eslint", "import"], "plugins": ["@typescript-eslint"],
"rules": { "rules": {
"no-unused-vars": "off", "no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": ["error"] "@typescript-eslint/no-unused-vars": ["error"]

1
.gitignore vendored
View File

@ -6,4 +6,3 @@ coverage
.env .env
tmp tmp
uploads uploads
npm-debug.log

33
CHANGELOG.md
View File

@ -1,37 +1,8 @@
# Changelog # Changelog
## [1.4.2] - 2022-12-06 ## Unreleased
## Added - API deployment with Docker and Nginx web server.
- Uploading video from url source (YouTube, Vimeo, .mp4, etc..)
- Added student and teacher to seeders
## Fix
- Removing lesson files from drive when deleting course, category or user.
- Fixed lesson display ordering when seeding database
- Refactored bouncer actions
## [1.3.2] - 2022-06-06
## Added
- Updated npm dependencies
- [Added](https://github.com/sergeyyarkov/educt-server/commit/294a4f584dd39d295372802305004365fb01fdb2) `MAILER` env variable
## Fix
- Fixed schema validator on saving lesson order
- Fixed lesson [duration updating](https://github.com/sergeyyarkov/educt-server/commit/ffdebc4f927abe3b63c62c84268f40f9e6663895#diff-86d18314585862595621b4e90f675b79ac74e7a0a47b2797556902eeff75e14a)
- Updated cors config
- Deleted `api` from path url
## [1.3.1] - 2022-04-10
## Added
- Docker files for building container
## [1.2.1] - 2022-03-06 ## [1.2.1] - 2022-03-06

25
Dockerfile
View File

@ -1,25 +0,0 @@
ARG NODE_IMAGE=node:14.17.3-alpine3.11
FROM ${NODE_IMAGE} AS base
RUN apk --no-cache add dumb-init
RUN mkdir -p /home/node/app && chown node:node /home/node/app
WORKDIR /home/node/app
USER node
RUN mkdir uploads
FROM base as builder
COPY --chown=node:node package*.json ./
RUN npm ci
COPY --chown=node:node . .
RUN node ace build --production
FROM base as production
ENV NODE_ENV=production
ENV PORT=3333
ENV HOST=0.0.0.0
WORKDIR /home/node/app
COPY --chown=node:node --from=builder /home/node/app/build .
RUN npm ci --production
EXPOSE 3333
CMD ["dumb-init", "node", "server.js"]

9
README.md
View File

@ -1,8 +1,3 @@
# educt-server # About API
_This service is part of [Educt](https://github.com/sergeyyarkov/educt) which contains API application._ ...
<!-- ## Requirements
- NodeJS >= 14.17.3
- Docker -->

267
ace-manifest.json
View File

@ -11,66 +11,19 @@
}, },
"list:routes": { "list:routes": {
"settings": { "settings": {
"loadApp": true, "loadApp": true
"stayAlive": true
}, },
"commandPath": "@adonisjs/core/build/commands/ListRoutes/index", "commandPath": "@adonisjs/core/build/commands/ListRoutes",
"commandName": "list:routes", "commandName": "list:routes",
"description": "List application routes", "description": "List application routes",
"args": [], "args": [],
"aliases": [], "aliases": [],
"flags": [ "flags": [
{
"name": "verbose",
"propertyName": "verbose",
"type": "boolean",
"description": "Display more information"
},
{
"name": "reverse",
"propertyName": "reverse",
"type": "boolean",
"alias": "r",
"description": "Reverse routes display"
},
{
"name": "methods",
"propertyName": "methodsFilter",
"type": "array",
"alias": "m",
"description": "Filter routes by method"
},
{
"name": "patterns",
"propertyName": "patternsFilter",
"type": "array",
"alias": "p",
"description": "Filter routes by the route pattern"
},
{
"name": "names",
"propertyName": "namesFilter",
"type": "array",
"alias": "n",
"description": "Filter routes by route name"
},
{ {
"name": "json", "name": "json",
"propertyName": "json", "propertyName": "json",
"type": "boolean", "type": "boolean",
"description": "Output as JSON" "description": "Output as JSON"
},
{
"name": "table",
"propertyName": "table",
"type": "boolean",
"description": "Output as Table"
},
{
"name": "max-width",
"propertyName": "maxWidth",
"type": "number",
"description": "Specify maximum rendering width. Ignored for JSON Output"
} }
] ]
}, },
@ -102,7 +55,7 @@
}, },
"commandPath": "@adonisjs/lucid/build/commands/DbSeed", "commandPath": "@adonisjs/lucid/build/commands/DbSeed",
"commandName": "db:seed", "commandName": "db:seed",
"description": "Execute database seeders", "description": "Execute database seeder files",
"args": [], "args": [],
"aliases": [], "aliases": [],
"flags": [ "flags": [
@ -126,12 +79,6 @@
"type": "array", "type": "array",
"description": "Define a custom set of seeders files names to run", "description": "Define a custom set of seeders files names to run",
"alias": "f" "alias": "f"
},
{
"name": "compact-output",
"propertyName": "compactOutput",
"type": "boolean",
"description": "A compact single-line output"
} }
] ]
}, },
@ -166,13 +113,6 @@
"type": "boolean", "type": "boolean",
"alias": "c", "alias": "c",
"description": "Generate the controller for the model" "description": "Generate the controller for the model"
},
{
"name": "factory",
"propertyName": "factory",
"type": "boolean",
"alias": "f",
"description": "Generate a factory for the model"
} }
] ]
}, },
@ -237,81 +177,13 @@
"aliases": [], "aliases": [],
"flags": [] "flags": []
}, },
"make:factory": {
"settings": {},
"commandPath": "@adonisjs/lucid/build/commands/MakeFactory",
"commandName": "make:factory",
"description": "Make a new factory",
"args": [
{
"type": "string",
"propertyName": "model",
"name": "model",
"required": true,
"description": "The name of the model"
}
],
"aliases": [],
"flags": [
{
"name": "model-path",
"propertyName": "modelPath",
"type": "string",
"description": "The path to the model"
},
{
"name": "exact",
"propertyName": "exact",
"type": "boolean",
"description": "Create the factory with the exact name as provided",
"alias": "e"
}
]
},
"db:wipe": {
"settings": {
"loadApp": true
},
"commandPath": "@adonisjs/lucid/build/commands/DbWipe",
"commandName": "db:wipe",
"description": "Drop all tables, views and types in database",
"args": [],
"aliases": [],
"flags": [
{
"name": "connection",
"propertyName": "connection",
"type": "string",
"description": "Define a custom database connection",
"alias": "c"
},
{
"name": "drop-views",
"propertyName": "dropViews",
"type": "boolean",
"description": "Drop all views"
},
{
"name": "drop-types",
"propertyName": "dropTypes",
"type": "boolean",
"description": "Drop all custom types (Postgres only)"
},
{
"name": "force",
"propertyName": "force",
"type": "boolean",
"description": "Explicitly force command to run in production"
}
]
},
"migration:run": { "migration:run": {
"settings": { "settings": {
"loadApp": true "loadApp": true
}, },
"commandPath": "@adonisjs/lucid/build/commands/Migration/Run", "commandPath": "@adonisjs/lucid/build/commands/Migration/Run",
"commandName": "migration:run", "commandName": "migration:run",
"description": "Migrate database by running pending migrations", "description": "Run pending migrations",
"args": [], "args": [],
"aliases": [], "aliases": [],
"flags": [ "flags": [
@ -332,13 +204,7 @@
"name": "dry-run", "name": "dry-run",
"propertyName": "dryRun", "propertyName": "dryRun",
"type": "boolean", "type": "boolean",
"description": "Do not run actual queries. Instead view the SQL output" "description": "Print SQL queries, instead of running the migrations"
},
{
"name": "compact-output",
"propertyName": "compactOutput",
"type": "boolean",
"description": "A compact single-line output"
} }
] ]
}, },
@ -348,7 +214,7 @@
}, },
"commandPath": "@adonisjs/lucid/build/commands/Migration/Rollback", "commandPath": "@adonisjs/lucid/build/commands/Migration/Rollback",
"commandName": "migration:rollback", "commandName": "migration:rollback",
"description": "Rollback migrations to a specific batch number", "description": "Rollback migrations to a given batch number",
"args": [], "args": [],
"aliases": [], "aliases": [],
"flags": [ "flags": [
@ -369,19 +235,13 @@
"name": "dry-run", "name": "dry-run",
"propertyName": "dryRun", "propertyName": "dryRun",
"type": "boolean", "type": "boolean",
"description": "Do not run actual queries. Instead view the SQL output" "description": "Print SQL queries, instead of running the migrations"
}, },
{ {
"name": "batch", "name": "batch",
"propertyName": "batch", "propertyName": "batch",
"type": "number", "type": "number",
"description": "Define custom batch number for rollback. Use 0 to rollback to initial state" "description": "Define custom batch number for rollback. Use 0 to rollback to initial state"
},
{
"name": "compact-output",
"propertyName": "compactOutput",
"type": "boolean",
"description": "A compact single-line output"
} }
] ]
}, },
@ -391,7 +251,7 @@
}, },
"commandPath": "@adonisjs/lucid/build/commands/Migration/Status", "commandPath": "@adonisjs/lucid/build/commands/Migration/Status",
"commandName": "migration:status", "commandName": "migration:status",
"description": "View migrations status", "description": "Check migrations current status.",
"args": [], "args": [],
"aliases": [], "aliases": [],
"flags": [ "flags": [
@ -404,117 +264,6 @@
} }
] ]
}, },
"migration:reset": {
"settings": {
"loadApp": true
},
"commandPath": "@adonisjs/lucid/build/commands/Migration/Reset",
"commandName": "migration:reset",
"description": "Rollback all migrations",
"args": [],
"aliases": [],
"flags": [
{
"name": "connection",
"propertyName": "connection",
"type": "string",
"description": "Define a custom database connection",
"alias": "c"
},
{
"name": "force",
"propertyName": "force",
"type": "boolean",
"description": "Explicitly force command to run in production"
},
{
"name": "dry-run",
"propertyName": "dryRun",
"type": "boolean",
"description": "Do not run actual queries. Instead view the SQL output"
}
]
},
"migration:refresh": {
"settings": {
"loadApp": true
},
"commandPath": "@adonisjs/lucid/build/commands/Migration/Refresh",
"commandName": "migration:refresh",
"description": "Rollback and migrate database",
"args": [],
"aliases": [],
"flags": [
{
"name": "connection",
"propertyName": "connection",
"type": "string",
"description": "Define a custom database connection",
"alias": "c"
},
{
"name": "force",
"propertyName": "force",
"type": "boolean",
"description": "Explicitly force command to run in production"
},
{
"name": "dry-run",
"propertyName": "dryRun",
"type": "boolean",
"description": "Do not run actual queries. Instead view the SQL output"
},
{
"name": "seed",
"propertyName": "seed",
"type": "boolean",
"description": "Run seeders"
}
]
},
"migration:fresh": {
"settings": {
"loadApp": true
},
"commandPath": "@adonisjs/lucid/build/commands/Migration/Fresh",
"commandName": "migration:fresh",
"description": "Drop all tables and re-migrate the database",
"args": [],
"aliases": [],
"flags": [
{
"name": "connection",
"propertyName": "connection",
"type": "string",
"description": "Define a custom database connection",
"alias": "c"
},
{
"name": "force",
"propertyName": "force",
"type": "boolean",
"description": "Explicitly force command to run in production"
},
{
"name": "seed",
"propertyName": "seed",
"type": "boolean",
"description": "Run seeders"
},
{
"name": "drop-views",
"propertyName": "dropViews",
"type": "boolean",
"description": "Drop all views"
},
{
"name": "drop-types",
"propertyName": "dropTypes",
"type": "boolean",
"description": "Drop all custom types (Postgres only)"
}
]
},
"make:mailer": { "make:mailer": {
"settings": {}, "settings": {},
"commandPath": "@adonisjs/mail/build/commands/MakeMailer", "commandPath": "@adonisjs/mail/build/commands/MakeMailer",

4
app/Controllers/Http/Api/v1/LessonsController.ts
View File

@ -1,6 +1,6 @@
import { Exception, inject, Ioc } from '@adonisjs/core/build/standalone'; import { Exception, inject, Ioc } from '@adonisjs/core/build/standalone';
import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'; import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
import { schema, rules } from '@ioc:Adonis/Core/Validator'; import { schema } from '@ioc:Adonis/Core/Validator';
/** /**
* Services * Services
@ -141,7 +141,7 @@ export default class LessonsController extends BaseController {
// eslint-disable-next-line class-methods-use-this // eslint-disable-next-line class-methods-use-this
public async saveOrder(ctx: HttpContextContract) { public async saveOrder(ctx: HttpContextContract) {
const saveOrderSchema = schema.create({ const saveOrderSchema = schema.create({
ids: schema.array([rules.minLength(1)]).members(schema.string()), ids: schema.array().members(schema.string()),
}); });
const payload = await ctx.request.validate({ schema: saveOrderSchema }); const payload = await ctx.request.validate({ schema: saveOrderSchema });
const { data, message, status, success, error } = await this.lessonService.updateOrder(payload.ids); const { data, message, status, success, error } = await this.lessonService.updateOrder(payload.ids);

2
app/Controllers/Http/Api/v1/UsersController.ts
View File

@ -93,7 +93,7 @@ export default class UsersController extends BaseController {
*/ */
public async delete(ctx: HttpContextContract) { public async delete(ctx: HttpContextContract) {
const result = await this.userService.deleteUser(ctx.params.id, ctx); const result = await this.userService.deleteUser(ctx.params.id);
if (!result.success && result.error) { if (!result.success && result.error) {
throw new Exception(result.message, result.status, result.error.code); throw new Exception(result.message, result.status, result.error.code);

5
app/Controllers/Ws/OnlineController.ts
View File

@ -17,10 +17,9 @@ export default class OnlineController {
this.socket = socket; this.socket = socket;
this.io = io; this.io = io;
this.sessionStore = sessionStore; this.sessionStore = sessionStore;
}
public handle() { this.onConnected(socket);
this.onConnected(this.socket);
this.socket.on('disconnect', reason => this.onDisconnected(reason)); this.socket.on('disconnect', reason => this.onDisconnected(reason));
} }

28
app/Helpers/CourseHelper.ts
View File

@ -1,28 +0,0 @@
import Course from 'App/Models/Course';
export type FileEntry = {
path: string;
name: string;
};
export default class CourseHelper {
public static getVideoFileNames(course: Course): Array<FileEntry | null> {
const data = course.lessons.map(l => {
if (!l.video) return null;
return { path: 'videos/', name: l.video.name };
});
return data;
}
public static getMaterialFileNames(course: Course): FileEntry[] {
const data = course.lessons.flatMap(l => l.materials.map(m => ({ path: 'materials/', name: m.name })));
return data;
}
public static getImageFileName(course: Course): FileEntry | null {
if (!course.image) return null;
const data = { path: 'images/courses/', name: course.image.name };
return data;
}
}

3
app/Models/Lesson.ts
View File

@ -37,9 +37,6 @@ export default class Lesson extends BaseModel {
@column() @column()
public description: string; public description: string;
@column()
public linked_video_url: string | null;
@column() @column()
public duration: string; public duration: string;

35
app/Policies/LessonPolicy.ts
View File

@ -1,35 +0,0 @@
import { BasePolicy } from '@ioc:Adonis/Addons/Bouncer';
/**
* Helpers
*/
import RoleHelper from 'App/Helpers/RoleHelper';
/**
* Models
*/
import Lesson from 'App/Models/Lesson';
import User from 'App/Models/User';
/**
* Datatypes
*/
import RoleEnum from 'App/Datatypes/Enums/RoleEnum';
export default class LessonPolicy extends BasePolicy {
public async view(user: User, lesson: Lesson) {
/**
* Load required data to check permissions
*/
await user.load(loader => loader.load('roles').load('courses'));
await lesson.load('course');
const isAdminOrTeacher = RoleHelper.userContainRoles(user.roles, [RoleEnum.ADMIN, RoleEnum.TEACHER]);
if (isAdminOrTeacher) {
return true;
}
return !!user.courses.find(course => course.id === lesson.course.id);
}
}

36
app/Policies/RolePolicy.ts
View File

@ -1,36 +0,0 @@
import { BasePolicy } from '@ioc:Adonis/Addons/Bouncer';
/**
* Models
*/
import User from 'App/Models/User';
/**
* Helpers
*/
import RoleHelper from 'App/Helpers/RoleHelper';
/**
* Datatypes
*/
import RoleEnum from 'App/Datatypes/Enums/RoleEnum';
export default class RolePolicy extends BasePolicy {
public async manage(user: User, roles: Array<RoleEnum>) {
await user.load('roles');
const isAdmin = RoleHelper.userContainRoles(user.roles, [RoleEnum.ADMIN]);
const isTeacher = RoleHelper.userContainRoles(user.roles, [RoleEnum.TEACHER]);
if (isAdmin) {
return true;
}
/**
* User with role `TEACHER` can manage only user with `STUDENT` role
*/
if (!(roles.includes(RoleEnum.TEACHER) || roles.includes(RoleEnum.ADMIN)) && isTeacher) {
return true;
}
}
}

27
app/Repositories/CourseRepository.ts
View File

@ -32,32 +32,6 @@ export default class CourseRepository {
this.Course = Course; this.Course = Course;
} }
/**
* Get list of courses by teacher id
*
* @param id Teacher id
* @returns Array of courses
*/
public async getByTeacherId(id: string | number): Promise<Course[]> {
const data = await this.Course.query()
.preload('lessons', q => q.preload('video').preload('materials'))
.where('teacher_id', id);
return data;
}
/**
* Get list of courses by category id
*
* @param id Category id
* @returns Array of courses
*/
public async getByCategoryId(id: string | number): Promise<Course[]> {
const data = await this.Course.query()
.preload('lessons', q => q.preload('video').preload('materials'))
.where('category_id', id);
return data;
}
/** /**
* Set status on course * Set status on course
* *
@ -263,7 +237,6 @@ export default class CourseRepository {
public async delete(id: string | number): Promise<Course | null> { public async delete(id: string | number): Promise<Course | null> {
const course = await this.Course.query() const course = await this.Course.query()
.preload('category') .preload('category')
.preload('lessons', q => q.preload('video').preload('materials'))
.withCount('students') .withCount('students')
.withCount('likes') .withCount('likes')
.withCount('lessons') .withCount('lessons')

35
app/Repositories/LessonRepository.ts
View File

@ -106,7 +106,6 @@ export default class LessonRepository {
duration: data.duration.toFormat('HH:mm:ss'), duration: data.duration.toFormat('HH:mm:ss'),
display_order: Number.parseInt(course.$extras.lessons_count, 10) + 1, display_order: Number.parseInt(course.$extras.lessons_count, 10) + 1,
course_id: course.id, course_id: course.id,
linked_video_url: !data.video ? data.linked_video_url : null,
}); });
/** /**
@ -117,9 +116,7 @@ export default class LessonRepository {
/** /**
* Move video file to disk and save to database * Move video file to disk and save to database
*/ */
if (data.video) { await this.createVideo(lesson, data.video);
await this.createVideo(lesson, data.video);
}
/** /**
* Create materials * Create materials
@ -147,38 +144,31 @@ export default class LessonRepository {
if (lesson) { if (lesson) {
/** /**
* Update fields * Update files
*/ */
lesson.merge({ lesson.merge({
title: data.title, title: data.title,
description: data.description, description: data.description,
course_id: data.course_id, course_id: data.course_id,
...(data.duration && { duration: data.duration.toFormat('HH:mm:ss') }),
}); });
/** /**
* Update linked video url * Update video
*/
if (data.linked_video_url && !data.video) {
if (lesson.video) {
await this.Drive.delete(`videos/${lesson.video.name}`);
}
await lesson.related('video').query().delete();
lesson.merge({ linked_video_url: data.linked_video_url });
}
/**
* Update file video
*/ */
if (data.video) { if (data.video) {
/**
* Delete video from drive and database
*/
if (lesson.video) { if (lesson.video) {
await this.Drive.delete(`videos/${lesson.video.name}`); await this.Drive.delete(`videos/${lesson.video.name}`);
} }
await lesson.related('video').query().delete(); await lesson.related('video').query().delete();
/**
* Upload new video to drive and save to database
*/
await this.createVideo(lesson, data.video); await this.createVideo(lesson, data.video);
lesson.merge({ linked_video_url: null });
} }
/** /**
@ -211,10 +201,7 @@ export default class LessonRepository {
/** /**
* Delete files from disk * Delete files from disk
*/ */
if (lesson.video) { await this.Drive.delete(`videos/${lesson.video.name}`);
await this.Drive.delete(`videos/${lesson.video.name}`);
}
await this.deleteMaterials(lesson); await this.deleteMaterials(lesson);
/** /**

2
app/Services/AuthService.ts
View File

@ -72,7 +72,7 @@ export default class AuthService {
}); });
/** /**
* Set cookie token to response * Set cookie toke to response
*/ */
ctx.response.cookie('token', token.token); ctx.response.cookie('token', token.token);

24
app/Services/CategoryService.ts
View File

@ -10,7 +10,6 @@ import HttpStatusEnum from 'App/Datatypes/Enums/HttpStatusEnum';
* Repositories * Repositories
*/ */
import CategoryRepository from 'App/Repositories/CategoryRepository'; import CategoryRepository from 'App/Repositories/CategoryRepository';
import CourseRepository from 'App/Repositories/CourseRepository';
/** /**
* Validators * Validators
@ -18,27 +17,12 @@ import CourseRepository from 'App/Repositories/CourseRepository';
import CreateCategoryValidator from 'App/Validators/Category/CreateCategoryValidator'; import CreateCategoryValidator from 'App/Validators/Category/CreateCategoryValidator';
import UpdateCategoryValidator from 'App/Validators/Category/UpdateCategoryValidator'; import UpdateCategoryValidator from 'App/Validators/Category/UpdateCategoryValidator';
/**
* Services
*/
import CourseService from 'App/Services/CourseService';
@inject() @inject()
export default class CategoryService { export default class CategoryService {
private categoryRepository: CategoryRepository; private categoryRepository: CategoryRepository;
private courseRepository: CourseRepository; constructor(categoryRepository: CategoryRepository) {
private courseService: CourseService;
constructor(
categoryRepository: CategoryRepository,
courseRepository: CourseRepository,
courseService: CourseService
) {
this.categoryRepository = categoryRepository; this.categoryRepository = categoryRepository;
this.courseRepository = courseRepository;
this.courseService = courseService;
} }
/** /**
@ -110,7 +94,7 @@ export default class CategoryService {
* @returns Deleted category * @returns Deleted category
*/ */
public async deleteCategory(id: string | number): Promise<IResponse> { public async deleteCategory(id: string | number): Promise<IResponse> {
const data = await this.categoryRepository.getById(id); const data = await this.categoryRepository.delete(id);
if (!data) { if (!data) {
return { return {
@ -124,10 +108,6 @@ export default class CategoryService {
}; };
} }
const courses = await this.courseRepository.getByCategoryId(id);
await this.courseService.deleteAllFiles(courses);
await this.categoryRepository.delete(id);
return { return {
success: true, success: true,
status: HttpStatusEnum.OK, status: HttpStatusEnum.OK,

75
app/Services/CourseService.ts
View File

@ -25,8 +25,6 @@ import CreateCourseValidator from 'App/Validators/Course/CreateCourseValidator';
import UpdateCourseValidator from 'App/Validators/Course/UpdateCourseValidator'; import UpdateCourseValidator from 'App/Validators/Course/UpdateCourseValidator';
import FetchCoursesValidator from 'App/Validators/Course/FetchCoursesValidator'; import FetchCoursesValidator from 'App/Validators/Course/FetchCoursesValidator';
import Course from 'App/Models/Course'; import Course from 'App/Models/Course';
import Drive from '@ioc:Adonis/Core/Drive';
import CourseHelper, { FileEntry } from 'App/Helpers/CourseHelper';
@inject() @inject()
export default class CourseService { export default class CourseService {
@ -235,9 +233,9 @@ export default class CourseService {
/** /**
* Find course teacher * Find course teacher
*/ */
const user = await this.userRepository.getById(data.teacher_id); const teacher = await this.userRepository.getById(data.teacher_id);
if (!user) { if (!teacher) {
return { return {
success: false, success: false,
status: HttpStatusEnum.NOT_FOUND, status: HttpStatusEnum.NOT_FOUND,
@ -249,13 +247,13 @@ export default class CourseService {
}; };
} }
const isHasPermissions = RoleHelper.userContainRoles(user.roles, [RoleEnum.ADMIN, RoleEnum.TEACHER]); const isTeacher = RoleHelper.userHasRoles(teacher.roles, [RoleEnum.TEACHER]);
if (!isHasPermissions) { if (!isTeacher) {
return { return {
success: false, success: false,
status: HttpStatusEnum.BAD_REQUEST, status: HttpStatusEnum.BAD_REQUEST,
message: `User with id "${user.id}" does not have sufficient permissions.`, message: `User with id "${teacher.id}" not a teacher.`,
data: {}, data: {},
error: { error: {
code: 'E_BAD_REQUEST', code: 'E_BAD_REQUEST',
@ -312,8 +310,6 @@ export default class CourseService {
}; };
} }
await this.deleteAllFiles([course]);
return { return {
success: true, success: true,
status: HttpStatusEnum.OK, status: HttpStatusEnum.OK,
@ -330,7 +326,7 @@ export default class CourseService {
* @returns Response * @returns Response
*/ */
public async updateCourse(id: string | number, data: UpdateCourseValidator['schema']['props']): Promise<IResponse> { public async updateCourse(id: string | number, data: UpdateCourseValidator['schema']['props']): Promise<IResponse> {
const course = await this.courseRepository.getById(id); const course = await this.courseRepository.update(id, data);
if (!course) { if (!course) {
return { return {
@ -344,45 +340,11 @@ export default class CourseService {
}; };
} }
if (data.teacher_id) {
const teacher = await this.userRepository.getById(data.teacher_id);
if (!teacher) {
return {
success: false,
status: HttpStatusEnum.NOT_FOUND,
message: 'Teacher not found.',
data: {},
error: {
code: 'E_NOT_FOUND',
},
};
}
await teacher.load('roles');
const isTeacherOrAdmin = RoleHelper.userContainRoles(teacher.roles, [RoleEnum.ADMIN, RoleEnum.TEACHER]);
if (!isTeacherOrAdmin) {
return {
success: false,
status: HttpStatusEnum.BAD_REQUEST,
message: 'Author is not a teacher or admin.',
data: {},
error: {
code: 'E_BAD_REQUEST',
},
};
}
}
const updated = await this.courseRepository.update(id, data);
return { return {
success: true, success: true,
status: HttpStatusEnum.OK, status: HttpStatusEnum.OK,
message: 'Course updated.', message: 'Course updated.',
data: updated || {}, data: course,
}; };
} }
@ -705,29 +667,6 @@ export default class CourseService {
data: { count }, data: { count },
}; };
} }
/**
* This function will delete all associated course files on disk
*
* @param courses List of courses
*/
public async deleteAllFiles(courses: Course[]): Promise<void> {
/**
* Collect file names
*/
const images = courses.map(course => CourseHelper.getImageFileName(course)).filter(Boolean) as FileEntry[];
const videos = courses.flatMap(course => CourseHelper.getVideoFileNames(course)).filter(Boolean) as FileEntry[];
const materials = courses.flatMap(course => CourseHelper.getMaterialFileNames(course));
/**
* Remove files from disk
*/
const promises = videos
.concat(images, materials)
.map(file => Drive.delete(`${file.path}${file.name.substring(file.name.lastIndexOf('/') + 1)}`));
await Promise.all(promises);
}
} }
new Ioc().make(CourseService); new Ioc().make(CourseService);

71
app/Services/LessonService.ts
View File

@ -78,7 +78,20 @@ export default class LessonService {
}; };
} }
await ctx.bouncer.with('LessonPolicy').authorize('view', lesson); /**
* Allow user to view lesson content
*/
if (await ctx.bouncer.denies('viewLessonContent', lesson)) {
return {
success: false,
status: HttpStatusEnum.FORBIDDEN,
message: 'The user is not a student of this course.',
data: {},
error: {
code: 'E_FORBIDDEN',
},
};
}
/** /**
* Load lesson with materials * Load lesson with materials
@ -96,8 +109,7 @@ export default class LessonService {
/** /**
* Fetch lesson material by file name * Fetch lesson material by file name
* *
* @param ctx Http context * @param fileName Name of file
* @param name Filename
* @returns Response * @returns Response
*/ */
public async fetchMaterialFile(ctx: HttpContextContract, name: string): Promise<IResponse<LessonMaterial>> { public async fetchMaterialFile(ctx: HttpContextContract, name: string): Promise<IResponse<LessonMaterial>> {
@ -119,7 +131,18 @@ export default class LessonService {
* Allow user to view lesson material * Allow user to view lesson material
*/ */
await material.load('lesson'); await material.load('lesson');
await ctx.bouncer.with('LessonPolicy').authorize('view', material.lesson);
if (await ctx.bouncer.denies('viewLessonContent', material.lesson)) {
return {
success: false,
status: HttpStatusEnum.FORBIDDEN,
message: 'You are not able to view this file.',
data: {},
error: {
code: 'E_FORBIDDEN',
},
};
}
return { return {
success: true, success: true,
@ -145,7 +168,18 @@ export default class LessonService {
} }
await video.load('lesson'); await video.load('lesson');
await ctx.bouncer.with('LessonPolicy').authorize('view', video.lesson);
if (await ctx.bouncer.denies('viewLessonContent', video.lesson)) {
return {
success: false,
status: HttpStatusEnum.FORBIDDEN,
message: 'You are not able to view this file.',
data: {},
error: {
code: 'E_FORBIDDEN',
},
};
}
return { return {
success: true, success: true,
@ -177,7 +211,17 @@ export default class LessonService {
}; };
} }
await ctx.bouncer.with('LessonPolicy').authorize('view', lesson); if (await ctx.bouncer.denies('viewLessonContent', lesson)) {
return {
success: false,
status: HttpStatusEnum.FORBIDDEN,
message: 'The user is not a student of this course.',
data: {},
error: {
code: 'E_FORBIDDEN',
},
};
}
const progress = await this.lessonProgressRepository.get(user.id, lesson.id); const progress = await this.lessonProgressRepository.get(user.id, lesson.id);
@ -310,7 +354,20 @@ export default class LessonService {
}; };
} }
await ctx.bouncer.with('LessonPolicy').authorize('view', lesson); /**
* Allow user to view lesson content
*/
if (await ctx.bouncer.denies('viewLessonContent', lesson)) {
return {
success: false,
status: HttpStatusEnum.FORBIDDEN,
message: 'The user is not a student of this course.',
data: {},
error: {
code: 'E_FORBIDDEN',
},
};
}
/** /**
* Load lesson with materials * Load lesson with materials

78
app/Services/UserService.ts
View File

@ -22,48 +22,21 @@ import Role from 'App/Models/Role';
import RoleRepository from 'App/Repositories/RoleRepository'; import RoleRepository from 'App/Repositories/RoleRepository';
import UserRepository from 'App/Repositories/UserRepository'; import UserRepository from 'App/Repositories/UserRepository';
/**
* Services
*/
import CourseService from './CourseService';
/** /**
* Validators * Validators
*/ */
import CreateUserValidator from 'App/Validators/User/CreateUserValidator'; import CreateUserValidator from 'App/Validators/User/CreateUserValidator';
import UpdateUserValidator from 'App/Validators/User/UpdateUserValidator'; import UpdateUserValidator from 'App/Validators/User/UpdateUserValidator';
/**
* Datatypes
*/
import RoleEnum from 'App/Datatypes/Enums/RoleEnum';
/**
* Helpers
*/
import RoleHelper from 'App/Helpers/RoleHelper';
import CourseRepository from 'App/Repositories/CourseRepository';
@inject() @inject()
export default class UserService { export default class UserService {
private userRepository: UserRepository; private userRepository: UserRepository;
private roleRepository: RoleRepository; private roleRepository: RoleRepository;
private courseRepository: CourseRepository; constructor(userRepository: UserRepository, roleRepository: RoleRepository) {
private courseService: CourseService;
constructor(
userRepository: UserRepository,
roleRepository: RoleRepository,
courseRepository: CourseRepository,
courseService: CourseService
) {
this.userRepository = userRepository; this.userRepository = userRepository;
this.roleRepository = roleRepository; this.roleRepository = roleRepository;
this.courseRepository = courseRepository;
this.courseService = courseService;
} }
/** /**
@ -147,7 +120,20 @@ export default class UserService {
}; };
} }
await ctx.bouncer.with('RolePolicy').authorize('manage', [role.slug as RoleEnum]); /**
* Check user permissions
*/
if (await ctx.bouncer.denies('manageUserRole', role)) {
return {
success: false,
status: HttpStatusEnum.FORBIDDEN,
message: 'You dont have permissions to permorm that action',
data: {},
error: {
code: 'E_FORBIDDEN',
},
};
}
/** /**
* Create new user * Create new user
@ -180,7 +166,7 @@ export default class UserService {
data: UpdateUserValidator['schema']['props'], data: UpdateUserValidator['schema']['props'],
ctx: HttpContextContract ctx: HttpContextContract
): Promise<IResponse> { ): Promise<IResponse> {
const user = await this.userRepository.getById(id); const user = await this.userRepository.update(id, data);
if (!user) { if (!user) {
return { return {
@ -194,8 +180,6 @@ export default class UserService {
}; };
} }
await ctx.bouncer.with('RolePolicy').authorize('manage', user.roles.map(r => r.slug) as [RoleEnum]);
/** /**
* Update user role * Update user role
*/ */
@ -203,18 +187,27 @@ export default class UserService {
const role = await this.roleRepository.getBySlug(data.role); const role = await this.roleRepository.getBySlug(data.role);
if (role) { if (role) {
await ctx.bouncer.with('RolePolicy').authorize('manage', [data.role]); if (await ctx.bouncer.denies('manageUserRole', role)) {
return {
success: false,
status: HttpStatusEnum.FORBIDDEN,
message: 'You dont have permissions to permorm that action',
data: {},
error: {
code: 'E_FORBIDDEN',
},
};
}
await this.userRepository.updateRoles(user, [role]); await this.userRepository.updateRoles(user, [role]);
} }
} }
const updated = await this.userRepository.update(id, data);
return { return {
success: true, success: true,
status: HttpStatusEnum.OK, status: HttpStatusEnum.OK,
message: 'User updated.', message: 'User updated.',
data: updated || {}, data: user,
}; };
} }
@ -224,8 +217,8 @@ export default class UserService {
* @param id User id * @param id User id
* @returns Response * @returns Response
*/ */
public async deleteUser(id: string | number, ctx: HttpContextContract): Promise<IResponse> { public async deleteUser(id: string | number): Promise<IResponse> {
const user = await this.userRepository.getById(id); const user = await this.userRepository.delete(id);
if (!user) { if (!user) {
return { return {
@ -239,15 +232,6 @@ export default class UserService {
}; };
} }
await ctx.bouncer.with('RolePolicy').authorize('manage', user.roles.map(r => r.slug) as [RoleEnum]);
if (RoleHelper.userContainRoles(user.roles, [RoleEnum.TEACHER, RoleEnum.ADMIN])) {
const courses = await this.courseRepository.getByTeacherId(id);
await this.courseService.deleteAllFiles(courses);
}
await this.userRepository.delete(id);
return { return {
success: true, success: true,
status: HttpStatusEnum.OK, status: HttpStatusEnum.OK,

3
app/Services/WsService.ts
View File

@ -115,10 +115,9 @@ class WsService {
private listen() { private listen() {
this.io.on('connection', async socket => { this.io.on('connection', async socket => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const onlineController = new OnlineController(socket, this.io, this.sessionStore); const onlineController = new OnlineController(socket, this.io, this.sessionStore);
onlineController.handle();
const { sessionId, userId, userName } = socket.data; const { sessionId, userId, userName } = socket.data;
const isExistSocketData = !!(sessionId && userId && userName); const isExistSocketData = !!(sessionId && userId && userName);

6
app/Store/SessionStore.ts
View File

@ -56,6 +56,7 @@ class RedisSessionStore {
public async getSessions(): Promise<Array<SessionDataType | undefined>> { public async getSessions(): Promise<Array<SessionDataType | undefined>> {
const keys = await this.scanSessionKeys(); const keys = await this.scanSessionKeys();
const commands = Array.from(keys).map(key => { const commands = Array.from(keys).map(key => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [, ...id] = key.split('-'); const [, ...id] = key.split('-');
return ['hmget', id.join('-'), 'userId', 'userName', 'connected']; return ['hmget', id.join('-'), 'userId', 'userName', 'connected'];
}); });
@ -63,10 +64,7 @@ class RedisSessionStore {
return this.redisClient return this.redisClient
.multi(commands) .multi(commands)
.exec() .exec()
.then(results => { .then(results => results.map(([err, session]) => (err ? undefined : this.transform(session))));
if (results === null) return [];
return results.map(([err, session]: [Error, (string | null)[]]) => (err ? undefined : this.transform(session)));
});
} }
/** /**

2
app/Validators/Contacts/CreateContactsValidator.ts
View File

@ -7,7 +7,7 @@ export default class CreateContactsValidator {
public schema = schema.create({ public schema = schema.create({
phone_number: schema.string.nullableAndOptional({}, [ phone_number: schema.string.nullableAndOptional({}, [
rules.mobile({ rules.mobile({
locale: ['ru-RU', 'en-US'], locales: ['ru-RU', 'en-US'],
strict: true, strict: true,
}), }),
]), ]),

2
app/Validators/Contacts/UpdateContactsValidator.ts
View File

@ -7,7 +7,7 @@ export default class UpdateContactsValidator {
public schema = schema.create({ public schema = schema.create({
phone_number: schema.string.nullableAndOptional({}, [ phone_number: schema.string.nullableAndOptional({}, [
rules.mobile({ rules.mobile({
locale: ['ru-RU', 'en-US'], locales: ['ru-RU', 'en-US'],
strict: true, strict: true,
}), }),
rules.unique({ table: 'contacts', column: 'phone_number' }), rules.unique({ table: 'contacts', column: 'phone_number' }),

2
app/Validators/Course/CreateCourseValidator.ts
View File

@ -11,7 +11,7 @@ export default class CreateCourseValidator {
education_description: schema.string.nullable(), education_description: schema.string.nullable(),
image: schema.file.optional({ image: schema.file.optional({
size: '10mb', size: '10mb',
extnames: ['jpg', 'jpeg', 'png', 'webp'], extnames: ['jpg', 'jpeg', 'png'],
}), }),
teacher_id: schema.string({}, [rules.exists({ table: 'users', column: 'id' })]), teacher_id: schema.string({}, [rules.exists({ table: 'users', column: 'id' })]),
category_id: schema.string({}, [rules.exists({ table: 'categories', column: 'id' })]), category_id: schema.string({}, [rules.exists({ table: 'categories', column: 'id' })]),

2
app/Validators/Course/UpdateCourseValidator.ts
View File

@ -10,7 +10,7 @@ export default class UpdateCourseValidator {
education_description: schema.string.nullable(), education_description: schema.string.nullable(),
image: schema.file.optional({ image: schema.file.optional({
size: '10mb', size: '10mb',
extnames: ['jpg', 'jpeg', 'png', 'webp'], extnames: ['jpg', 'jpeg', 'png'],
}), }),
teacher_id: schema.string.optional({}, [rules.exists({ table: 'users', column: 'id' })]), teacher_id: schema.string.optional({}, [rules.exists({ table: 'users', column: 'id' })]),
category_id: schema.string.optional({}, [rules.exists({ table: 'categories', column: 'id' })]), category_id: schema.string.optional({}, [rules.exists({ table: 'categories', column: 'id' })]),

3
app/Validators/Lesson/CreateLessonValidator.ts
View File

@ -9,11 +9,10 @@ export default class CreateLessonValidator {
title: schema.string({}, [rules.maxLength(255)]), title: schema.string({}, [rules.maxLength(255)]),
description: schema.string(), description: schema.string(),
duration: schema.date({ format: 'HH:mm:ss' }), duration: schema.date({ format: 'HH:mm:ss' }),
video: schema.file.optional({ video: schema.file({
size: '5000mb', size: '5000mb',
extnames: ['mp4', 'mov', 'avi', 'wmv', 'webm', 'flv'], extnames: ['mp4', 'mov', 'avi', 'wmv', 'webm', 'flv'],
}), }),
linked_video_url: schema.string.optional([rules.regex(new RegExp('^(http|https|ftp)://'))]),
materials: schema.array.optional().members( materials: schema.array.optional().members(
schema.file({ schema.file({
size: '100mb', size: '100mb',

1
app/Validators/Lesson/UpdateLessonValidator.ts
View File

@ -13,7 +13,6 @@ export default class UpdateLessonValidator {
size: '5000mb', size: '5000mb',
extnames: ['mp4', 'mov', 'avi', 'wmv', 'webm', 'flv'], extnames: ['mp4', 'mov', 'avi', 'wmv', 'webm', 'flv'],
}), }),
linked_video_url: schema.string.optional([rules.regex(new RegExp('^(http|https|ftp)://'))]),
materials: schema.array.nullableAndOptional().members( materials: schema.array.nullableAndOptional().members(
schema.file({ schema.file({
size: '100mb', size: '100mb',

2
app/Validators/User/UpdateUserInfoValidator.ts
View File

@ -7,7 +7,7 @@ export default class UpdateUserInfoValidator {
public schema = schema.create({ public schema = schema.create({
about: schema.string.nullableAndOptional(), about: schema.string.nullableAndOptional(),
phone_number: schema.string.nullableAndOptional({}, [ phone_number: schema.string.nullableAndOptional({}, [
rules.mobile({ locale: ['ru-RU', 'en-US'], strict: true }), rules.mobile({ locales: ['ru-RU', 'en-US'], strict: true }),
rules.unique({ table: 'contacts', column: 'phone_number' }), rules.unique({ table: 'contacts', column: 'phone_number' }),
]), ]),
vk_id: schema.string.nullableAndOptional({}, [ vk_id: schema.string.nullableAndOptional({}, [

4
config/app.ts
View File

@ -106,8 +106,8 @@ export const http: ServerConfig = {
path: '/', path: '/',
maxAge: '1d', maxAge: '1d',
httpOnly: true, httpOnly: true,
secure: true, secure: false,
sameSite: 'none', sameSite: false,
}, },
/* /*

1
config/database.ts
View File

@ -43,7 +43,6 @@ const databaseConfig: DatabaseConfig = {
database: Env.get('PG_DB_NAME'), database: Env.get('PG_DB_NAME'),
}, },
migrations: { migrations: {
disableRollbacksInProduction: true,
naturalSort: true, naturalSort: true,
tableName: 'migrations', tableName: 'migrations',
}, },

8
config/drive.ts
View File

@ -6,7 +6,7 @@
*/ */
import Env from '@ioc:Adonis/Core/Env'; import Env from '@ioc:Adonis/Core/Env';
import { driveConfig } from '@adonisjs/core/build/config'; import { DriveConfig } from '@ioc:Adonis/Core/Drive';
import Application from '@ioc:Adonis/Core/Application'; import Application from '@ioc:Adonis/Core/Application';
/* /*
@ -18,7 +18,7 @@ import Application from '@ioc:Adonis/Core/Application';
| defined inside the `contracts` directory. | defined inside the `contracts` directory.
| |
*/ */
export default driveConfig({ const driveConfig: DriveConfig = {
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Default disk | Default disk
@ -143,4 +143,6 @@ export default driveConfig({
// usingUniformAcl: false // usingUniformAcl: false
// }, // },
}, },
}); };
export default driveConfig;

8
config/hash.ts
View File

@ -6,7 +6,7 @@
*/ */
import Env from '@ioc:Adonis/Core/Env'; import Env from '@ioc:Adonis/Core/Env';
import { hashConfig } from '@adonisjs/core/build/config'; import { HashConfig } from '@ioc:Adonis/Core/Hash';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -17,7 +17,7 @@ import { hashConfig } from '@adonisjs/core/build/config';
| defined inside `contracts` directory. | defined inside `contracts` directory.
| |
*/ */
export default hashConfig({ const hashConfig: HashConfig = {
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Default hasher | Default hasher
@ -70,4 +70,6 @@ export default hashConfig({
rounds: 10, rounds: 10,
}, },
}, },
}); };
export default hashConfig;

10
config/mail.ts
View File

@ -6,9 +6,9 @@
*/ */
import Env from '@ioc:Adonis/Core/Env'; import Env from '@ioc:Adonis/Core/Env';
import { mailConfig } from '@adonisjs/mail/build/config'; import { MailConfig } from '@ioc:Adonis/Addons/Mail';
export default mailConfig({ const mailConfig: MailConfig = {
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Default mailer | Default mailer
@ -18,7 +18,7 @@ export default mailConfig({
| a mailer | a mailer
| |
*/ */
mailer: Env.get('MAILER'), mailer: 'mailgun',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -71,4 +71,6 @@ export default mailConfig({
domain: Env.get('MAILGUN_DOMAIN'), domain: Env.get('MAILGUN_DOMAIN'),
}, },
}, },
}); };
export default mailConfig;

18
contracts/drive.ts
View File

@ -1,6 +1,16 @@
import { InferDisksFromConfig } from '@adonisjs/core/build/config';
import driveConfig from '../config/drive';
declare module '@ioc:Adonis/Core/Drive' { declare module '@ioc:Adonis/Core/Drive' {
interface DisksList extends InferDisksFromConfig<typeof driveConfig> {} interface DisksList {
local: {
config: LocalDriverConfig;
implementation: LocalDriverContract;
};
s3: {
config: S3DriverConfig;
implementation: S3DriverContract;
};
// gcs: {
// config: GcsDriverConfig
// implementation: GcsDriverContract
// }
}
} }

19
contracts/hash.ts
View File

@ -1,6 +1,19 @@
import { InferListFromConfig } from '@adonisjs/core/build/config'; /**
import hashConfig from '../config/hash'; * Contract source: https://git.io/Jfefs
*
* Feel free to let us know via PR, if you find something broken in this contract
* file.
*/
declare module '@ioc:Adonis/Core/Hash' { declare module '@ioc:Adonis/Core/Hash' {
interface HashersList extends InferListFromConfig<typeof hashConfig> {} interface HashersList {
bcrypt: {
config: BcryptConfig;
implementation: BcryptContract;
};
argon: {
config: ArgonConfig;
implementation: ArgonContract;
};
}
} }

15
contracts/mail.ts
View File

@ -1,6 +1,15 @@
import { InferMailersFromConfig } from '@adonisjs/mail/build/config'; /**
import mailConfig from '../config/mail'; * Contract source: https://git.io/JvgAT
*
* Feel free to let us know via PR, if you find something broken in this contract
* file.
*/
declare module '@ioc:Adonis/Addons/Mail' { declare module '@ioc:Adonis/Addons/Mail' {
interface MailersList extends InferMailersFromConfig<typeof mailConfig> {} import { MailDrivers } from '@ioc:Adonis/Addons/Mail';
interface MailersList {
smtp: MailDrivers['smtp'];
mailgun: MailDrivers['mailgun'];
}
} }

4
database/factories/index.ts
View File

@ -1,4 +1,4 @@
import Factory, { FactoryContextContract } from '@ioc:Adonis/Lucid/Factory'; import Factory from '@ioc:Adonis/Lucid/Factory';
import { string } from '@ioc:Adonis/Core/Helpers'; import { string } from '@ioc:Adonis/Core/Helpers';
/** /**
@ -18,7 +18,7 @@ import Role from 'App/Models/Role';
import User from 'App/Models/User'; import User from 'App/Models/User';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
const makeFakeUser = (faker: FactoryContextContract['faker'], loginPrefix?: string) => { const makeFakeUser = (faker: Faker.FakerStatic, loginPrefix?: string) => {
return { return {
first_name: faker.name.firstName(), first_name: faker.name.firstName(),
last_name: faker.name.lastName(), last_name: faker.name.lastName(),

1
database/migrations/1628016919501_lessons.ts
View File

@ -11,7 +11,6 @@ export default class Lessons extends BaseSchema {
table.integer('display_order').notNullable(); table.integer('display_order').notNullable();
table.integer('color_id').unsigned().references('colors.id'); table.integer('color_id').unsigned().references('colors.id');
table.string('description'); table.string('description');
table.text('linked_video_url').nullable();
table.time('duration').notNullable(); table.time('duration').notNullable();
table.timestamp('created_at', { useTz: true }); table.timestamp('created_at', { useTz: true });
table.timestamp('updated_at', { useTz: true }); table.timestamp('updated_at', { useTz: true });

8
database/seeders/Course.ts
View File

@ -7,13 +7,7 @@ export default class CourseSeeder extends BaseSeeder {
public async run() { public async run() {
this.CourseFactory = CourseFactory; this.CourseFactory = CourseFactory;
const LESSONS_COUNT = 10; await this.CourseFactory.with('lessons', 10, lessonFactory => lessonFactory.with('content'))
await this.CourseFactory.with('lessons', LESSONS_COUNT, lessonFactory =>
lessonFactory
.with('content')
.merge(new Array(LESSONS_COUNT).fill(LESSONS_COUNT).map((_, i) => ({ display_order: i + 1 })))
)
.with('category') .with('category')
.with('teacher') .with('teacher')
.createMany(3); .createMany(3);

31
database/seeders/User.ts
View File

@ -11,48 +11,23 @@ export default class UserSeeder extends BaseSeeder {
*/ */
const roles = { const roles = {
admin: await Role.findByOrFail('slug', 'admin'), admin: await Role.findByOrFail('slug', 'admin'),
teacher: await Role.findByOrFail('slug', 'teacher'),
student: await Role.findByOrFail('slug', 'student'), student: await Role.findByOrFail('slug', 'student'),
}; };
/** /**
* Administrator * Administrator
*/ */
const administrator = await User.create({ const userAdmin = await User.create({
first_name: 'John', first_name: 'John',
last_name: 'Doe', last_name: 'Doe',
login: 'admin', login: 'admin',
password: '123456', password: '123456',
email: 'administrator@example.com', email: 'administrator@example.com',
}); });
await administrator.related('roles').attach([roles.admin.id]); await userAdmin.related('roles').attach([roles.admin.id]);
/** /**
* Teacher * Students
*/
const teacher = await User.create({
first_name: 'Hanna',
last_name: 'Liv',
login: 'teacher',
password: '123456',
email: 'teacher@example.com',
});
await teacher.related('roles').attach([roles.teacher.id]);
/**
* Student
*/
const student = await User.create({
first_name: 'Ylfa',
last_name: 'Erna',
login: 'student',
password: '123456',
email: 'student@example.com',
});
await student.related('roles').attach([roles.student.id]);
/**
* Student list
*/ */
await StudentFactory.with('contacts').createMany(20); await StudentFactory.with('contacts').createMany(20);
} }

4
env.ts
View File

@ -15,10 +15,11 @@
import Env from '@ioc:Adonis/Core/Env'; import Env from '@ioc:Adonis/Core/Env';
export default Env.rules({ export default Env.rules({
HOST: Env.schema.string({ format: 'host' }),
PORT: Env.schema.number(), PORT: Env.schema.number(),
APP_KEY: Env.schema.string(), APP_KEY: Env.schema.string(),
APP_NAME: Env.schema.string(), APP_NAME: Env.schema.string(),
NODE_ENV: Env.schema.enum(['development', 'production', 'test'] as const), NODE_ENV: Env.schema.enum(['development', 'production', 'testing'] as const),
DRIVE_DISK: Env.schema.enum(['local', 's3'] as const), DRIVE_DISK: Env.schema.enum(['local', 's3'] as const),
PG_HOST: Env.schema.string({ format: 'host' }), PG_HOST: Env.schema.string({ format: 'host' }),
PG_PORT: Env.schema.number(), PG_PORT: Env.schema.number(),
@ -29,7 +30,6 @@ export default Env.rules({
REDIS_HOST: Env.schema.string({ format: 'host' }), REDIS_HOST: Env.schema.string({ format: 'host' }),
REDIS_PORT: Env.schema.number(), REDIS_PORT: Env.schema.number(),
REDIS_PASSWORD: Env.schema.string.optional(), REDIS_PASSWORD: Env.schema.string.optional(),
MAILER: Env.schema.enum(['mailgun', 'smtp'] as const),
SMTP_HOST: Env.schema.string({ format: 'host' }), SMTP_HOST: Env.schema.string({ format: 'host' }),
SMTP_PORT: Env.schema.number(), SMTP_PORT: Env.schema.number(),
SMTP_USERNAME: Env.schema.string(), SMTP_USERNAME: Env.schema.string(),

15867
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

63
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "server", "name": "server",
"version": "1.4.5", "version": "1.2.1",
"private": true, "private": true,
"scripts": { "scripts": {
"build": "node ace build --production", "build": "node ace build --production",
@ -15,44 +15,43 @@
"db:seed:force": "node ace seed --force" "db:seed:force": "node ace seed --force"
}, },
"devDependencies": { "devDependencies": {
"@adonisjs/assembler": "^5.7.0", "@adonisjs/assembler": "^5.3.7",
"@typescript-eslint/eslint-plugin": "^5.27.0", "@typescript-eslint/eslint-plugin": "^4.30.0",
"@typescript-eslint/parser": "^5.27.0", "@typescript-eslint/parser": "^4.30.0",
"adonis-preset-ts": "^2.1.0", "adonis-preset-ts": "^2.1.0",
"eslint": "^8.17.0", "eslint": "^7.32.0",
"eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-base": "^14.2.1",
"eslint-config-airbnb-typescript": "^17.0.0", "eslint-config-airbnb-typescript": "^12.3.1",
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.24.2",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^3.4.1",
"pino-pretty": "^8.0.0", "pino-pretty": "^5.1.3",
"prettier": "^2.6.2", "prettier": "^2.3.2",
"typescript": "^4.7.3", "typescript": "^4.4.2",
"youch": "^3.2.0", "youch": "^2.2.2",
"youch-terminal": "^2.1.4" "youch-terminal": "^1.1.1"
}, },
"dependencies": { "dependencies": {
"@adonisjs/application": "^5.2.5", "@adonisjs/attachment-lite": "^1.0.1",
"@adonisjs/attachment-lite": "^1.0.7", "@adonisjs/auth": "^8.0.10",
"@adonisjs/auth": "^8.2.1", "@adonisjs/bouncer": "^2.2.5",
"@adonisjs/bouncer": "^2.3.0", "@adonisjs/core": "^5.4.2",
"@adonisjs/core": "^5.8.3", "@adonisjs/drive": "^2.0.7",
"@adonisjs/drive": "^2.2.0", "@adonisjs/drive-s3": "^1.0.5",
"@adonisjs/drive-s3": "^1.3.1", "@adonisjs/lucid": "^16.3.2",
"@adonisjs/lucid": "^18.0.1", "@adonisjs/mail": "^7.2.4",
"@adonisjs/mail": "^8.1.2", "@adonisjs/redis": "^7.1.0",
"@adonisjs/redis": "^7.3.0", "@adonisjs/repl": "^3.1.7",
"@adonisjs/repl": "^3.1.11", "@adonisjs/view": "^6.1.1",
"@adonisjs/view": "^6.1.5",
"@types/socket.io": "^3.0.2", "@types/socket.io": "^3.0.2",
"cloudinary": "^1.26.3", "cloudinary": "^1.26.3",
"luxon": "^2.4.0", "luxon": "^1.28.0",
"nanoid": "^3.3.4", "nanoid": "^3.1.25",
"pg": "^8.7.3", "pg": "^8.7.1",
"phc-bcrypt": "^1.0.7", "phc-bcrypt": "^1.0.7",
"proxy-addr": "^2.0.7", "proxy-addr": "^2.0.7",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"socket.io": "^4.5.1", "socket.io": "^4.4.1",
"source-map-support": "^0.5.21" "source-map-support": "^0.5.19"
} }
} }

2
server.ts
View File

@ -21,3 +21,5 @@ const server = new Ignitor(__dirname).httpServer();
server.start().catch(error => { server.start().catch(error => {
throw new Error(error); throw new Error(error);
}); });
process.on('SIGINT', () => server.kill(10));

27
start/bouncer.ts
View File

@ -6,6 +6,11 @@
*/ */
import Bouncer from '@ioc:Adonis/Addons/Bouncer'; import Bouncer from '@ioc:Adonis/Addons/Bouncer';
import RoleEnum from 'App/Datatypes/Enums/RoleEnum';
import RoleHelper from 'App/Helpers/RoleHelper';
import Lesson from 'App/Models/Lesson';
import Role from 'App/Models/Role';
import User from 'App/Models/User';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -29,7 +34,22 @@ import Bouncer from '@ioc:Adonis/Addons/Bouncer';
| NOTE: Always export the "actions" const from this file | NOTE: Always export the "actions" const from this file
|**************************************************************** |****************************************************************
*/ */
export const { actions } = Bouncer; export const { actions } = Bouncer.define('manageUserRole', async (user: User, role: Role) => {
await user.load('roles');
return !(
(role.slug === RoleEnum.ADMIN || role.slug === RoleEnum.TEACHER) &&
!RoleHelper.userContainRoles(user.roles, [RoleEnum.ADMIN])
);
}).define('viewLessonContent', async (user: User, lesson: Lesson) => {
await user.load(loader => loader.load('roles').load('courses'));
await lesson.load('course');
if (!RoleHelper.userContainRoles(user.roles, [RoleEnum.ADMIN, RoleEnum.TEACHER])) {
return !!user.courses.find(course => course.id === lesson.course.id);
}
return true;
});
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -54,7 +74,4 @@ export const { actions } = Bouncer;
| NOTE: Always export the "policies" const from this file | NOTE: Always export the "policies" const from this file
|**************************************************************** |****************************************************************
*/ */
export const { policies } = Bouncer.registerPolicies({ export const { policies } = Bouncer.registerPolicies({});
LessonPolicy: () => import('App/Policies/LessonPolicy'),
RolePolicy: () => import('App/Policies/RolePolicy'),
});

2
start/routes/apis/v1/auth.ts
View File

@ -3,4 +3,4 @@ import Route from '@ioc:Adonis/Core/Route';
Route.group(() => { Route.group(() => {
Route.post('login', 'Api/v1/AuthController.login').as('auth.login'); Route.post('login', 'Api/v1/AuthController.login').as('auth.login');
Route.post('logout', 'Api/v1/AuthController.logout').middleware('auth').as('auth.logout'); Route.post('logout', 'Api/v1/AuthController.logout').middleware('auth').as('auth.logout');
}).prefix('v1/auth'); }).prefix('api/v1/auth');

2
start/routes/apis/v1/categories.ts
View File

@ -7,5 +7,5 @@ Route.group(() => {
Route.delete('/:id', 'Api/v1/CategoriesController.delete').middleware('role:admin,teacher').as('categories.delete'); Route.delete('/:id', 'Api/v1/CategoriesController.delete').middleware('role:admin,teacher').as('categories.delete');
Route.patch('/:id', 'Api/v1/CategoriesController.update').middleware('role:admin,teacher').as('categories.update'); Route.patch('/:id', 'Api/v1/CategoriesController.update').middleware('role:admin,teacher').as('categories.update');
}) })
.prefix('v1/categories') .prefix('api/v1/categories')
.middleware('auth'); .middleware('auth');

2
start/routes/apis/v1/chat.ts
View File

@ -5,5 +5,5 @@ Route.group(() => {
.middleware('role:admin,teacher,student') .middleware('role:admin,teacher,student')
.as('chat.get-conversations'); .as('chat.get-conversations');
}) })
.prefix('v1/chat') .prefix('api/v1/chat')
.middleware('auth'); .middleware('auth');

2
start/routes/apis/v1/courses.ts
View File

@ -62,5 +62,5 @@ Route.group(() => {
.middleware('role:admin,teacher,student') .middleware('role:admin,teacher,student')
.as('courses.get-lessons-progress'); .as('courses.get-lessons-progress');
}) })
.prefix('v1/courses') .prefix('api/v1/courses')
.middleware('auth'); .middleware('auth');

2
start/routes/apis/v1/health.ts
View File

@ -9,5 +9,5 @@ Route.group(() => {
return report.healthy ? ctx.response.ok(report) : ctx.response.badRequest(report); return report.healthy ? ctx.response.ok(report) : ctx.response.badRequest(report);
}).as('health'); }).as('health');
}) })
.prefix('v1/health') .prefix('api/v1/health')
.middleware('auth'); .middleware('auth');

2
start/routes/apis/v1/images.ts
View File

@ -6,5 +6,5 @@ Route.group(() => {
Route.get('/', 'Api/v1/ImagesController.list').as('images.list'); Route.get('/', 'Api/v1/ImagesController.list').as('images.list');
Route.get('/:id', 'Api/v1/ImagesController.show').as('images.show'); Route.get('/:id', 'Api/v1/ImagesController.show').as('images.show');
}) })
.prefix('v1/images') .prefix('api/v1/images')
.middleware('auth'); .middleware('auth');

2
start/routes/apis/v1/lessons.ts
View File

@ -19,5 +19,5 @@ Route.group(() => {
.middleware('role:admin,teacher,student') .middleware('role:admin,teacher,student')
.as('lessons.get-video-progress'); .as('lessons.get-video-progress');
}) })
.prefix('v1/lessons') .prefix('api/v1/lessons')
.middleware('auth'); .middleware('auth');

2
start/routes/apis/v1/me.ts
View File

@ -19,5 +19,5 @@ Route.group(() => {
.middleware('role:admin,teacher,student') .middleware('role:admin,teacher,student')
.as('me.update-contacts'); .as('me.update-contacts');
}) })
.prefix('v1/me') .prefix('api/v1/me')
.middleware('auth'); .middleware('auth');

2
start/routes/apis/v1/stat.ts
View File

@ -3,5 +3,5 @@ import Route from '@ioc:Adonis/Core/Route';
Route.group(() => { Route.group(() => {
Route.get('/', 'Api/v1/StatController.index').middleware('role:admin,teacher,student').as('stat.index'); Route.get('/', 'Api/v1/StatController.index').middleware('role:admin,teacher,student').as('stat.index');
}) })
.prefix('v1/stat') .prefix('api/v1/stat')
.middleware('auth'); .middleware('auth');

4
start/routes/apis/v1/users.ts
View File

@ -7,11 +7,11 @@ Route.group(() => {
Route.patch('/:id', 'Api/v1/UsersController.update').middleware('role:admin,teacher').as('users.update'); Route.patch('/:id', 'Api/v1/UsersController.update').middleware('role:admin,teacher').as('users.update');
Route.delete('/:id', 'Api/v1/UsersController.delete').middleware('role:admin,teacher').as('users.delete'); Route.delete('/:id', 'Api/v1/UsersController.delete').middleware('role:admin,teacher').as('users.delete');
Route.post('/:id/attach-roles', 'Api/v1/UsersController.attachRoles') Route.post('/:id/attach-roles', 'Api/v1/UsersController.attachRoles')
.middleware('role:admin') .middleware('role:admin,teacher')
.as('users.attach-role'); .as('users.attach-role');
Route.delete('/:id/detach-roles', 'Api/v1/UsersController.detachRoles') Route.delete('/:id/detach-roles', 'Api/v1/UsersController.detachRoles')
.middleware('role:admin') .middleware('role:admin')
.as('users.detach-role'); .as('users.detach-role');
}) })
.prefix('v1/users') .prefix('api/v1/users')
.middleware('auth'); .middleware('auth');

25
tsconfig.json
View File

@ -1,17 +1,30 @@
{ {
"extends": "./node_modules/adonis-preset-ts/tsconfig", "extends": "./node_modules/adonis-preset-ts/tsconfig",
"include": ["**/*"], "include": [
"exclude": ["node_modules", "build"], "**/*"
],
"exclude": [
"node_modules",
"build"
],
"compilerOptions": { "compilerOptions": {
"outDir": "build", "outDir": "build",
"rootDir": "./", "rootDir": "./",
"sourceMap": true, "sourceMap": true,
"useDefineForClassFields": true, "useDefineForClassFields": true,
"paths": { "paths": {
"App/*": ["./app/*"], "App/*": [
"Config/*": ["./config/*"], "./app/*"
"Contracts/*": ["./contracts/*"], ],
"Database/*": ["./database/*"] "Config/*": [
"./config/*"
],
"Contracts/*": [
"./contracts/*"
],
"Database/*": [
"./database/*"
]
}, },
"types": [ "types": [
"@adonisjs/core", "@adonisjs/core",