Merge branch 'main' into feature/tts

docker/.env.example

@@ -99,6 +99,7 @@ JWT_TOKEN_EXPIRY_IN_MINUTES=360
 JWT_REFRESH_TOKEN_EXPIRY_IN_MINUTES=43200
 # EXPIRE_AUTH_TOKENS_ON_RESTART=true # (if you need to expire all tokens on app restart)
 # EXPRESS_SESSION_SECRET=flowise
+# SECURE_COOKIES=
 
 # INVITE_TOKEN_EXPIRY_IN_HOURS=24
 # PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS=15

docker/docker-compose-queue-prebuilt.yml

@@ -89,6 +89,7 @@ services:
             - PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS=${PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS}
             - PASSWORD_SALT_HASH_ROUNDS=${PASSWORD_SALT_HASH_ROUNDS}
             - TOKEN_HASH_SECRET=${TOKEN_HASH_SECRET}
+            - SECURE_COOKIES=${SECURE_COOKIES}
 
             # EMAIL
             - SMTP_HOST=${SMTP_HOST}
@@ -232,6 +233,7 @@ services:
             - PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS=${PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS}
             - PASSWORD_SALT_HASH_ROUNDS=${PASSWORD_SALT_HASH_ROUNDS}
             - TOKEN_HASH_SECRET=${TOKEN_HASH_SECRET}
+            - SECURE_COOKIES=${SECURE_COOKIES}
 
             # EMAIL
             - SMTP_HOST=${SMTP_HOST}

docker/docker-compose.yml

@@ -74,6 +74,7 @@ services:
             - PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS=${PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS}
             - PASSWORD_SALT_HASH_ROUNDS=${PASSWORD_SALT_HASH_ROUNDS}
             - TOKEN_HASH_SECRET=${TOKEN_HASH_SECRET}
+            - SECURE_COOKIES=${SECURE_COOKIES}
 
             # EMAIL
             - SMTP_HOST=${SMTP_HOST}

docker/worker/.env.example

@@ -99,6 +99,7 @@ JWT_TOKEN_EXPIRY_IN_MINUTES=360
 JWT_REFRESH_TOKEN_EXPIRY_IN_MINUTES=43200
 # EXPIRE_AUTH_TOKENS_ON_RESTART=true # (if you need to expire all tokens on app restart)
 # EXPRESS_SESSION_SECRET=flowise
+# SECURE_COOKIES=
 
 # INVITE_TOKEN_EXPIRY_IN_HOURS=24
 # PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS=15

docker/worker/docker-compose.yml

@@ -74,6 +74,7 @@ services:
             - PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS=${PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS}
             - PASSWORD_SALT_HASH_ROUNDS=${PASSWORD_SALT_HASH_ROUNDS}
             - TOKEN_HASH_SECRET=${TOKEN_HASH_SECRET}
+            - SECURE_COOKIES=${SECURE_COOKIES}
 
             # EMAIL
             - SMTP_HOST=${SMTP_HOST}

packages/components/nodes/tools/GoogleCalendar/GoogleCalendar.ts

@@ -272,6 +272,22 @@ class GoogleCalendar_Tools implements INode {
                 additionalParams: true,
                 optional: true
             },
