From 02c9cf02a7180db5d7ed313e31a725340f04a2e9 Mon Sep 17 00:00:00 2001 From: Goose Date: Sat, 26 Sep 2026 08:18:14 +0000 Subject: [PATCH] fix(security, workflows, outreach): remove hardcoded credentials, connect runFlow API, test outreach engine, add requirements.txt --- frontend/src/api.js | 29 ++++++- frontend/src/views/FlowEditorView.vue | 32 ++++++-- openforce/urls.py | 2 + requirements.txt | 9 +++ tests/test_outreach.py | 108 ++++++++++++++++++++++++++ workflows/views.py | 4 + 6 files changed, 174 insertions(+), 10 deletions(-) create mode 100644 requirements.txt create mode 100644 tests/test_outreach.py diff --git a/frontend/src/api.js b/frontend/src/api.js index 7ae8c76..fd38e0f 100644 --- a/frontend/src/api.js +++ b/frontend/src/api.js @@ -1,11 +1,36 @@ import axios from 'axios' +function getCookie(name) { + let cookieValue = null + if (document.cookie && document.cookie !== '') { + const cookies = document.cookie.split(';') + for (let i = 0; i < cookies.length; i++) { + const cookie = cookies[i].trim() + if (cookie.substring(0, name.length + 1) === (name + '=')) { + cookieValue = decodeURIComponent(cookie.substring(name.length + 1)) + break + } + } + } + return cookieValue +} + const api = axios.create({ baseURL: '/api', headers: { - 'Content-Type': 'application/json', - 'Authorization': 'Basic ' + btoa('admin:openforce123') // Default dev credentials + 'Content-Type': 'application/json' } }) +// Attach CSRF token for Django session authentication +api.interceptors.request.use((config) => { + const csrfToken = getCookie('csrftoken') + if (csrfToken) { + config.headers['X-CSRFToken'] = csrfToken + } + return config +}, (error) => { + return Promise.reject(error) +}) + export default api diff --git a/frontend/src/views/FlowEditorView.vue b/frontend/src/views/FlowEditorView.vue index 37bf836..cb4fd28 100644 --- a/frontend/src/views/FlowEditorView.vue +++ b/frontend/src/views/FlowEditorView.vue @@ -63,6 +63,8 @@ import { Background } from '@vue-flow/background' import { Controls } from '@vue-flow/controls' import api from '../api' +const currentFlowId = ref(null) + const nodes = ref([ { id: 'start-trigger', @@ -114,19 +116,33 @@ async function saveFlow() { edges: edges.value.map(e => ({ source: e.source, target: e.target })) } } - await api.post('/flows/', payload) + let res + if (currentFlowId.value) { + res = await api.put(`/workflows/${currentFlowId.value}/`, payload) + } else { + res = await api.post('/workflows/', payload) + } + currentFlowId.value = res.data.id alert('Flow Definition successfully saved & DAG validated via Kahn\'s algorithm!') + return res.data } async function runFlow() { - executionTrace.value = { - status: 'completed', - context: { - lead_id: 42, - score: 25, - stage: 'Qualified', - steps_executed: ['start-trigger', 'score-step', 'qualify-step'] + try { + if (!currentFlowId.value) { + const saved = await saveFlow() + currentFlowId.value = saved.id } + const res = await api.post(`/workflows/${currentFlowId.value}/execute/`, { + context: { lead_id: 42, initial_score: 0 } + }) + executionTrace.value = { + status: res.data.status, + context: res.data.context_data || res.data.context || {} + } + } catch (err) { + console.error('Failed to execute flow:', err) + alert('Flow execution error: ' + (err.response?.data?.detail || err.message)) } } diff --git a/openforce/urls.py b/openforce/urls.py index 1bf94b4..57e8c26 100644 --- a/openforce/urls.py +++ b/openforce/urls.py @@ -25,6 +25,7 @@ router.register(r'custom-objects', CustomObjectDefinitionViewSet, basename='cust router.register(r'custom-fields', CustomFieldDefinitionViewSet, basename='custom-field') router.register(r'workflows', FlowDefinitionViewSet, basename='workflow') +router.register(r'flows', FlowDefinitionViewSet, basename='flow') router.register(r'workflow-logs', FlowExecutionLogViewSet, basename='workflow-log') router.register(r'email-templates', EmailTemplateViewSet, basename='email-template') @@ -34,6 +35,7 @@ urlpatterns = [ path('admin/', admin.site.urls), path('api/', include(router.urls)), path('api/track//', TrackEmailOpenView.as_view(), name='track_email_open'), + path('api/outreach/track/open//', TrackEmailOpenView.as_view(), name='track_email_open_alt'), path('api/custom//', CustomRecordViewSet.as_view({ 'get': 'list', 'post': 'create' diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..3343201 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,9 @@ +Django>=4.2,<5.0 +djangorestframework>=3.14,<4.0 +psycopg2-binary>=2.9 +jsonschema>=4.0 +django-cors-headers>=4.0 +whitenoise>=6.5 +pytest>=7.0 +pytest-django>=4.5 +pytest-cov>=4.0 diff --git a/tests/test_outreach.py b/tests/test_outreach.py new file mode 100644 index 0000000..dc78238 --- /dev/null +++ b/tests/test_outreach.py @@ -0,0 +1,108 @@ +import pytest +from django.core import mail +from outreach.models import EmailTemplate, Campaign, CampaignRecipient +from outreach.engine import inject_tracking_pixel, dispatch_campaign + + +@pytest.mark.django_db +class TestOutreachEngine: + def test_merge_tag_substitution(self): + template = EmailTemplate.objects.create( + name='Test Promo', + subject='Hello {{ first_name }}!', + body_html='

Hi {{ first_name }}, welcome to {{ company }}! Your code is {{ promo_code }}.

', + body_text='Hi {{ first_name }}, welcome to {{ company }}!' + ) + context = { + 'first_name': 'Alice', + 'company': 'Acme Corp', + 'promo_code': 'SAVE20' + } + subj, html, text = template.render(context) + assert subj == 'Hello Alice!' + assert 'Hi Alice, welcome to Acme Corp! Your code is SAVE20.' in html + assert 'Hi Alice, welcome to Acme Corp!' in text + + def test_missing_merge_tag_fallback(self): + template = EmailTemplate.objects.create( + name='Missing Tag Test', + subject='Welcome {{ first_name }} to {{ nonexistent_var }}', + body_html='

Hello {{ first_name }}, your plan is {{ missing_plan }}

', + body_text='Hello {{ first_name }}, plan: {{ missing_plan }}' + ) + context = {'first_name': 'Bob'} + subj, html, text = template.render(context) + # Missing tags are not provided in context, so unrendered placeholders remain or are handled safely + assert 'Welcome Bob' in subj + assert 'Hello Bob' in html + assert 'Hello Bob' in text + + def test_inject_tracking_pixel_with_body_tag(self): + html = '

Test

' + token = '12345678-1234-5678-1234-567812345678' + result = inject_tracking_pixel(html, token, base_url='https://crm.example.com') + assert f'' in result + assert result.endswith('') + + def test_inject_tracking_pixel_without_body_tag(self): + html = '

Just a fragment

' + token = '12345678-1234-5678-1234-567812345678' + result = inject_tracking_pixel(html, token, base_url='https://crm.example.com') + assert f'Just a fragment