Browse Source

Merge pull request #2906 from Budibase/fix/internal-login-honour-domain

Honour cookie domain when custom sso is enabled
gh-pages
Rory Powell 5 years ago
committed by GitHub
parent
commit
6a7fc4758a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      packages/worker/src/api/controllers/global/auth.js
  2. 1
      packages/worker/src/environment.js

12
packages/worker/src/api/controllers/global/auth.js

@ -41,13 +41,19 @@ async function authInternal(ctx, user, err = null, info = null) {
return ctx.throw(403, info ? info : "Unauthorized")
}
// just store the user ID
ctx.cookies.set(Cookies.Auth, user.token, {
const config = {
expires,
path: "/",
httpOnly: false,
overwrite: true,
})
}
if (env.COOKIE_DOMAIN) {
config.domain = env.COOKIE_DOMAIN
}
// just store the user ID
ctx.cookies.set(Cookies.Auth, user.token, config)
}
exports.authenticate = async (ctx, next) => {

1
packages/worker/src/environment.js

@ -41,6 +41,7 @@ module.exports = {
SMTP_PORT: process.env.SMTP_PORT,
SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
PLATFORM_URL: process.env.PLATFORM_URL,
COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
_set(key, value) {
process.env[key] = value
module.exports[key] = value

Loading…
Cancel
Save