CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-03 05:20:32 +12:00
Code Issues Projects Releases Wiki Activity

Fixing session issues after testing a bit.

Browse source
This commit is contained in:
mike12345567 2021-07-07 17:15:53 +01:00
parent 4acd094c74
commit 7f0fc5f899
6 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/auth/sessions.js
View file

@ -1 +1 @@
module.exports = require("./src/security/sessions") module.exports = require("./src/security/sessions")

1
packages/auth/src/cache/user.js vendored
View file

@ -4,7 +4,6 @@ const redis = require("../redis/authRedis")
const EXPIRY_SECONDS = 3600 const EXPIRY_SECONDS = 3600
exports.getUser = async userId => { exports.getUser = async userId => {
const client = await redis.getUserClient() const client = await redis.getUserClient()
// try cache // try cache

5
packages/auth/src/middleware/authenticated.js
View file

@ -49,13 +49,14 @@ module.exports = (noAuthPatterns = [], opts) => {
internal = false internal = false
if (authCookie) { if (authCookie) {
let error = null let error = null
const sessionId = authCookie.sessionId, userId = authCookie.userId const sessionId = authCookie.sessionId,
userId = authCookie.userId
const session = await getSession(userId, sessionId) const session = await getSession(userId, sessionId)
if (!session) { if (!session) {
error = "No session found" error = "No session found"
} else { } else {
try { try {
const user = await getUser(userId) user = await getUser(userId)
delete user.password delete user.password
authenticated = true authenticated = true
} catch (err) { } catch (err) {

3
packages/auth/src/redis/authRedis.js
View file

@ -1,4 +1,5 @@
const { Client, utils } = require("./index") const Client = require("./index")
const utils = require("./utils")
let userClient, sessionClient let userClient, sessionClient

7
packages/auth/src/redis/index.js
View file

@ -1,7 +1,12 @@
const env = require("../environment") const env = require("../environment")
// ioredis mock is all in memory // ioredis mock is all in memory
const Redis = env.isTest() ? require("ioredis-mock") : require("ioredis") const Redis = env.isTest() ? require("ioredis-mock") : require("ioredis")
const { addDbPrefix, removeDbPrefix, getRedisOptions, SEPARATOR } = require("./utils") const {
addDbPrefix,
removeDbPrefix,
getRedisOptions,
SEPARATOR,
} = require("./utils")
const RETRY_PERIOD_MS = 2000 const RETRY_PERIOD_MS = 2000
const STARTUP_TIMEOUT_MS = 5000 const STARTUP_TIMEOUT_MS = 5000

4
packages/server/src/middleware/currentapp.js
View file

@ -2,7 +2,6 @@ const { getAppId, setCookie, getCookie, clearCookie } =
require("@budibase/auth").utils require("@budibase/auth").utils
const { Cookies } = require("@budibase/auth").constants const { Cookies } = require("@budibase/auth").constants
const { getRole } = require("@budibase/auth/roles") const { getRole } = require("@budibase/auth/roles")
const { getGlobalSelf } = require("../utilities/workerRequests")
const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles") const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles")
const { generateUserMetadataID } = require("../db/utils") const { generateUserMetadataID } = require("../db/utils")
const { dbExists } = require("@budibase/auth/db") const { dbExists } = require("@budibase/auth/db")
@ -27,7 +26,8 @@ module.exports = async (ctx, next) => {
} }
} }
let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC let appId,
roleId = BUILTIN_ROLE_IDS.PUBLIC
if (!ctx.user) { if (!ctx.user) {
// not logged in, try to set a cookie for public apps // not logged in, try to set a cookie for public apps
appId = requestAppId appId = requestAppId