commit

controller/auth.controller.js

@@ -36,6 +36,23 @@ exports.login = handleError(async (req, res) => {
     user_id: user.id,
   })
   if (!cekUser) {
+    let role = user.peran[0].peran
+    if (process.env.ENV === 'production') {
+      role = {
+        id:
+          role.id === 2024
+            ? 2020
+            : role.id === 2025
+            ? 2021
+            : role.id === 2026
+            ? 2022
+            : role.id === 2027
+            ? 2023
+            : role.id,
+        nama: role.nama,
+        menu: role.menu,
+      }
+    }
     cekUser = await userModel.create({
       user_id: user.id,
       nama: user.nama,
@@ -43,7 +60,7 @@ exports.login = handleError(async (req, res) => {
       email: user.username,
       no_hp: user.no_hp,
       alamat: user.alamat,
-      role: user.peran[0].peran,
+      role,
       isPublic: false,
       isPrivate: false,
     })

controller/graph.controller.js

@@ -199,6 +199,7 @@ exports.laporan = handleError(async (req, res) => {
     data.list_jadwal = await dataLaporanAggregate(
       user,
       {
+        aktif: true,
         ...date,
         jadwal: {
           $ne: null,
@@ -253,11 +254,6 @@ exports.excel = handleError(async (req, res) => {
       ]
       w['pt.pembina.id'] = user.lembaga.id
       break
-    default:
-      return response.error(res, {
-        message: 'Forbidden',
-        code: 403,
-      })
   }
 
   const { tahun } = req.query
@@ -293,8 +289,8 @@ exports.excel = handleError(async (req, res) => {
         (value.role_data == 'dikti' && user.role.id === 2020) ||
         (value.role_asal === 'lldikti' && value.role_data === 'lldikti') ||
         (value.role_data == 'lldikti' && user.role.id === 2021)
-        ? `Ditindaklanjuti ${value.role_data === 'dikti' ? 'DIKTI' : 'LLDIKTI'}`
-        : `Delegasi Ke ${value.role_data === 'dikti' ? 'DIKTI' : 'LLDIKTI'}`,
+      ? `Ditindaklanjuti ${value.role_data === 'dikti' ? 'DIKTI' : 'LLDIKTI'}`
+      : `Delegasi Ke ${value.role_data === 'dikti' ? 'DIKTI' : 'LLDIKTI'}`,
   }))
 
   const dataLaporan = laporan.map((value) => ({

routes/v1/graph.routes.js

@@ -3,7 +3,7 @@ const graph = require('../../controller/graph.controller')
 const auth = require('../../middleware/verifyToken')
 const roleId = require('../../middleware/role')
 
-router.get('/', auth, roleId([2020, 2021]), graph.laporan)
-router.get('/:token/:nama_file', auth, roleId([2020, 2021]), graph.excel)
+router.get('/', auth, roleId([2020, 2021, 2023]), graph.laporan)
+router.get('/:token/:nama_file', auth, roleId([2020, 2021, 2023]), graph.excel)
 
 module.exports = router

routes/v1/index.js

@@ -9,7 +9,7 @@ router.get('/', (req, res) => {
   })
 })
 
-router.use('/laporan', auth, roleId([2020, 2021]), require('./laporan'))
+router.use('/laporan', auth, roleId([2020, 2021, 2023]), require('./laporan'))
 router.use('/sanksi', auth, require('./sanksi'))
 router.use('/public', require('./public.routes'))
 router.use('/auth', require('./auth.routes'))
@@ -17,7 +17,7 @@ router.use('/user', auth, require('./user.routes'))
 router.use('/pemantauan', auth, require('./pemantauan.routes'))
 router.use('/pt', auth, require('./pt.routes'))
 router.use('/pelanggaran', auth, require('./pelanggaran.routes'))
-router.use('/lembaga', auth, roleId(2020), require('./lembaga.routes'))
+router.use('/lembaga', auth, roleId([2020, 2023]), require('./lembaga.routes'))
 router.use('/graph', require('./graph.routes'))
 
 module.exports = router

routes/v1/pelanggaran.routes.js

@@ -2,6 +2,6 @@ const router = require('express').Router()
 const pelanggaran = require('../../controller/pelanggaran.controller')
 const roleId = require('../../middleware/role')
 
-router.get('/', roleId([2020, 2021]), pelanggaran.getAll)
+router.get('/', roleId([2020, 2021, 2023]), pelanggaran.getAll)
 
 module.exports = router

routes/v1/pemantauan.routes.js

@@ -3,6 +3,6 @@ const pemantauan = require('../../controller/pemantauan.controller')
 const roleId = require('../../middleware/role')
 
 router.get('/pt', roleId(2022), pemantauan.getPT)
-router.get('/:laporan_id', roleId([2020, 2021]), pemantauan.get)
+router.get('/:laporan_id', roleId([2020, 2021, 2023]), pemantauan.get)
 
 module.exports = router

routes/v1/pt.routes.js

@@ -2,7 +2,7 @@ const router = require('express').Router()
 const pt = require('../../controller/pt.controller')
 const roleId = require('../../middleware/role')
 
-router.get('/', roleId([2020, 2021, 2022]), pt.getAll)
-router.get('/:id', roleId([2020, 2021]), pt.getOne)
+router.get('/', roleId([2020, 2021, 2022, 2023]), pt.getAll)
+router.get('/:id', roleId([2020, 2021, 2023]), pt.getOne)
 
 module.exports = router

routes/v1/public.routes.js

@@ -7,15 +7,10 @@ const pemantauan = require('../../controller/pemantauan.controller')
 const handleDokumen = require('../../utils/handleDokumen')
 const auth = require('../../middleware/verifyTokenPublic')
 
-// router.post('/user/add', handleDokumen.array('dokumen'), user.addUserPublic)
 router.get('/pt', pt.public)
 router.get('/pelanggaran', pelanggaran.public)
 router.get('/pemantauan', pemantauan.public)
-// router.post(
-//   '/laporan/create',
-//   handleDokumen.fields([{ name: 'dokumen' }, { name: 'foto', maxCount: 1 }]),
-//   laporan.public
-// )
+
 router.post(
   '/laporan/create',
   auth,

routes/v1/sanksi/banding.routes.js

@@ -12,7 +12,7 @@ router.post(
 
 router.post(
   '/jawaban/create/:sanksi_id',
-  roleId([2020, 2021]),
+  roleId([2020, 2021, 2023]),
   handleDokumen.array('dokumen'),
   banding.createJawaban
 )

routes/v1/sanksi/cabutSanksi.routes.js

@@ -12,7 +12,7 @@ router.post(
 
 router.post(
   '/jawaban/create/:sanksi_id',
-  roleId([2020, 2021]),
+  roleId([2020, 2021, 2023]),
   handleDokumen.array('dokumen'),
   cabutSanksi.createJawaban
 )

routes/v1/sanksi/index.js

@@ -9,8 +9,8 @@ router.post(
   handleDokumen.array('dokumen'),
   sanksi.create
 )
-router.get('/', roleId([2020, 2021, 2022]), sanksi.getAll)
-router.get('/:sanksi_id', roleId([2020, 2021, 2022]), sanksi.getOne)
+router.get('/', roleId([2020, 2021, 2022, 2023]), sanksi.getAll)
+router.get('/:sanksi_id', roleId([2020, 2021, 2022, 2023]), sanksi.getOne)
 
 router.use('/keberatan', require('./keberatan.routes'))
 router.use('/banding', require('./banding.routes'))

routes/v1/sanksi/keberatan.routes.js

@@ -12,7 +12,7 @@ router.post(
 
 router.post(
   '/jawaban/create/:sanksi_id',
-  roleId([2020, 2021]),
+  roleId([2020, 2021, 2023]),
   handleDokumen.array('dokumen'),
   keberatan.createJawaban
 )

routes/v1/user.routes.js

@@ -2,7 +2,6 @@ const router = require('express').Router()
 const user = require('../../controller/user.controller')
 const handleDokumen = require('../../utils/handleDokumen')
 
-// router.post('/add', handleDokumen.single('dokumen'), laporan.create)
 router.get('/', user.get)
 
 module.exports = router

utils/axios.js

@@ -2,9 +2,11 @@ const axios = require('axios')
 const https = require('https')
 
 exports.get = async (url) => {
+  let token = process.env.TOKEN_DEVELOPMENT
+  if (process.env.ENV == 'production') token = process.env.TOKEN_PRODUCTION
   const response = await axios.get(url, {
     headers: {
-      Authorization: `Bearer ${process.env.TOKEN}`,
+      Authorization: `Bearer ${token}`,
       Accept: 'application/json',
     },
     httpsAgent: new https.Agent({
@@ -15,9 +17,11 @@ exports.get = async (url) => {
 }
 
 exports.post = async (url, data, config) => {
+  let token = process.env.TOKEN_DEVELOPMENT
+  if (process.env.ENV == 'production') token = process.env.TOKEN_PRODUCTION
   const response = await axios.post(url, data, {
     headers: {
-      Authorization: `Bearer ${process.env.TOKEN}`,
+      Authorization: `Bearer ${token}`,
       Accept: 'application/json',
       ...config,
     },