Merge branch 'development'

index.ts

@@ -1,7 +1,7 @@
 import express, { Application, Request, Response } from 'express';
-import cors from 'cors';
 import path from 'path';
 import bodyParser from 'body-parser';
+import cors from 'cors';
 
 import { errorHandler } from './src/middleware/ErrorHandler';
 import keycloak from './src/middleware/Keycloak';
@@ -19,27 +19,29 @@ import './src/utils/Scheduler';
 
 const app: Application = express();
 
-const allowedOrigins = [
-    'http://localhost:3006', // frontend local
-    'https://radar-dev.farmagitechs.co.id' // production domain
+const whitelist = [
+    "http://localhost:3006",
+    "https://radar-dev.farmagitechs.co.id"
 ];
 
-const corsOptions = {
-    origin: allowedOrigins,
-    methods: ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS'],
-    allowedHeaders: ['Content-Type', 'Authorization'],
-    credentials: true,
-};
+var corsOptions = {
+    origin: function (origin: any, callback: any) {
+        if (whitelist.indexOf(origin) !== -1) {
+            callback(null, true)
+        } else {
+            callback(new Error('Not allowed by CORS'))
+        }
+    }
+}
 
 app.use(cors(corsOptions));
-app.options('*', cors(corsOptions));
+
 app.use(bodyParser.json());
 app.use(keycloak.middleware());
-app.use(express.json())
+app.use(express.json());
 app.use('/storage/', express.static(path.join(__dirname, 'storage/')));
 
 const apiV1 = express.Router();
-
 apiV1.use('/province', provinceRoutes);
 apiV1.use('/city', cityRoutes);
 apiV1.use('/hospital', hospitalRoutes);
@@ -47,9 +49,8 @@ apiV1.use('/hospital-area', salesHospitalRoutes);
 apiV1.use('/vendor', vendorRoutes);
 apiV1.use('/area', areaRoutes);
 apiV1.use('/category', CategoryRoutes);
-// apiV1.use('/vendor-sales', vendorSalesRoutes);
 
-app.get('/', (req: Request, res: Response) => {
+app.get('', (req: Request, res: Response) => {
     res.send('Selamat Datang di API Radar Farmagitechs');
 });
 
@@ -58,4 +59,4 @@ app.use(errorHandler);
 
 app.listen(config.port, () => {
     console.log(`Server started on port ${config.port}`);
-})
+});

src/routes/admin/CategoryRoute.ts

@@ -3,6 +3,7 @@ import * as CategoryController from '../../controllers/admin/CategoryController'
 import keycloak from '../../middleware/Keycloak';
 import { extractToken } from '../../middleware/ExtractToken';
 import checkRoles from '../../middleware/CheckRoles';
+
 const router: Router = express.Router();
 
 router.get('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.getAllCategory);
@@ -13,4 +14,5 @@ router.delete('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])],
 
 router.get('/:id/use', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.showUseCategory);
 router.post('/merge', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.mergeCategory);
+
 export default router;

src/routes/admin/CityRoute.ts

@@ -4,12 +4,6 @@ import keycloak from '../../middleware/Keycloak';
 import { extractToken } from '../../middleware/ExtractToken';
 import checkRoles from '../../middleware/CheckRoles';
 
-// router.get('/', verifyJWT, checkRole(['admin', 'sales']), cityController.getAllCity);
-// router.post('/', verifyJWT, checkRole(['admin']), cityController.storeCity);
-// router.get('/:id', verifyJWT, checkRole(['admin', 'sales']), cityController.showCity);
-// router.patch('/:id', verifyJWT, checkRole(['admin']), cityController.updateCity);
-// router.delete('/:id', verifyJWT, checkRole(['admin']), cityController.deleteCity);
-
 const router: Router = express.Router();
 
 router.get('/', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], CityController.getAllCity);

src/routes/admin/HospitalRoute.ts

@@ -1,4 +1,4 @@
-import { Router } from 'express';
+import express, { Router } from 'express';
 import * as HospitalController from '../../controllers/admin/HospitalController';
 import * as VendorExperienceController from '../../controllers/admin/VendorExperienceController';
 import * as ExecutivesHistoryController from '../../controllers/admin/ExecutivesHistoryController';
@@ -9,7 +9,7 @@ import keycloak from '../../middleware/Keycloak';
 import { extractToken } from '../../middleware/ExtractToken';
 import checkRoles from '../../middleware/CheckRoles';
 
-const router = Router();
+const router: Router = express.Router();
 
 router.get('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], HospitalController.getAllHospital);
 router.post('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], upload.single('image'), HospitalController.storeHospital);

src/routes/admin/ProvinceRoute.ts

@@ -1,27 +1,10 @@
-import express from 'express';
+import express, { Router } from 'express';
 import * as ProvinceController from '../../controllers/admin/ProvinceController';
 import keycloak from '../../middleware/Keycloak';
 import { extractToken } from '../../middleware/ExtractToken';
 import checkRoles from '../../middleware/CheckRoles';
 
-const router = express.Router();
-
-// import express from 'express';
-// const router = express.Router();
-// const provinceController = require('../../controllers/admin/ProvinceController.js')
-// // const verifyJWT = require('../../middleware/VerifyJWT.js');
-// // const checkRole = require('../../middleware/CheckRole.js');
-
-// const keycloak = require('../../middleware/Keycloak.js');
-// const extractToken = require('../../middleware/ExtractToken.js');
-// const checkRoles = require('../../middleware/CheckRoles.js');
-
-// router.get('/', verifyJWT, checkRole(['admin', 'sales']), provinceController.getAllProvince);
-// router.get('/', verifyJWT, checkRole(['admin']), provinceController.getAllProvince);
-// router.post('/', verifyJWT, checkRole(['admin']), provinceController.storeProvince);
-// router.get('/:id', verifyJWT, checkRole(['admin']), provinceController.showProvince);
-// router.patch('/:id', verifyJWT, checkRole(['admin']), provinceController.updateProvince);
-// router.delete('/:id', verifyJWT, checkRole(['admin']), provinceController.deleteProvince);
+const router: Router = express.Router();
 
 router.get('/', [keycloak.protect(), extractToken, checkRoles(['admin'])], ProvinceController.getAllProvince);
 router.post('/', [keycloak.protect(), extractToken, checkRoles(['admin'])], ProvinceController.storeProvince);

src/routes/admin/VendorRoute.ts

@@ -4,12 +4,6 @@ import keycloak from '../../middleware/Keycloak';
 import { extractToken } from '../../middleware/ExtractToken';
 import checkRoles from '../../middleware/CheckRoles';
 
-// router.get('/', verifyJWT, checkRole(['admin', 'sales']), vendorController.getAllVendor);
-// router.post('/', verifyJWT, checkRole(['admin', 'sales']), vendorController.storeVendor);
-// router.get('/:id', verifyJWT, checkRole(['admin', 'sales']), vendorController.showVendor);
-// router.patch('/:id', verifyJWT, checkRole(['admin', 'sales']), vendorController.updateVendor);
-// router.delete('/:id', verifyJWT, checkRole(['admin']), vendorController.deleteVendor);
-
 const router: Router = express.Router();
 
 router.get('/', [keycloak.protect(), extractToken, checkRoles(['admin', 'sales'])], VendorController.getAllVendor);

src/routes/sales/AreaRoute.ts

@@ -6,23 +6,6 @@ import checkRoles from '../../middleware/CheckRoles';
 
 const router: Router = express.Router();
 
-// router.get('/', verifyJWT, checkRole(['sales']), areaController.getAllAreaByUser);
-
 router.get('/', [keycloak.protect(), extractToken, checkRoles(['sales'])], areaController.getAllAreaByUser);
 
-export default router;
-
-
-// const express = require('express')
-// const router = express.Router()
-// const areaController = require('../../controllers/sales/AreaController.js')
-
-// const keycloak = require('../../middleware/Keycloak.js');
-// const extractToken = require('../../middleware/ExtractToken.js');
-// const checkRoles = require('../../middleware/CheckRoles.js');
-
-// // router.get('/', verifyJWT, checkRole(['sales']), areaController.getAllAreaByUser);
-
-// router.get('/', [keycloak.protect(), extractToken, checkRoles(['sales'])], areaController.getAllAreaByUser);
-
-// module.exports = router;
+export default router;

src/routes/sales/HospitalRoute.ts

@@ -1,4 +1,4 @@
-import { Router } from 'express';
+import express, { Router } from 'express';
 import * as HospitalController from '../../controllers/sales/HospitalController';
 import * as VendorExperienceController from '../../controllers/sales/VendorExperienceController';
 import * as ExecutivesHistoryController from '../../controllers/sales/ExecutivesHistoryController';
@@ -9,7 +9,7 @@ import keycloak from '../../middleware/Keycloak';
 import { extractToken } from '../../middleware/ExtractToken';
 import checkRoles from '../../middleware/CheckRoles';
 
-const router = Router();
+const router: Router = express.Router();
 
 router.get('/', [keycloak.protect(), extractToken, checkRoles(['sales'])], HospitalController.getAllHospitalByArea);
 router.post('/', [keycloak.protect(), extractToken, checkRoles(['sales'])], upload.single('image'), HospitalController.storeHospital);