refact: Change company credentials for authentication

sinfo · Feb 16, 2024 · a825877 · a825877
1 parent b5554cd
commit a825877
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/helpers/joi.js b/helpers/joi.js
@@ -200,6 +200,7 @@ let credentials = Joi.object().keys({
   companyName: Joi.string(),
   edition: Joi.string().required(),
   iat: Joi.number(),
+  iss: Joi.string(),
   participationDays: Joi.number().required(),
   activities: Joi.array().items(Joi.string())
 })

diff --git a/helpers/pre.js b/helpers/pre.js
@@ -37,7 +37,7 @@ module.exports.duration = {
     const beginDate = new Date(edition.begin).getTime()
     const endDate = new Date(edition.end).getTime()
 
-    return new Date(endDate - beginDate).getUTCDate()
+    return new Date(endDate - beginDate).getUTCDate() - 1
   },
   assign: 'duration'
 }

diff --git a/routes/company.js b/routes/company.js
@@ -15,7 +15,7 @@ module.exports = [
       description: 'Check token validation',
       handler: async (request, h) => {
         try {
-          const credentials = request.auth.credentials
+          const credentials = request.auth.credentials.credentials
 
           const link = await request.server.methods.link.find({
             companyId: credentials.company,
@@ -74,7 +74,7 @@ module.exports = [
 
           let confirmedReservation = await request.server.methods.reservation.getConfirmedReservations(edition)
           let pendingReservation = await request.server.methods.reservation.getPendingReservations(edition)
-          return venue.getStandsAvailability(confirmedReservation, pendingReservation, duration)
+          return venue.getStandsAvailability(confirmedReservation, pendingReservation, duration)  
         } catch (err) {
           logger.error({ info: request.info, error: err })
           return Boom.boomify(err)
@@ -103,7 +103,7 @@ module.exports = [
         ]
       ],
       handler: async (request, h) => {
-        const companyId = request.auth.credentials.company
+        const companyId = request.auth.credentials.credentials.company
         const edition = request.pre.edition
 
         let step
@@ -155,7 +155,7 @@ module.exports = [
         ]
       ],
       handler: async (request, h) => {
-        const companyId = request.auth.credentials.company
+        const companyId = request.auth.credentials.credentials.company
         const edition = request.pre.edition
         const info = request.payload.info
         const titles = request.payload.titles
@@ -219,7 +219,7 @@ module.exports = [
         ]
       ],
       handler: async (request, h) => {
-        let companyId = request.auth.credentials.company
+        let companyId = request.auth.credentials.credentials.company
         let stands = request.payload.stands
         let edition = request.pre.edition
         let link = request.pre.link
@@ -290,6 +290,8 @@ module.exports = [
 
           request.server.methods.mailgun.sendNewReservation(receivers, reservation, link, venue)
 
+          logger.info(reservation)
+
           return reservation.toJSON()
         } catch (err) {
           logger.error({ info: request.info, error: err })
@@ -321,7 +323,7 @@ module.exports = [
         ]
       ],
       handler: async (request, h) => {
-        const companyId = request.auth.credentials.company
+        const companyId = request.auth.credentials.credentials.company
         const edition = request.pre.edition
         const file = request.pre.file
 
@@ -372,7 +374,7 @@ module.exports = [
         ]
       ],
       handler: async (request, h) => {
-        let companyId = request.auth.credentials.company
+        let companyId = request.auth.credentials.credentials.company
         let edition = request.pre.edition
         let venue = request.pre.venue
 
@@ -410,7 +412,7 @@ module.exports = [
       ],
       handler: async (request, h) => {
         try {
-          const companyId = request.auth.credentials.company
+          const companyId = request.auth.credentials.credentials.company
           const edition = request.pre.edition
           const latest = request.query.latest
 

diff --git a/routes/link.js b/routes/link.js
@@ -127,14 +127,14 @@ module.exports = [
 
           const token = await request.server.methods.jwt.verify(link[0].token)
 
-          if (token && token.exp * 1000 - new Date().getTime() <= 0) {
+          if (token && token.credentials.exp * 1000 - new Date().getTime() <= 0) {
             await request.server.methods.link.revoke(companyId, edition)
             return Boom.resourceGone('Token expired')
           }
 
           return token === null
             ? Boom.resourceGone('Token expired')
-            : { expirationDate: new Date(token.exp * 1000).toJSON() }
+            : { expirationDate: new Date(token.credentials.exp * 1000).toJSON() }
         } catch (err) {
           logger.error({ info: request.info, error: err })
           return Boom.boomify(err)
@@ -309,7 +309,7 @@ module.exports = [
 
           let link = await request.server.methods.link.create(
             companyId, company.name, edition,
-            member.mails.main, token, participationDays,
+            request.auth.credentials.user, token, participationDays,
             activities, advertisementKind, companyEmail, workshop, presentation, lunchTalk
           )
 
@@ -391,7 +391,11 @@ module.exports = [
         const { expirationDate } = request.payload
 
         try {
-          const token = await request.server.methods.jwt.generate(edition, companyId, expirationDate)
+          const token = await request.server.methods.jwt.generate({ 
+            edition: edition, 
+            company: companyId,
+            exp: Math.floor(expirationDate / 1000) 
+          })
           const link = await request.server.methods.link.setToken(request.params, token)
           return (link) ? link.toJSON() : Boom.badData('No link associated')
         } catch (err) {