Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions packages/server/src/CachePool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export class CachePool {
activeLLMCache: IActiveCache = {}
activeEmbeddingCache: IActiveCache = {}
activeMCPCache: { [key: string]: any } = {}
ssoTokenCache: { [key: string]: any } = {}

constructor() {
if (process.env.MODE === MODE.QUEUE) {
Expand Down Expand Up @@ -42,6 +43,46 @@ export class CachePool {
}
}

/**
* Add to the sso token cache pool
* @param {string} ssoToken
* @param {any} value
*/
async addSSOTokenCache(ssoToken: string, value: any) {
if (process.env.MODE === MODE.QUEUE) {
if (this.redisClient) {
const serializedValue = JSON.stringify(value)
await this.redisClient.set(`ssoTokenCache:${ssoToken}`, serializedValue, 'EX', 120)
}
} else {
this.ssoTokenCache[ssoToken] = value
}
}

async getSSOTokenCache(ssoToken: string): Promise<any | undefined> {
if (process.env.MODE === MODE.QUEUE) {
if (this.redisClient) {
const serializedValue = await this.redisClient.get(`ssoTokenCache:${ssoToken}`)
if (serializedValue) {
return JSON.parse(serializedValue)
}
}
} else {
return this.ssoTokenCache[ssoToken]
}
return undefined
}

async deleteSSOTokenCache(ssoToken: string) {
if (process.env.MODE === MODE.QUEUE) {
if (this.redisClient) {
await this.redisClient.del(`ssoTokenCache:${ssoToken}`)
}
} else {
delete this.ssoTokenCache[ssoToken]
}
}

/**
* Add to the llm cache pool
* @param {string} chatflowid
Expand Down
15 changes: 14 additions & 1 deletion packages/server/src/enterprise/controllers/auth/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@ const getAllPermissions = async (req: Request, res: Response, next: NextFunction
}
}

const ssoSuccess = async (req: Request, res: Response, next: NextFunction) => {
try {
const appServer = getRunningExpressApp()
const ssoToken = req.query.token as string
const user = await appServer.cachePool.getSSOTokenCache(ssoToken)
if (!user) return res.status(401).json({ message: 'Invalid or expired SSO token' })
await appServer.cachePool.deleteSSOTokenCache(ssoToken)
return res.json(user)
} catch (error) {
next(error)
}
}
export default {
getAllPermissions
getAllPermissions,
ssoSuccess
}
16 changes: 14 additions & 2 deletions packages/server/src/enterprise/middleware/passport/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { WorkspaceUserService } from '../../services/workspace-user.service'
import { decryptToken, encryptToken, generateSafeCopy } from '../../utils/tempTokenUtils'
import { getAuthStrategy } from './AuthStrategy'
import { initializeDBClientAndStore, initializeRedisClientAndStore } from './SessionPersistance'
import { v4 as uuidv4 } from 'uuid'

const localStrategy = require('passport-local').Strategy

Expand Down Expand Up @@ -298,8 +299,14 @@ export const setTokenOrCookies = (
returnUser.isSSO = !isSSO ? false : isSSO

if (redirect) {
// Send user data as part of the redirect URL (using query parameters)
const dashboardUrl = `/sso-success?user=${encodeURIComponent(JSON.stringify(returnUser))}`
// 1. Generate a random token
const ssoToken = uuidv4()

// 2. Store returnUser in your session store, keyed by ssoToken, with a short expiry
storeSSOUserPayload(ssoToken, returnUser)
// 3. Redirect with token only
const dashboardUrl = `/sso-success?token=${ssoToken}`

// Return the token as a cookie in our response.
let resWithCookies = res
.cookie('token', token, {
Expand Down Expand Up @@ -408,3 +415,8 @@ export const verifyToken = (req: Request, res: Response, next: NextFunction) =>
next()
})(req, res, next)
}

const storeSSOUserPayload = (ssoToken: string, returnUser: any) => {
const app = getRunningExpressApp()
app.cachePool.addSSOTokenCache(ssoToken, returnUser)
}
2 changes: 2 additions & 0 deletions packages/server/src/enterprise/routes/auth/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ const router = express.Router()
// RBAC
router.get(['/', '/permissions'], authController.getAllPermissions)

router.get(['/sso-success'], authController.ssoSuccess)

export default router
4 changes: 3 additions & 1 deletion packages/ui/src/api/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ const login = (body) => client.post(`/auth/login`, body)

// permissions
const getAllPermissions = () => client.get(`/auth/permissions`)
const ssoSuccess = (token) => client.get(`/auth/sso-success?token=${token}`)

export default {
resolveLogin,
login,
getAllPermissions
getAllPermissions,
ssoSuccess
}
32 changes: 21 additions & 11 deletions packages/ui/src/views/auth/ssoSuccess.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,36 @@ import { useEffect } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
import { store } from '@/store'
import { loginSuccess } from '@/store/reducers/authSlice'
import authApi from '@/api/auth'

const SSOSuccess = () => {
const location = useLocation()
const navigate = useNavigate()

useEffect(() => {
// Parse the "user" query parameter from the URL
const queryParams = new URLSearchParams(location.search)
const userData = queryParams.get('user')
const run = async () => {
const queryParams = new URLSearchParams(location.search)
const token = queryParams.get('token')

if (userData) {
// Decode the user data and save it to the state
try {
const parsedUser = JSON.parse(decodeURIComponent(userData))
store.dispatch(loginSuccess(parsedUser))
navigate('/chatflows')
} catch (error) {
console.error('Failed to parse user data:', error)
if (token) {
try {
const user = await authApi.ssoSuccess(token)
if (user) {
if (user.status === 200) {
store.dispatch(loginSuccess(user.data))
navigate('/chatflows')
} else {
navigate('/login')
}
} else {
navigate('/login')
}
} catch (error) {
navigate('/login')
}
}
}
run()
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [location.search])

Expand Down