Browse Source

Linting.

pull/1950/head
mike12345567 5 years ago
parent
commit
2fc606f5b5
  1. 11
      packages/auth/src/middleware/passport/google.js
  2. 11
      packages/auth/src/middleware/passport/local.js
  3. 6
      packages/auth/src/security/sessions.js
  4. 10
      packages/worker/src/api/controllers/admin/sessions.js
  5. 2
      packages/worker/src/api/routes/admin/sessions.js

11
packages/auth/src/middleware/passport/google.js

@ -64,10 +64,13 @@ async function authenticate(token, tokenSecret, profile, done) {
const sessionId = newid()
await createASession(dbUser._id, sessionId)
dbUser.token = jwt.sign({
userId: dbUser._id,
sessionId,
}, env.JWT_SECRET)
dbUser.token = jwt.sign(
{
userId: dbUser._id,
sessionId,
},
env.JWT_SECRET
)
return done(null, dbUser)
}

11
packages/auth/src/middleware/passport/local.js

@ -36,10 +36,13 @@ exports.authenticate = async function (email, password, done) {
const sessionId = newid()
await createASession(dbUser._id, sessionId)
dbUser.token = jwt.sign({
userId: dbUser._id,
sessionId,
}, env.JWT_SECRET)
dbUser.token = jwt.sign(
{
userId: dbUser._id,
sessionId,
},
env.JWT_SECRET
)
// Remove users password in payload
delete dbUser.password

6
packages/auth/src/security/sessions.js

@ -15,8 +15,8 @@ function makeSessionID(userId, sessionId) {
exports.createASession = async (userId, sessionId) => {
const client = await redis.getSessionClient()
const session = {
createdAt: (new Date()).toISOString(),
lastAccessedAt: (new Date()).toISOString(),
createdAt: new Date().toISOString(),
lastAccessedAt: new Date().toISOString(),
sessionId,
userId,
}
@ -41,7 +41,7 @@ exports.invalidateSessions = async (userId, sessionId = null) => {
exports.updateSessionTTL = async session => {
const client = await redis.getSessionClient()
const key = makeSessionID(session.userId, session.sessionId)
session.lastAccessedAt = (new Date()).toISOString()
session.lastAccessedAt = new Date().toISOString()
await client.store(key, session, EXPIRY_SECONDS)
}

10
packages/worker/src/api/controllers/admin/sessions.js

@ -1,4 +1,8 @@
const { getAllSessions, getUserSessions, invalidateSessions } = require("@budibase/auth/sessions")
const {
getAllSessions,
getUserSessions,
invalidateSessions,
} = require("@budibase/auth/sessions")
exports.fetch = async ctx => {
ctx.body = await getAllSessions()
@ -14,7 +18,7 @@ exports.invalidateUser = async ctx => {
const { userId } = ctx.params
await invalidateSessions(userId)
ctx.body = {
message: "User sessions invalidated"
message: "User sessions invalidated",
}
}
@ -28,6 +32,6 @@ exports.invalidateSession = async ctx => {
const { sessionId } = ctx.params
await invalidateSessions(userId, sessionId)
ctx.body = {
message: "Session invalidated successfully."
message: "Session invalidated successfully.",
}
}

2
packages/worker/src/api/routes/admin/sessions.js

@ -11,4 +11,4 @@ router
.delete("/api/admin/sessions/:userId", adminOnly, controller.invalidateUser)
.delete("/api/admin/sessions/self/:sessionId", controller.invalidateSession)
module.exports = router
module.exports = router

Loading…
Cancel
Save