fix: remove basic auth

Author: 0xi4o

packages/server/package.json

@@ -101,7 +101,6 @@
         "csv-parser": "^3.0.0",
         "dotenv": "^16.0.0",
         "express": "^4.17.3",
-        "express-basic-auth": "^1.2.1",
         "express-mysql-session": "^3.0.3",
         "express-rate-limit": "^6.9.0",
         "express-session": "^1.18.1",

packages/server/src/enterprise/controllers/account.controller.ts

@@ -112,25 +112,4 @@ export class AccountController {
             next(error)
         }
     }
-
-    public async getBasicAuth(req: Request, res: Response) {
-        if (process.env.FLOWISE_USERNAME && process.env.FLOWISE_PASSWORD) {
-            return res.status(StatusCodes.OK).json({
-                isUsernamePasswordSet: true
-            })
-        } else {
-            return res.status(StatusCodes.OK).json({
-                isUsernamePasswordSet: false
-            })
-        }
-    }
-
-    public async checkBasicAuth(req: Request, res: Response) {
-        const { username, password } = req.body
-        if (username === process.env.FLOWISE_USERNAME && password === process.env.FLOWISE_PASSWORD) {
-            return res.json({ message: 'Authentication successful' })
-        } else {
-            return res.json({ message: 'Authentication failed' })
-        }
-    }
 }

packages/server/src/enterprise/routes/account.route.ts

@@ -30,8 +30,4 @@ router.post('/reset-password', accountController.resetPassword)
 
 router.post('/billing', accountController.createStripeCustomerPortalSession)
 
-router.get('/basic-auth', accountController.getBasicAuth)
-
-router.post('/basic-auth', accountController.checkBasicAuth)
-
 export default router

packages/server/src/utils/constants.ts