+            {
+                label: 'Send Updates to',
+                name: 'sendUpdates',
+                type: 'options',
+                description: 'Send Updates to attendees',
+                options: [
+                    { label: 'All', name: 'all' },
+                    { label: 'External Only', name: 'externalOnly' },
+                    { label: 'None', name: 'none' }
+                ],
+                show: {
+                    eventActions: ['createEvent', 'updateEvent']
+                },
+                additionalParams: true,
+                optional: true
+            },
             {
                 label: 'Recurrence Rules',
                 name: 'recurrence',
@@ -560,7 +576,6 @@ class GoogleCalendar_Tools implements INode {
         }
 
         const defaultParams = this.transformNodeInputsToToolArgs(nodeData)
-
         const tools = createGoogleCalendarTools({
             accessToken,
             actions,
@@ -587,6 +602,7 @@ class GoogleCalendar_Tools implements INode {
         if (nodeData.inputs?.startDate) defaultParams.startDate = nodeData.inputs.startDate
         if (nodeData.inputs?.endDate) defaultParams.endDate = nodeData.inputs.endDate
         if (nodeData.inputs?.attendees) defaultParams.attendees = nodeData.inputs.attendees
+        if (nodeData.inputs?.sendUpdates) defaultParams.sendUpdates = nodeData.inputs.sendUpdates
         if (nodeData.inputs?.recurrence) defaultParams.recurrence = nodeData.inputs.recurrence
         if (nodeData.inputs?.reminderMinutes) defaultParams.reminderMinutes = nodeData.inputs.reminderMinutes
         if (nodeData.inputs?.visibility) defaultParams.visibility = nodeData.inputs.visibility

packages/components/nodes/tools/GoogleCalendar/core.ts

@@ -48,6 +48,7 @@ const CreateEventSchema = z.object({
     endDate: z.string().optional().describe('End date for all-day events (YYYY-MM-DD)'),
     timeZone: z.string().optional().describe('Time zone (e.g., America/New_York)'),
     attendees: z.string().optional().describe('Comma-separated list of attendee emails'),
+    sendUpdates: z.enum(['all', 'externalOnly', 'none']).optional().default('all').describe('Whether to send notifications to attendees'),
     recurrence: z.string().optional().describe('Recurrence rules (RRULE format)'),
     reminderMinutes: z.number().optional().describe('Minutes before event to send reminder'),
     visibility: z.enum(['default', 'public', 'private', 'confidential']).optional().describe('Event visibility')
@@ -70,6 +71,7 @@ const UpdateEventSchema = z.object({
     endDate: z.string().optional().describe('Updated end date for all-day events (YYYY-MM-DD)'),
     timeZone: z.string().optional().describe('Updated time zone'),
     attendees: z.string().optional().describe('Updated comma-separated list of attendee emails'),
+    sendUpdates: z.enum(['all', 'externalOnly', 'none']).optional().default('all').describe('Whether to send notifications to attendees'),
     recurrence: z.string().optional().describe('Updated recurrence rules'),
     reminderMinutes: z.number().optional().describe('Updated reminder minutes'),
     visibility: z.enum(['default', 'public', 'private', 'confidential']).optional().describe('Updated event visibility')
@@ -286,8 +288,11 @@ class CreateEventTool extends BaseGoogleCalendarTool {
             }
 
             if (params.visibility) eventData.visibility = params.visibility
+            const queryParams = new URLSearchParams()
+            if (params.sendUpdates) queryParams.append('sendUpdates', params.sendUpdates)
+
+            const endpoint = `calendars/${encodeURIComponent(params.calendarId)}/events?${queryParams.toString()}`
 
-            const endpoint = `calendars/${encodeURIComponent(params.calendarId)}/events`
             const response = await this.makeGoogleCalendarRequest({ endpoint, method: 'POST', body: eventData, params })
             return response
         } catch (error) {
@@ -395,8 +400,12 @@ class UpdateEventTool extends BaseGoogleCalendarTool {
             }
 
             if (params.visibility) updateData.visibility = params.visibility
+            const queryParams = new URLSearchParams()
+            if (params.sendUpdates) queryParams.append('sendUpdates', params.sendUpdates)
 
-            const endpoint = `calendars/${encodeURIComponent(params.calendarId)}/events/${encodeURIComponent(params.eventId)}`
+            const endpoint = `calendars/${encodeURIComponent(params.calendarId)}/events/${encodeURIComponent(
+                params.eventId
+            )}?${queryParams.toString()}`
             const response = await this.makeGoogleCalendarRequest({ endpoint, method: 'PUT', body: updateData, params })
             return response
         } catch (error) {

packages/components/nodes/tools/OpenAPIToolkit/OpenAPIToolkit.ts

@@ -5,6 +5,7 @@ import $RefParser from '@apidevtools/json-schema-ref-parser'
 import { z, ZodSchema, ZodTypeAny } from 'zod'
 import { defaultCode, DynamicStructuredTool, howToUseCode } from './core'
 import { DataSource } from 'typeorm'
+import fetch from 'node-fetch'
 
 class OpenAPIToolkit_Tools implements INode {
     label: string
@@ -21,17 +22,64 @@ class OpenAPIToolkit_Tools implements INode {
     constructor() {
         this.label = 'OpenAPI Toolkit'
         this.name = 'openAPIToolkit'
-        this.version = 2.0
+        this.version = 2.1
         this.type = 'OpenAPIToolkit'
         this.icon = 'openapi.svg'
         this.category = 'Tools'
         this.description = 'Load OpenAPI specification, and converts each API endpoint to a tool'
         this.inputs = [
             {
-                label: 'YAML File',
+                label: 'Input Type',
-                name: 'yamlFile',
+                name: 'inputType',
+                type: 'options',
+                options: [
+                    {
+                        label: 'Upload File',
+                        name: 'file'
+                    },
+                    {
+                        label: 'Provide Link',
+                        name: 'link'
+                    }
+                ],
+                default: 'file',
+                description: 'Choose how to provide the OpenAPI specification'
+            },
+            {
+                label: 'OpenAPI File',
+                name: 'openApiFile',
                 type: 'file',
-                fileType: '.yaml'
+                fileType: '.yaml,.json',
+                description: 'Upload your OpenAPI specification file (YAML or JSON)',
+                show: {
+                    inputType: 'file'
+                }
+            },
+            {
+                label: 'OpenAPI Link',
+                name: 'openApiLink',
+                type: 'string',
+                placeholder: 'https://api.example.com/openapi.yaml or https://api.example.com/openapi.json',
+                description: 'Provide a link to your OpenAPI specification (YAML or JSON)',
+                show: {
+                    inputType: 'link'
+                }
+            },
+            {
+                label: 'Server',
+                name: 'selectedServer',
+                type: 'asyncOptions',
+                loadMethod: 'listServers',
+                description: 'Select which server to use for API calls',
+                refresh: true
+            },
+            {
+                label: 'Available Endpoints',
+                name: 'selectedEndpoints',
+                type: 'asyncMultiOptions',
+                loadMethod: 'listEndpoints',
+                description: 'Select which endpoints to expose as tools',
+                refresh: true
             },
             {
                 label: 'Return Direct',
@@ -46,8 +94,7 @@ class OpenAPIToolkit_Tools implements INode {
                 type: 'json',
                 description: 'Request headers to be sent with the API request. For example, {"Authorization": "Bearer token"}',
                 additionalParams: true,
-                optional: true,
+                optional: true
-                acceptVariable: true
             },
             {
                 label: 'Remove null parameters',
@@ -76,49 +123,237 @@ class OpenAPIToolkit_Tools implements INode {
 
     async init(nodeData: INodeData, _: string, options: ICommonObject): Promise<any> {
         const toolReturnDirect = nodeData.inputs?.returnDirect as boolean
-        const yamlFileBase64 = nodeData.inputs?.yamlFile as string
+        const inputType = nodeData.inputs?.inputType as string
+        const openApiFile = nodeData.inputs?.openApiFile as string
+        const openApiLink = nodeData.inputs?.openApiLink as string
+        const selectedServer = nodeData.inputs?.selectedServer as string
         const customCode = nodeData.inputs?.customCode as string
         const _headers = nodeData.inputs?.headers as string
         const removeNulls = nodeData.inputs?.removeNulls as boolean
 
         const headers = typeof _headers === 'object' ? _headers : _headers ? JSON.parse(_headers) : {}
 
-        let data
+        const specData = await this.loadOpenApiSpec(
-        if (yamlFileBase64.startsWith('FILE-STORAGE::')) {
+            {
-            const file = yamlFileBase64.replace('FILE-STORAGE::', '')
+                inputType,
-            const orgId = options.orgId
+                openApiFile,
-            const chatflowid = options.chatflowid
+                openApiLink
-            const fileData = await getFileFromStorage(file, orgId, chatflowid)
+            },
-            const utf8String = fileData.toString('utf-8')
+            options
+        )
+        if (!specData) throw new Error('Failed to load OpenAPI spec')
 
-            data = load(utf8String)
+        const _data: any = await $RefParser.dereference(specData)
+
+        // Use selected server or fallback to first server
+        let baseUrl: string
+        if (selectedServer && selectedServer !== 'error') {
+            baseUrl = selectedServer
         } else {
-            const splitDataURI = yamlFileBase64.split(',')
+            baseUrl = _data.servers?.[0]?.url
-            splitDataURI.pop()
-            const bf = Buffer.from(splitDataURI.pop() || '', 'base64')
-            const utf8String = bf.toString('utf-8')
-            data = load(utf8String)
-        }
-        if (!data) {
-            throw new Error('Failed to load OpenAPI spec')
         }
 
-        const _data: any = await $RefParser.dereference(data)
+        if (!baseUrl) throw new Error('OpenAPI spec does not contain a server URL')
-
-        const baseUrl = _data.servers[0]?.url
-        if (!baseUrl) {
-            throw new Error('OpenAPI spec does not contain a server URL')
-        }
 
         const appDataSource = options.appDataSource as DataSource
         const databaseEntities = options.databaseEntities as IDatabaseEntity
         const variables = await getVars(appDataSource, databaseEntities, nodeData, options)
-
         const flow = { chatflowId: options.chatflowid }
 
-        const tools = getTools(_data.paths, baseUrl, headers, variables, flow, toolReturnDirect, customCode, removeNulls)
+        let tools = getTools(_data.paths, baseUrl, headers, variables, flow, toolReturnDirect, customCode, removeNulls)
+
+        // Filter by selected endpoints if provided
+        const _selected = nodeData.inputs?.selectedEndpoints
+        let selected: string[] = []
+        if (_selected) {
+            try {
+                selected = typeof _selected === 'string' ? JSON.parse(_selected) : _selected
+            } catch (e) {
+                selected = []
+            }
+        }
+        if (selected.length) {
+            tools = tools.filter((t: any) => selected.includes(t.name))
+        }
+
         return tools
     }
+
+    //@ts-ignore
+    loadMethods = {
+        listServers: async (nodeData: INodeData, options: ICommonObject) => {
+            try {
+                const inputType = nodeData.inputs?.inputType as string
+                const openApiFile = nodeData.inputs?.openApiFile as string
+                const openApiLink = nodeData.inputs?.openApiLink as string
+                const specData: any = await this.loadOpenApiSpec(
+                    {
+                        inputType,
+                        openApiFile,
+                        openApiLink
+                    },
+                    options
+                )
+                if (!specData) return []
+                const _data: any = await $RefParser.dereference(specData)
+                const items: { label: string; name: string; description?: string }[] = []
+                const servers = _data.servers || []
+
+                if (servers.length === 0) {
+                    return [
+                        {
+                            label: 'No Servers Found',
+                            name: 'error',
+                            description: 'No servers defined in the OpenAPI specification'
+                        }
+                    ]
+                }
+
+                for (let i = 0; i < servers.length; i++) {
+                    const server = servers[i]
+                    const serverUrl = server.url || `Server ${i + 1}`
+                    const serverDesc = server.description || serverUrl
+                    items.push({
+                        label: serverUrl,
+                        name: serverUrl,
+                        description: serverDesc
+                    })
+                }
+
+                return items
+            } catch (e) {
+                return [
+                    {
+                        label: 'No Servers Found',
+                        name: 'error',
+                        description: 'No available servers, check the link/file and refresh'
+                    }
+                ]
+            }
+        },
+        listEndpoints: async (nodeData: INodeData, options: ICommonObject) => {
+            try {
+                const inputType = nodeData.inputs?.inputType as string
+                const openApiFile = nodeData.inputs?.openApiFile as string
+                const openApiLink = nodeData.inputs?.openApiLink as string
+                const specData: any = await this.loadOpenApiSpec(
+                    {
+                        inputType,
+                        openApiFile,
+                        openApiLink
+                    },
+                    options
+                )
+                if (!specData) return []
+                const _data: any = await $RefParser.dereference(specData)
+                const items: { label: string; name: string; description?: string }[] = []
+                const paths = _data.paths || {}
+                for (const path in paths) {
+                    const methods = paths[path]
+                    for (const method in methods) {
+                        if (['get', 'post', 'put', 'delete', 'patch'].includes(method)) {
+                            const spec = methods[method]
+                            const opId = spec.operationId || `${method.toUpperCase()} ${path}`
+                            const desc = spec.description || spec.summary || opId
+                            items.push({ label: opId, name: opId, description: desc })
+                        }
+                    }
+                }
+                items.sort((a, b) => a.label.localeCompare(b.label))
+                return items
+            } catch (e) {
+                return [
+                    {
+                        label: 'No Endpoints Found',
+                        name: 'error',
+                        description: 'No available endpoints, check the link/file and refresh'
+                    }
+                ]
+            }
+        }
+    }
+
+    private async loadOpenApiSpec(
+        args: {
+            inputType?: string
+            openApiFile?: string
+            openApiLink?: string
+        },
+        options: ICommonObject
+    ): Promise<any | null> {
+        const { inputType = 'file', openApiFile = '', openApiLink = '' } = args
+        try {
+            if (inputType === 'link' && openApiLink) {
+                const res = await fetch(openApiLink)
+                const text = await res.text()
+
+                // Auto-detect format from URL extension or content
+                const isJsonUrl = openApiLink.toLowerCase().includes('.json')
+                const isYamlUrl = openApiLink.toLowerCase().includes('.yaml') || openApiLink.toLowerCase().includes('.yml')
+
+                if (isJsonUrl) {
+                    return JSON.parse(text)
+                } else if (isYamlUrl) {
+                    return load(text)
+                } else {
+                    // Auto-detect format from content
+                    try {
+                        return JSON.parse(text)
+                    } catch (_) {
+                        return load(text)
+                    }
+                }
+            }
+
+            if (inputType === 'file' && openApiFile) {
+                let utf8String: string
+                let fileName = ''
+
+                if (openApiFile.startsWith('FILE-STORAGE::')) {
+                    const file = openApiFile.replace('FILE-STORAGE::', '')
+                    fileName = file
+                    const orgId = options.orgId
+                    const chatflowid = options.chatflowid
+                    const fileData = await getFileFromStorage(file, orgId, chatflowid)
+                    utf8String = fileData.toString('utf-8')
+                } else {
+                    // Extract filename from data URI if possible
+                    const splitDataURI = openApiFile.split(',')
+                    const mimeType = splitDataURI[0] || ''
+                    if (mimeType.includes('filename=')) {
+                        const filenameMatch = mimeType.match(/filename=([^;]+)/)
+                        if (filenameMatch) {
+                            fileName = filenameMatch[1]
+                        }
+                    }
+                    splitDataURI.pop()
+                    const bf = Buffer.from(splitDataURI.pop() || '', 'base64')
+                    utf8String = bf.toString('utf-8')
+                }
+
+                // Auto-detect format from file extension or content
+                const isJsonFile = fileName.toLowerCase().endsWith('.json')
+                const isYamlFile = fileName.toLowerCase().endsWith('.yaml') || fileName.toLowerCase().endsWith('.yml')
+
+                if (isJsonFile) {
+                    return JSON.parse(utf8String)
+                } else if (isYamlFile) {
+                    return load(utf8String)
+                } else {
+                    // Auto-detect format from content
+                    try {
+                        return JSON.parse(utf8String)
+                    } catch (_) {
+                        return load(utf8String)
+                    }
+                }
+            }
+        } catch (e) {
+            console.error('Error loading OpenAPI spec:', e)
+            return null
+        }
+        return null
+    }
 }
 
 const jsonSchemaToZodSchema = (schema: any, requiredList: string[], keyName: string): ZodSchema<any> => {

packages/server/.env.example

@@ -99,6 +99,7 @@ JWT_TOKEN_EXPIRY_IN_MINUTES=360
 JWT_REFRESH_TOKEN_EXPIRY_IN_MINUTES=43200
 # EXPIRE_AUTH_TOKENS_ON_RESTART=true # (if you need to expire all tokens on app restart)
 # EXPRESS_SESSION_SECRET=flowise
+# SECURE_COOKIES=
 
 # INVITE_TOKEN_EXPIRY_IN_HOURS=24
 # PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS=15

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

@@ -2,7 +2,6 @@ import { Request, Response, NextFunction } from 'express'
 import { StatusCodes } from 'http-status-codes'
 import { AccountService } from '../services/account.service'
 import { getRunningExpressApp } from '../../utils/getRunningExpressApp'
-import axios from 'axios'
 
 export class AccountController {
     public async register(req: Request, res: Response, next: NextFunction) {
@@ -84,30 +83,6 @@ export class AccountController {
         }
     }
 
-    public async cancelPreviousCloudSubscrption(req: Request, res: Response, next: NextFunction) {
-        try {
-            const { email } = req.body
-            if (!email) {
-                return res.status(StatusCodes.BAD_REQUEST).json({ message: 'Email is required' })
-            }
-
-            const headers = {
-                'Content-Type': 'application/json',
-                Accept: 'application/json'
-            }
-
-            const response = await axios.post(`${process.env.ENGINE_URL}/cancel-subscription`, { email }, { headers })
-
-            if (response.status === 200) {
-                return res.status(StatusCodes.OK).json(response.data)
-            } else {
-                return res.status(response.status).json(response.data)
-            }
-        } catch (error) {
-            next(error)
-        }
-    }
-
     public async logout(req: Request, res: Response, next: NextFunction) {
         try {
             if (req.user) {

packages/server/src/enterprise/emails/verify_email_cloud.hbs

@@ -79,7 +79,7 @@
             style='
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -220,7 +220,7 @@
                                                                                     <img
                                                                                         alt=''
                                                                                         width='auto'
-                                                                                        src='https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png'
+                                                                                        src='https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png'
                                                                                         style='
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/verify_email_cloud.html

@@ -197,7 +197,7 @@
             style="
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -338,7 +338,7 @@
                                                                                     <img
                                                                                         alt=""
                                                                                         width="auto"
-                                                                                        src="https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png"
+                                                                                        src="https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png"
                                                                                         style="
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_add_cloud.hbs

@@ -78,7 +78,7 @@
             style='
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -219,7 +219,7 @@
                                                                                     <img
                                                                                         alt=''
                                                                                         width='auto'
-                                                                                        src='https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png'
+                                                                                        src='https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png'
                                                                                         style='
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_add_cloud.html

@@ -197,7 +197,7 @@
             style="
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -338,7 +338,7 @@
                                                                                     <img
                                                                                         alt=""
                                                                                         width="auto"
-                                                                                        src="https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png"
+                                                                                        src="https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png"
                                                                                         style="
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_new_invite_cloud.hbs

@@ -78,7 +78,7 @@
             style='
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -219,7 +219,7 @@
                                                                                     <img
                                                                                         alt=''
                                                                                         width='auto'
-                                                                                        src='https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png'
+                                                                                        src='https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png'
                                                                                         style='
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_new_invite_cloud.html

@@ -197,7 +197,7 @@
             style="
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -338,7 +338,7 @@
                                                                                     <img
                                                                                         alt=""
                                                                                         width="auto"
-                                                                                        src="https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png"
+                                                                                        src="https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png"
                                                                                         style="
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_new_invite_enterprise.hbs

@@ -68,7 +68,7 @@
         bgcolor='#000000'
     >
         <div
-            style='position: relative;background-color: #151719 !important;background-image:url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);background-position:center top;background-size:contain;background-repeat:no-repeat;'
+            style='position: relative;background-color: #151719 !important;background-image:url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);background-position:center top;background-size:contain;background-repeat:no-repeat;'
         >
 
             <div id='illustration' className='relative max-w-6xl mx-auto h-0 pointer-events-none' aria-hidden='true'>
@@ -170,7 +170,7 @@
                                                                                     <img
                                                                                         alt=''
                                                                                         width='auto'
-                                                                                        src='https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png'
+                                                                                        src='https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png'
                                                                                         style='display: block; outline: none; text-decoration: none; height: 40px; font-size: 13px; line-height: 100%; -ms-interpolation-mode: bicubic; border: 0;'
                                                                                     />
                                                                                 </td>

packages/server/src/enterprise/emails/workspace_new_invite_enterprise.html

@@ -197,7 +197,7 @@
             style="
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -338,7 +338,7 @@
                                                                                     <img
                                                                                         alt=""
                                                                                         width="auto"
-                                                                                        src="https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png"
+                                                                                        src="https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png"
                                                                                         style="
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_update_invite_cloud.hbs

@@ -78,7 +78,7 @@
             style='
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -219,7 +219,7 @@
                                                                                     <img
                                                                                         alt=''
                                                                                         width='auto'
-                                                                                        src='https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png'
+                                                                                        src='https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png'
                                                                                         style='
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_update_invite_cloud.html

@@ -197,7 +197,7 @@
             style="
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -338,7 +338,7 @@
                                                                                     <img
                                                                                         alt=""
                                                                                         width="auto"
-                                                                                        src="https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png"
+                                                                                        src="https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png"
                                                                                         style="
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_update_invite_enterprise.hbs

@@ -78,7 +78,7 @@
             style='
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -219,7 +219,7 @@
                                                                                     <img
                                                                                         alt=''
                                                                                         width='auto'
-                                                                                        src='https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png'
+                                                                                        src='https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png'
                                                                                         style='
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_update_invite_enterprise.html

@@ -197,7 +197,7 @@
             style="
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -338,7 +338,7 @@
                                                                                     <img
                                                                                         alt=""
                                                                                         width="auto"
-                                                                                        src="https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png"
+                                                                                        src="https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png"
                                                                                         style="
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/emails/workspace_user_reset_password.hbs

@@ -68,7 +68,7 @@
         bgcolor='#000000'
     >
         <div
-            style='position: relative;background-color: #151719 !important;background-image:url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);background-position:center top;background-size:contain;background-repeat:no-repeat;'
+            style='position: relative;background-color: #151719 !important;background-image:url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);background-position:center top;background-size:contain;background-repeat:no-repeat;'
         >
 
             <div id='illustration' className='relative max-w-6xl mx-auto h-0 pointer-events-none' aria-hidden='true'>
@@ -170,7 +170,7 @@
                                                                                     <img
                                                                                         alt=''
                                                                                         width='auto'
-                                                                                        src='https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png'
+                                                                                        src='https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png'
                                                                                         style='display: block; outline: none; text-decoration: none; height: 40px; font-size: 13px; line-height: 100%; -ms-interpolation-mode: bicubic; border: 0;'
                                                                                     />
                                                                                 </td>

packages/server/src/enterprise/emails/workspace_user_reset_password.html

@@ -197,7 +197,7 @@
             style="
                 position: relative;
                 background-color: #151719 !important;
-                background-image: url(https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_email_bg.svg);
+                background-image: url(https://general-flowise.s3.us-east-1.amazonaws.com/flowise_email_bg.svg);
                 background-position: center top;
                 background-size: contain;
                 background-repeat: no-repeat;
@@ -338,7 +338,7 @@
                                                                                     <img
                                                                                         alt=""
                                                                                         width="auto"
-                                                                                        src="https://auth.flowiseai.com/storage/v1/object/public/flowise-static-assets/flowise_logo.png"
+                                                                                        src="https://general-flowise.s3.us-east-1.amazonaws.com/Flowise+Logo+Cropped+White+High+Res.png"
                                                                                         style="
                                                                                             display: block;
                                                                                             outline: none;

packages/server/src/enterprise/middleware/passport/index.ts

@@ -33,7 +33,16 @@ const expireAuthTokensOnRestart = process.env.EXPIRE_AUTH_TOKENS_ON_RESTART ===
 const jwtAuthTokenSecret = process.env.JWT_AUTH_TOKEN_SECRET || 'auth_token'
 const jwtRefreshSecret = process.env.JWT_REFRESH_TOKEN_SECRET || process.env.JWT_AUTH_TOKEN_SECRET || 'refresh_token'
 
-const secureCookie = process.env.APP_URL?.startsWith('https') ? true : false
+// Allow explicit override of cookie security settings
+// This is useful when running behind a reverse proxy/load balancer that terminates SSL
+const secureCookie =
+    process.env.SECURE_COOKIES === 'false'
+        ? false
+        : process.env.SECURE_COOKIES === 'true'
+        ? true
+        : process.env.APP_URL?.startsWith('https')
+        ? true
+        : false
 const jwtOptions = {
     secretOrKey: jwtAuthTokenSecret,
     audience: jwtAudience,

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

@@ -28,8 +28,6 @@ router.post('/forgot-password', accountController.forgotPassword)
 
 router.post('/reset-password', accountController.resetPassword)
 
-router.post('/cancel-subscription', accountController.cancelPreviousCloudSubscrption)
-
 router.post('/billing', accountController.createStripeCustomerPortalSession)
 
 router.get('/basic-auth', accountController.getBasicAuth)

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

@@ -7,7 +7,6 @@ const resendVerificationEmail = (body) => client.post('/account/resend-verificat
 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 cancelSubscription = (body) => client.post('/account/cancel-subscription', body)
 const logout = () => client.post('/account/logout')
 const getBasicAuth = () => client.get('/account/basic-auth')
 const checkBasicAuth = (body) => client.post('/account/basic-auth', body)
@@ -20,7 +19,6 @@ export default {
     resendVerificationEmail,
     forgotPassword,
     resetPassword,
-    cancelSubscription,
     logout,
     getBasicAuth,
     checkBasicAuth

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

@@ -77,7 +77,6 @@ const AccountSettings = () => {
     const [confirmPassword, setConfirmPassword] = useState('')
     const [usage, setUsage] = useState(null)
     const [isBillingLoading, setIsBillingLoading] = useState(false)
-    const [isMigrateLoading, setIsMigrateLoading] = useState(false)
     const [seatsQuantity, setSeatsQuantity] = useState(0)
     const [prorationInfo, setProrationInfo] = useState(null)
     const [isUpdatingSeats, setIsUpdatingSeats] = useState(false)
@@ -173,45 +172,6 @@ const AccountSettings = () => {
         return currentPlan?.title || ''
     }, [getPricingPlansApi.data, currentUser?.activeOrganizationProductId])
 
-    const handleMigrateEmail = async () => {
-        setIsMigrateLoading(true)
-        try {
-            const obj = {
-                email: migrateEmail
-            }
-            const resp = await accountApi.cancelSubscription(obj)
-            if (resp.status === 200) {
-                enqueueSnackbar({
-                    message: `Instruction to cancel subscription has been sent to ${migrateEmail}`,
-                    options: {
-                        key: new Date().getTime() + Math.random(),
-                        variant: 'success',
-                        action: (key) => (
-                            <Button style={{ color: 'white' }} onClick={() => closeSnackbar(key)}>
-                                <IconX />
-                            </Button>
-                        )
-                    }
-                })
-            }
-        } catch (error) {
-            enqueueSnackbar({
-                message: 'Failed to access billing portal',
-                options: {
-                    key: new Date().getTime() + Math.random(),
-                    variant: 'error',
-                    action: (key) => (
-                        <Button style={{ color: 'white' }} onClick={() => closeSnackbar(key)}>
-                            <IconX />
-                        </Button>
-                    )
-                }
-            })
-        } finally {
-            setIsMigrateLoading(false)
-        }
-    }
-
     const handleBillingPortalClick = async () => {
         setIsBillingLoading(true)
         try {
@@ -817,70 +777,6 @@ const AccountSettings = () => {
                                     </Box>
                                 </SettingsSection>
                             )}
-                            <SettingsSection title='Cancel Previous Subscription'>
-                                <Box
-                                    sx={{
-                                        width: '100%',
-                                        display: 'grid',
-                                        gridTemplateColumns: 'repeat(3, 1fr)'
-                                    }}
-                                >
-                                    <Box
-                                        sx={{
-                                            gridColumn: 'span 2 / span 2',
-                                            display: 'flex',
-                                            flexDirection: 'column',
-                                            alignItems: 'start',
-                                            justifyContent: 'center',
-                                            gap: 1,
-                                            px: 2.5,
-                                            py: 2
-                                        }}
-                                    >
-                                        <Typography variant='body2'>Migrate from existing cloud subscription?</Typography>
-                                        <Typography variant='body2' color='text.secondary'>
-                                            {`If you have an existing cloud app like <your-app>.app.flowiseai.com, after finished migrating your work, you can cancel the previous subscription. We'll send you an email with a link to cancel your previous subscription.`}
-                                        </Typography>
-                                        <Box sx={{ display: 'flex', flexDirection: 'column', gap: 1, width: '100%' }}>
-                                            <OutlinedInput
-                                                id='email'
-                                                type='string'
-                                                fullWidth
-                                                placeholder='Email Address'
-                                                name='email'
-                                                onChange={(e) => setMigrateEmail(e.target.value)}
-                                                value={migrateEmail}
-                                            />
-                                        </Box>
-                                    </Box>
-                                    <Box
-                                        sx={{
-                                            display: 'flex',
-                                            alignItems: 'center',
-                                            justifyContent: 'end',
-                                            px: 2.5,
-                                            py: 2,
-                                            gap: 2
-                                        }}
-                                    >
-                                        <Button
-                                            variant='outlined'
-                                            disabled={!currentUser.isOrganizationAdmin || isMigrateLoading}
-                                            onClick={handleMigrateEmail}
-                                            sx={{ borderRadius: 2, height: 40 }}
-                                        >
-                                            {isMigrateLoading ? (
-                                                <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
-                                                    <CircularProgress size={16} color='inherit' />
-                                                    Loading
-                                                </Box>
-                                            ) : (
-                                                'Send Instructions'
-                                            )}
-                                        </Button>
-                                    </Box>
-                                </Box>
-                            </SettingsSection>
                         </>
                     )}
                 </Stack>

packages/ui/src/views/auth/signIn.jsx

@@ -241,18 +241,6 @@ const SignInPage = () => {
                                         Forgot password?
                                     </Link>
                                 </Typography>
-                                {isCloud && (
-                                    <Typography variant='body2' sx={{ color: theme.palette.grey[600], mt: 1, textAlign: 'right' }}>
-                                        <a
-                                            href='https://docs.flowiseai.com/migration-guide/cloud-migration'
-                                            target='_blank'
-                                            rel='noopener noreferrer'
-                                            style={{ color: theme.palette.primary.main }}
-                                        >
-                                            Migrate from existing account?
-                                        </a>
-                                    </Typography>
-                                )}
                             </Box>
                             <LoadingButton
                                 loading={loading}