shop and admin panel

src/api/Server/BaseWebMiddleware.ts

@@ -0,0 +1,10 @@
+import Base from "../../abstracts/Base";
+import { Request, Response } from "express";
+
+export default abstract class BaseWebMiddleware extends Base {
+    public constructor(name: string, descirption?: string) {
+        super(name, descirption, "SERVER")
+    }
+
+    public abstract handle(request: Request, response: Response, next): void
+}

src/api/website/index.ts

@@ -1,11 +1,8 @@
 import express, { Request, Response } from 'express'
-import Tuple from '@riniya.ts/utils/Tuple'
-import AbstractRoutes from '../Server/AbstractRoutes'
 import http from 'http'
 import session from 'express-session'
 import { v4 } from 'uuid'
 import * as parser from 'body-parser'
-import CAuthMiddleware from './middleware/CAuthMiddleware'
 import path from 'path'
 import Auth from './routes/Auth'
 import Index from './routes/index'

src/api/website/routes/Admin.ts

@@ -1,52 +1,55 @@
 import { Request } from "express"
-import CAdminAuthentication from '../middleware/CAdminAuthentication'
 import AbstractWebRoutes from '../../Server/AbstractWebRoutes'
+import { isAdminLogged } from '../utils/Middleware'
 
 export default class Admin extends AbstractWebRoutes {
   async register () {
-    this.router.get('/', new CAdminAuthentication().handle, function (req: Request, res) {
+
+    this.prefix = 'admin'
+
+    this.router.get('/', isAdminLogged, function (req: Request, res) {
 
     })
 
     // Guilds
 
-    this.router.get('/servers', new CAdminAuthentication().handle, function (req: Request, res) {
+    this.router.get('/servers', isAdminLogged, function (req: Request, res) {
 
     })
 
-    this.router.get('/servers/:guild/edit', new CAdminAuthentication().handle, function (req: Request, res) {
+    this.router.get('/servers/:guild/edit', isAdminLogged, function (req: Request, res) {
 
     })
 
-    this.router.post('/servers/:guild/edit/callback', new CAdminAuthentication().handle, function (req: Request, res) {
+    this.router.post('/servers/:guild/edit/callback', isAdminLogged, function (req: Request, res) {
 
     })
 
     // Users
 
-    this.router.get('/users', new CAdminAuthentication().handle, function (req: Request, res) {
+    this.router.get('/users', isAdminLogged, function (req: Request, res) {
 
     })
 
-    this.router.get('/users/:user/edit', new CAdminAuthentication().handle, function (req: Request, res) {
+    this.router.get('/users/:user/edit', isAdminLogged, function (req: Request, res) {
 
     })
 
-    this.router.post('/users/:user/edit/callback', new CAdminAuthentication().handle,  function (req: Request, res) {
+    this.router.post('/users/:user/edit/callback', isAdminLogged,  function (req: Request, res) {
 
     })
 
     // Messages
 
-    this.router.get('/messages', new CAdminAuthentication().handle, function (req: Request, res) {
+    this.router.get('/messages', isAdminLogged, function (req: Request, res) {
 
     })
 
-    this.router.get('/messages/:message/edit', new CAdminAuthentication().handle, function (req: Request, res) {
+    this.router.get('/messages/:message/edit', isAdminLogged, function (req: Request, res) {
 
     })
 
-    this.router.post('/messages/:message/edit/callback', new CAdminAuthentication().handle, function (req: Request, res) {
+    this.router.post('/messages/:message/edit/callback', isAdminLogged, function (req: Request, res) {
 
     })
 

src/api/website/routes/Dashboard.ts

@@ -3,16 +3,16 @@ import { IUser } from '../passport'
 import Guild from '@riniya.ts/database/Guild/Guild'
 import { isNull } from '@riniya.ts/types'
 import Riniya from '@riniya.ts'
-import CAuthMiddleware from '../middleware/CAuthMiddleware'
 import AbstractWebRoutes from '../../Server/AbstractWebRoutes'
+import { isUserLogged } from '../utils/Middleware'
 
 export default class Dashboard extends AbstractWebRoutes {
   async register () {
     this.isProtected = true;
 
     this.prefix = 'dashboard'
 
-    this.router.get('/onboard/setup/:guild/:step', new CAuthMiddleware().handle, async function (req: Request, res) {
+    this.router.get('/onboard/setup/:guild/:step', isUserLogged, async function (req: Request, res) {
       const user = req.user as IUser
       res.render('dashboard/views/onboard', {
         title: 'Setting up RINIYA',
@@ -23,7 +23,7 @@ export default class Dashboard extends AbstractWebRoutes {
         isFirst: true
       })
     })
-    this.router.get('/onboard', new CAuthMiddleware().handle, async function (req: Request, res) {
+    this.router.get('/onboard', isUserLogged, async function (req: Request, res) {
       const user = req.user as IUser
       const userGuilds = user.guilds.map(async x => {
         const dGuild = Riniya.instance.guilds.cache.get(x.id);
@@ -54,7 +54,7 @@ export default class Dashboard extends AbstractWebRoutes {
     })
 
     // Dynamic router
-    this.router.get('/:guildId/:slug?/:route?/:operation?/:id?', new CAuthMiddleware().handle, async function (req: Request, res) {
+    this.router.get('/:guildId/:slug?/:route?/:operation?/:id?', isUserLogged, async function (req: Request, res) {
       // User and guilds data
       const user = req.user as IUser
 

src/api/website/routes/Shop.ts

@@ -1,19 +1,19 @@
 import { Request } from "express"
 import { IUser } from '../passport'
-import CAuthMiddleware from '../middleware/CAuthMiddleware'
 import AbstractWebRoutes from '../../Server/AbstractWebRoutes'
+import { isUserLogged } from '../utils/Middleware'
 
 export default class Shop extends AbstractWebRoutes {
   async register () {
     this.prefix = 'shop'
 
-    this.router.get('/', new CAuthMiddleware().handle, function (req: Request, res) {
+    this.router.get('/', isUserLogged, function (req: Request, res) {
       res.render('shop/index', {
         user: (req.user as IUser)
       })
     })
 
-    this.router.post('/confirm', new CAuthMiddleware().handle, function (req: Request, res) {
+    this.router.post('/confirm', isUserLogged, function (req: Request, res) {
 
     })
   }

src/api/website/utils/Middleware.ts

@@ -0,0 +1,32 @@
+import { Response, Request, NextFunction } from 'express'
+import { isNull } from '@riniya.ts/types'
+import Admin, { Admin as IAdm } from '@riniya.ts/database/Security/Admin'
+import { IUser } from '../passport'
+
+export interface IAdmin extends IUser {
+   admin?: IAdm;
+}
+
+export function isUserLogged(req: Request, res: Response, next: NextFunction) {
+  if (req.user) {
+    next()
+  } else {
+    return res.redirect("https://www.riniya.uk/user/login")
+  }
+}
+
+export async function isAdminLogged(req: Request, res: Response, next: NextFunction) {
+  if (req.isAuthenticated()) {
+
+    const adm = req.user as IAdmin;
+
+    const account = await Admin.findOne({ userId: adm.admin.userId })
+    if (isNull(account)) {
+      return res.render('dashboard/views/errors/403')
+    }
+
+    next()
+  } else {
+    return res.redirect("https://www.riniya.uk/admin/login")
+  }
+}