@@ -32,7 +32,6 @@ export const WHITELIST_URLS = [
     '/api/v1/account/resend-verification',
     '/api/v1/account/forgot-password',
     '/api/v1/account/reset-password',
-    '/api/v1/account/basic-auth',
     '/api/v1/loginmethod',
     '/api/v1/pricing',
     '/api/v1/user/test',

packages/ui/src/api/account.api.js

@@ -8,8 +8,6 @@ const forgotPassword = (body) => client.post('/account/forgot-password', body)
 const resetPassword = (body) => client.post('/account/reset-password', body)
 const getBillingData = () => client.post('/account/billing')
 const logout = () => client.post('/account/logout')
-const getBasicAuth = () => client.get('/account/basic-auth')
-const checkBasicAuth = (body) => client.post('/account/basic-auth', body)
 
 export default {
     getBillingData,
@@ -19,7 +17,5 @@ export default {
     resendVerificationEmail,
     forgotPassword,
     resetPassword,
-    logout,
-    getBasicAuth,
-    checkBasicAuth
+    logout
 }

packages/ui/src/views/organization/index.jsx

@@ -91,17 +91,13 @@ const OrganizationSetupPage = () => {
     const [confirmPassword, setConfirmPassword] = useState('')
     const [username, setUsername] = useState('')
     const [orgName, setOrgName] = useState('')
-    const [existingUsername, setExistingUsername] = useState('')
-    const [existingPassword, setExistingPassword] = useState('')
 
     const [loading, setLoading] = useState(false)
     const [authError, setAuthError] = useState('')
     const [successMsg, setSuccessMsg] = useState(undefined)
-    const [requiresAuthentication, setRequiresAuthentication] = useState(false)
 
     const loginApi = useApi(authApi.login)
     const registerAccountApi = useApi(accountApi.registerAccount)
-    const getBasicAuthApi = useApi(accountApi.getBasicAuth)
     const navigate = useNavigate()
 
     const getDefaultProvidersApi = useApi(loginMethodApi.getLoginMethods)
@@ -120,26 +116,6 @@ const OrganizationSetupPage = () => {
             setLoading(true)
             setAuthError('')
 
-            // Check authentication first if required
-            if (requiresAuthentication) {
-                try {
-                    const authResult = await accountApi.checkBasicAuth({
-                        username: existingUsername,
-                        password: existingPassword
-                    })
-
-                    if (!authResult || !authResult.data || authResult.data.message !== 'Authentication successful') {
-                        setAuthError('Authentication failed. Please check your existing credentials.')
-                        setLoading(false)
-                        return
-                    }
-                } catch (error) {
-                    setAuthError('Authentication failed. Please check your existing credentials.')
-                    setLoading(false)
-                    return
-                }
-            }
-
             // Proceed with registration after successful authentication
             const body = {
                 user: {
@@ -180,17 +156,9 @@ const OrganizationSetupPage = () => {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [registerAccountApi.error])
 
-    useEffect(() => {
-        if (getBasicAuthApi.data && getBasicAuthApi.data.isUsernamePasswordSet === true) {
-            setRequiresAuthentication(true)
-        }
-    }, [getBasicAuthApi.data])
-
     useEffect(() => {
         if (!isOpenSource) {
             getDefaultProvidersApi.request()
-        } else {
-            getBasicAuthApi.request()
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [])
@@ -271,60 +239,13 @@ const OrganizationSetupPage = () => {
                     <Stack sx={{ gap: 1 }}>
                         <Typography variant='h1'>Setup Account</Typography>
                     </Stack>
-                    {requiresAuthentication && (
-                        <Alert severity='info'>
-                            Application authentication now requires email and password. Contact administrator to setup an account.
-                        </Alert>
-                    )}
                     {(isOpenSource || isEnterpriseLicensed) && (
                         <Typography variant='caption'>
                             Account setup does not make any external connections, your data stays securely on your locally hosted server.
                         </Typography>
                     )}
                     <form onSubmit={register}>
                         <Stack sx={{ width: '100%', flexDirection: 'column', alignItems: 'left', justifyContent: 'center', gap: 2 }}>
-                            {requiresAuthentication && (
-                                <>
-                                    <Box>
-                                        <div style={{ display: 'flex', flexDirection: 'row' }}>
-                                            <Typography sx={{ mb: 1 }}>
-                                                Existing Username<span style={{ color: 'red' }}>&nbsp;*</span>
-                                            </Typography>
-                                            <div style={{ flexGrow: 1 }}></div>
-                                        </div>
-                                        <TextField
-                                            fullWidth
-                                            placeholder='Existing Username'
-                                            value={existingUsername}
-                                            onChange={(e) => setExistingUsername(e.target.value)}
-                                        />
-                                        <Typography variant='caption'>
-                                            <i>Existing username that was set as FLOWISE_USERNAME environment variable</i>
-                                        </Typography>
-                                    </Box>
-                                    <Box>
-                                        <div style={{ display: 'flex', flexDirection: 'row' }}>
-                                            <Typography sx={{ mb: 1 }}>
-                                                Existing Password<span style={{ color: 'red' }}>&nbsp;*</span>
-                                            </Typography>
-                                            <div style={{ flexGrow: 1 }}></div>
-                                        </div>
-                                        <TextField
-                                            fullWidth
-                                            type='password'
-                                            placeholder='Existing Password'
-                                            value={existingPassword}
-                                            onChange={(e) => setExistingPassword(e.target.value)}
-                                        />
-                                        <Typography variant='caption'>
-                                            <i>Existing password that was set as FLOWISE_PASSWORD environment variable</i>
-                                        </Typography>
-                                    </Box>
-                                    <Divider>
-                                        <Chip label='New Account Details' size='small' />
-                                    </Divider>
-                                </>
-                            )}
                             {isEnterpriseLicensed && (
                                 <>
                                     <Box>
@@ -416,12 +337,7 @@ const OrganizationSetupPage = () => {
                                     <i>Reconfirm your password. Must match the password typed above.</i>
                                 </Typography>
                             </Box>
-                            <StyledButton
-                                variant='contained'
-                                style={{ borderRadius: 12, height: 40, marginRight: 5 }}
-                                type='submit'
-                                disabled={requiresAuthentication && (!existingUsername || !existingPassword)}
-                            >
+                            <StyledButton variant='contained' style={{ borderRadius: 12, height: 40, marginRight: 5 }} type='submit'>
                                 Sign Up
                             </StyledButton>
                             {configuredSsoProviders && configuredSsoProviders.length > 0 && <Divider sx={{ width: '100%' }}>OR</Divider>}