fix: Update the branch for dockerfile cloud

fix: Add artificial delay to Helix API attempts

docker/Dockerfile.cloud

@@ -6,7 +6,7 @@ ENV PORT 3000
 RUN \
   apk --no-cache add --virtual build-dependencies python3 build-base git
 
-RUN git clone https://github.com/automatisch/automatisch.git
+RUN git clone -b helix-new-endpoint https://github.com/automatisch/automatisch.git
 
 WORKDIR /automatisch
 

packages/backend/src/apps/datastore/actions/get-value/index.js

@@ -0,0 +1,27 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Get value',
+  key: 'getValue',
+  description: 'Get value from the persistent datastore.',
+  arguments: [
+    {
+      label: 'Key',
+      key: 'key',
+      type: 'string',
+      required: true,
+      description: 'The key of your value to get.',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const keyValuePair = await $.datastore.get({
+      key: $.step.parameters.key,
+    });
+
+    $.setActionItem({
+      raw: keyValuePair,
+    });
+  },
+});

packages/backend/src/apps/datastore/actions/index.js

@@ -0,0 +1,4 @@
+import getValue from './get-value/index.js';
+import setValue from './set-value/index.js';
+
+export default [getValue, setValue];

packages/backend/src/apps/datastore/actions/set-value/index.js

@@ -0,0 +1,36 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Set value',
+  key: 'setValue',
+  description: 'Set value to the persistent datastore.',
+  arguments: [
+    {
+      label: 'Key',
+      key: 'key',
+      type: 'string',
+      required: true,
+      description: 'The key of your value to set.',
+      variables: true,
+    },
+    {
+      label: 'Value',
+      key: 'value',
+      type: 'string',
+      required: true,
+      description: 'The value to set.',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const keyValuePair = await $.datastore.set({
+      key: $.step.parameters.key,
+      value: $.step.parameters.value,
+    });
+
+    $.setActionItem({
+      raw: keyValuePair,
+    });
+  },
+});

packages/backend/src/apps/datastore/assets/favicon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" id="icon">
+  <defs>
+    <style>.cls-1{fill:none;}</style>
+  </defs>
+  <title>datastore</title>
+  <circle cx="23" cy="23" r="1"/>
+  <rect x="8" y="22" width="12" height="2"/>
+  <circle cx="23" cy="9" r="1"/>
+  <rect x="8" y="8" width="12" height="2"/>
+  <path d="M26,14a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H6A2,2,0,0,0,4,6v6a2,2,0,0,0,2,2H8v4H6a2,2,0,0,0-2,2v6a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2V20a2,2,0,0,0-2-2H24V14ZM6,6H26v6H6ZM26,26H6V20H26Zm-4-8H10V14H22Z"/>
+  <rect id="_Transparent_Rectangle_" data-name="&lt;Transparent Rectangle&gt;" class="cls-1" width="32" height="32"/>
+</svg>

packages/backend/src/apps/datastore/index.js

@@ -0,0 +1,14 @@
+import defineApp from '../../helpers/define-app.js';
+import actions from './actions/index.js';
+
+export default defineApp({
+  name: 'Datastore',
+  key: 'datastore',
+  iconUrl: '{BASE_URL}/apps/datastore/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/apps/datastore/connection',
+  supportsConnections: false,
+  baseUrl: '',
+  apiBaseUrl: '',
+  primaryColor: '001F52',
+  actions,
+});

packages/backend/src/apps/helix/actions/new-chat/index.js

@@ -1,4 +1,3 @@
-import FormData from 'form-data';
 import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
@@ -17,34 +16,21 @@ export default defineAction({
   ],
 
   async run($) {
-    const formData = new FormData();
-    formData.append('input', $.step.parameters.input);
-    formData.append('mode', 'inference');
-    formData.append('type', 'text');
-
-    const sessionResponse = await $.http.post('/api/v1/sessions', formData, {
-      headers: {
-        ...formData.getHeaders(),
-      },
+    const response = await $.http.post('/api/v1/sessions/chat', {
+      session_id: '',
+      messages: [
+        {
+          role: 'user',
+          content: {
+            content_type: 'text',
+            parts: [$.step.parameters.input],
+          },
+        },
+      ],
     });
 
-    const sessionId = sessionResponse.data.id;
-
-    let chatGenerated = false;
-
-    while (!chatGenerated) {
-      const response = await $.http.get(`/api/v1/sessions/${sessionId}`);
-
-      const message =
-        response.data.interactions[response.data.interactions.length - 1];
-
-      if (message.creator === 'system' && message.state === 'complete') {
-        $.setActionItem({
-          raw: message,
-        });
-
-        chatGenerated = true;
-      }
-    }
+    $.setActionItem({
+      raw: response.data,
+    });
   },
 });

packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-client.test.js

@@ -1,5 +1,6 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
+import Crypto from 'crypto';
 import app from '../../../../../app.js';
 import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
 import { createUser } from '../../../../../../test/factories/user.js';
@@ -31,5 +32,21 @@ describe('GET /api/v1/admin/app-auth-clients/:appAuthClientId', () => {
       const expectedPayload = getAdminAppAuthClientMock(currentAppAuthClient);
       expect(response.body).toEqual(expectedPayload);
     });
+
+    it('should return not found response for not existing app auth client UUID', async () => {
+      const notExistingAppAuthClientUUID = Crypto.randomUUID();
+
+      await request(app)
+        .get(`/api/v1/admin/app-auth-clients/${notExistingAppAuthClientUUID}`)
+        .set('Authorization', token)
+        .expect(404);
+    });
+
+    it('should return bad request response for invalid UUID', async () => {
+      await request(app)
+        .get('/api/v1/admin/app-auth-clients/invalidAppAuthClientUUID')
+        .set('Authorization', token)
+        .expect(400);
+    });
   });
 });

packages/backend/src/controllers/api/v1/admin/roles/get-role.ee.test.js

@@ -1,5 +1,6 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
+import Crypto from 'crypto';
 import app from '../../../../../app.js';
 import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
 import { createRole } from '../../../../../../test/factories/role.js';
@@ -20,7 +21,7 @@ describe('GET /api/v1/admin/roles/:roleId', () => {
     token = createAuthTokenByUserId(currentUser.id);
   });
 
-  it('should return roles', async () => {
+  it('should return role', async () => {
     vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
 
     const response = await request(app)
@@ -35,4 +36,24 @@ describe('GET /api/v1/admin/roles/:roleId', () => {
 
     expect(response.body).toEqual(expectedPayload);
   });
+
+  it('should return not found response for not existing role UUID', async () => {
+    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+
+    const notExistingRoleUUID = Crypto.randomUUID();
+
+    await request(app)
+      .get(`/api/v1/admin/roles/${notExistingRoleUUID}`)
+      .set('Authorization', token)
+      .expect(404);
+  });
+
+  it('should return bad request response for invalid UUID', async () => {
+    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+
+    await request(app)
+      .get('/api/v1/admin/roles/invalidRoleUUID')
+      .set('Authorization', token)
+      .expect(400);
+  });
 });

packages/backend/src/controllers/api/v1/admin/saml-auth-providers/get-saml-auth-provider.ee.test.js

@@ -1,5 +1,6 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
+import Crypto from 'crypto';
 import app from '../../../../../app.js';
 import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
 import { createRole } from '../../../../../../test/factories/role.js';
@@ -31,4 +32,26 @@ describe('GET /api/v1/admin/saml-auth-provider/:samlAuthProviderId', () => {
 
     expect(response.body).toEqual(expectedPayload);
   });
+
+  it('should return not found response for not existing saml auth provider UUID', async () => {
+    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+
+    const notExistingSamlAuthProviderUUID = Crypto.randomUUID();
+
+    await request(app)
+      .get(
+        `/api/v1/admin/saml-auth-providers/${notExistingSamlAuthProviderUUID}`
+      )
+      .set('Authorization', token)
+      .expect(404);
+  });
+
+  it('should return bad request response for invalid UUID', async () => {
+    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+
+    await request(app)
+      .get('/api/v1/admin/saml-auth-providers/invalidSamlAuthProviderUUID')
+      .set('Authorization', token)
+      .expect(400);
+  });
 });

packages/backend/src/controllers/api/v1/admin/users/get-user.ee.test.js

@@ -1,5 +1,6 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
+import Crypto from 'crypto';
 import app from '../../../../../app.js';
 import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id';
 import { createUser } from '../../../../../../test/factories/user';
@@ -31,4 +32,24 @@ describe('GET /api/v1/admin/users/:userId', () => {
     const expectedPayload = getUserMock(anotherUser, anotherUserRole);
     expect(response.body).toEqual(expectedPayload);
   });
+
+  it('should return not found response for not existing user UUID', async () => {
+    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+
+    const notExistingUserUUID = Crypto.randomUUID();
+
+    await request(app)
+      .get(`/api/v1/admin/users/${notExistingUserUUID}`)
+      .set('Authorization', token)
+      .expect(404);
+  });
+
+  it('should return bad request response for invalid UUID', async () => {
+    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+
+    await request(app)
+      .get('/api/v1/admin/users/invalidUserUUID')
+      .set('Authorization', token)
+      .expect(400);
+  });
 });

packages/backend/src/controllers/api/v1/app-auth-clients/get-app-auth-client.test.js

@@ -1,5 +1,6 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
+import Crypto from 'crypto';
 import app from '../../../../app.js';
 import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id.js';
 import { createUser } from '../../../../../test/factories/user.js';
@@ -28,4 +29,20 @@ describe('GET /api/v1/app-auth-clients/:id', () => {
     const expectedPayload = getAppAuthClientMock(currentAppAuthClient);
     expect(response.body).toEqual(expectedPayload);
   });
+
+  it('should return not found response for not existing app auth client ID', async () => {
+    const notExistingAppAuthClientUUID = Crypto.randomUUID();
+
+    await request(app)
+      .get(`/api/v1/app-auth-clients/${notExistingAppAuthClientUUID}`)
+      .set('Authorization', token)
+      .expect(404);
+  });
+
+  it('should return bad request response for invalid UUID', async () => {
+    await request(app)
+      .get('/api/v1/app-auth-clients/invalidAppAuthClientUUID')
+      .set('Authorization', token)
+      .expect(400);
+  });
 });

packages/backend/src/controllers/api/v1/apps/get-app.js

@@ -0,0 +1,8 @@
+import App from '../../../../models/app.js';
+import { renderObject } from '../../../../helpers/renderer.js';
+
+export default async (request, response) => {
+  const app = await App.findOneByKey(request.params.appKey);
+
+  renderObject(response, app, { serializer: 'App' });
+};

packages/backend/src/controllers/api/v1/apps/get-app.test.js

@@ -0,0 +1,35 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import request from 'supertest';
+import App from '../../../../models/app';
+import app from '../../../../app.js';
+import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
+import { createUser } from '../../../../../test/factories/user';
+import getAppMock from '../../../../../test/mocks/rest/api/v1/apps/get-app.js';
+
+describe('GET /api/v1/apps/:appKey', () => {
+  let currentUser, token;
+
+  beforeEach(async () => {
+    currentUser = await createUser();
+    token = createAuthTokenByUserId(currentUser.id);
+  });
+
+  it('should return the app info', async () => {
+    const exampleApp = await App.findOneByKey('github');
+
+    const response = await request(app)
+      .get(`/api/v1/apps/${exampleApp.key}`)
+      .set('Authorization', token)
+      .expect(200);
+
+    const expectedPayload = getAppMock(exampleApp);
+    expect(response.body).toEqual(expectedPayload);
+  });
+
+  it('should return not found response for invalid app key', async () => {
+    await request(app)
+      .get('/api/v1/apps/invalid-app-key')
+      .set('Authorization', token)
+      .expect(404);
+  });
+});

packages/backend/src/controllers/api/v1/flows/get-flow.test.js

@@ -1,5 +1,6 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
+import Crypto from 'crypto';
 import app from '../../../../app.js';
 import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
 import { createUser } from '../../../../../test/factories/user';
@@ -68,4 +69,34 @@ describe('GET /api/v1/flows/:flowId', () => {
 
     expect(response.body).toEqual(expectedPayload);
   });
+
+  it('should return not found response for not existing flow UUID', async () => {
+    await createPermission({
+      action: 'read',
+      subject: 'Flow',
+      roleId: currentUserRole.id,
+      conditions: [],
+    });
+
+    const notExistingFlowUUID = Crypto.randomUUID();
+
+    await request(app)
+      .get(`/api/v1/flows/${notExistingFlowUUID}`)
+      .set('Authorization', token)
+      .expect(404);
+  });
+
+  it('should return bad request response for invalid UUID', async () => {
+    await createPermission({
+      action: 'read',
+      subject: 'Flow',
+      roleId: currentUserRole.id,
+      conditions: [],
+    });
+
+    await request(app)
+      .get('/api/v1/flows/invalidFlowUUID')
+      .set('Authorization', token)
+      .expect(400);
+  });
 });

packages/backend/src/db/migrations/20240227164849_create_datastore_model.js

@@ -0,0 +1,16 @@
+export async function up(knex) {
+  return knex.schema.createTable('datastore', (table) => {
+    table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
+    table.string('key').notNullable();
+    table.string('value');
+    table.string('scope').notNullable();
+    table.uuid('scope_id').notNullable();
+    table.index(['key', 'scope', 'scope_id']);
+
+    table.timestamps(true, true);
+  });
+}
+
+export async function down(knex) {
+  return knex.schema.dropTable('datastore');
+}

packages/backend/src/helpers/error-handler.js

@@ -1,14 +1,31 @@
 import logger from './logger.js';
+import objection from 'objection';
+const { NotFoundError, DataError } = objection;
 
 // Do not remove `next` argument as the function signature will not fit for an error handler middleware
 // eslint-disable-next-line no-unused-vars
-const errorHandler = (err, req, res, next) => {
-  if (err.message === 'Not Found') {
-    res.status(404).end();
-  } else {
-    logger.error(err.message + '\n' + err.stack);
-    res.status(err.statusCode || 500).send(err.message);
+const errorHandler = (error, request, response, next) => {
+  if (error.message === 'Not Found' || error instanceof NotFoundError) {
+    response.status(404).end();
   }
+
+  if (notFoundAppError(error)) {
+    response.status(404).end();
+  }
+
+  if (error instanceof DataError) {
+    response.status(400).end();
+  }
+
+  logger.error(error.message + '\n' + error.stack);
+  response.status(error.statusCode || 500).end();
+};
+
+const notFoundAppError = (error) => {
+  return (
+    error.message.includes('An application with the') ||
+    error.message.includes("key couldn't be found.")
+  );
 };
 
 export default errorHandler;

packages/backend/src/helpers/global-variable.js

@@ -1,6 +1,7 @@
 import createHttpClient from './http-client/index.js';
 import EarlyExitError from '../errors/early-exit.js';
 import AlreadyProcessedError from '../errors/already-processed.js';
+import Datastore from '../models/datastore.js';
 
 const globalVariable = async (options) => {
   const {
@@ -88,6 +89,43 @@ const globalVariable = async (options) => {
     setActionItem: (actionItem) => {
       $.actionOutput.data = actionItem;
     },
+    datastore: {
+      get: async ({ key }) => {
+        const datastore = await Datastore.query().findOne({
+          key,
+          scope: 'flow',
+          scope_id: $.flow.id,
+        });
+
+        return {
+          key: datastore.key,
+          value: datastore.value,
+          [datastore.key]: datastore.value,
+        };
+      },
+      set: async ({ key, value }) => {
+        let datastore = await Datastore.query()
+          .where({ key, scope: 'flow', scope_id: $.flow.id })
+          .first();
+
+        if (datastore) {
+          await datastore.$query().patchAndFetch({ value: value });
+        } else {
+          datastore = await Datastore.query().insert({
+            key,
+            value,
+            scope: 'flow',
+            scopeId: $.flow.id,
+          });
+        }
+
+        return {
+          key: datastore.key,
+          value: datastore.value,
+          [datastore.key]: datastore.value,
+        };
+      },
+    },
   };
 
   if (request) {

packages/backend/src/helpers/renderer.js

@@ -11,7 +11,7 @@ const isArray = (object) =>
 const totalCount = (object) =>
   isPaginated(object) ? object.totalCount : isArray(object) ? object.length : 1;
 
-const renderObject = (response, object) => {
+const renderObject = (response, object, options) => {
   let data = isPaginated(object) ? object.records : object;
 
   const type = isPaginated(object)
@@ -20,7 +20,9 @@ const renderObject = (response, object) => {
     ? object?.[0]?.constructor?.name || 'Object'
     : object.constructor.name;
 
-  const serializer = serializers[type];
+  const serializer = options?.serializer
+    ? serializers[options.serializer]
+    : serializers[type];
 
   if (serializer) {
     data = Array.isArray(data)

packages/backend/src/models/datastore.js

@@ -0,0 +1,24 @@
+import Base from './base.js';
+
+class Datastore extends Base {
+  static tableName = 'datastore';
+
+  static jsonSchema = {
+    type: 'object',
+    required: ['key', 'value', 'scope', 'scopeId'],
+
+    properties: {
+      id: { type: 'string', format: 'uuid' },
+      key: { type: 'string', minLength: 1 },
+      value: { type: 'string' },
+      scope: {
+        type: 'string',
+        enum: ['flow'],
+        default: 'flow',
+      },
+      scopeId: { type: 'string', format: 'uuid' },
+    },
+  };
+}
+
+export default Datastore;

packages/backend/src/routes/api/v1/apps.js

@@ -0,0 +1,10 @@
+import { Router } from 'express';
+import asyncHandler from 'express-async-handler';
+import { authenticateUser } from '../../../helpers/authentication.js';
+import getAppAction from '../../../controllers/api/v1/apps/get-app.js';
+
+const router = Router();
+
+router.get('/:appKey', authenticateUser, asyncHandler(getAppAction));
+
+export default router;

packages/backend/src/routes/index.js

@@ -8,6 +8,7 @@ import usersRouter from './api/v1/users.js';
 import paymentRouter from './api/v1/payment.ee.js';
 import appAuthClientsRouter from './api/v1/app-auth-clients.js';
 import flowsRouter from './api/v1/flows.js';
+import appsRouter from './api/v1/apps.js';
 import samlAuthProvidersRouter from './api/v1/admin/saml-auth-providers.ee.js';
 import rolesRouter from './api/v1/admin/roles.ee.js';
 import permissionsRouter from './api/v1/admin/permissions.ee.js';
@@ -25,6 +26,7 @@ router.use('/api/v1/users', usersRouter);
 router.use('/api/v1/payment', paymentRouter);
 router.use('/api/v1/app-auth-clients', appAuthClientsRouter);
 router.use('/api/v1/flows', flowsRouter);
+router.use('/api/v1/apps', appsRouter);
 router.use('/api/v1/admin/saml-auth-providers', samlAuthProvidersRouter);
 router.use('/api/v1/admin/roles', rolesRouter);
 router.use('/api/v1/admin/permissions', permissionsRouter);

packages/backend/src/serializers/app.js

@@ -0,0 +1,12 @@
+const appSerializer = (app) => {
+  return {
+    name: app.name,
+    key: app.key,
+    iconUrl: app.iconUrl,
+    authDocUrl: app.authDocUrl,
+    supportsConnections: app.supportsConnections,
+    primaryColor: app.primaryColor,
+  };
+};
+
+export default appSerializer;

packages/backend/src/serializers/app.test.js

@@ -0,0 +1,20 @@
+import { describe, it, expect } from 'vitest';
+import App from '../models/app';
+import appSerializer from './app';
+
+describe('appSerializer', () => {
+  it('should return permission data', async () => {
+    const app = await App.findOneByKey('deepl');
+
+    const expectedPayload = {
+      name: app.name,
+      key: app.key,
+      iconUrl: app.iconUrl,
+      authDocUrl: app.authDocUrl,
+      supportsConnections: app.supportsConnections,
+      primaryColor: app.primaryColor,
+    };
+
+    expect(appSerializer(app)).toEqual(expectedPayload);
+  });
+});

packages/backend/src/serializers/index.js

@@ -5,6 +5,7 @@ import samlAuthProviderSerializer from './saml-auth-provider.ee.js';
 import appAuthClientSerializer from './app-auth-client.js';
 import flowSerializer from './flow.js';
 import stepSerializer from './step.js';
+import appSerializer from './app.js';
 
 const serializers = {
   User: userSerializer,
@@ -14,6 +15,7 @@ const serializers = {
   AppAuthClient: appAuthClientSerializer,
   Flow: flowSerializer,
   Step: stepSerializer,
+  App: appSerializer,
 };
 
 export default serializers;

packages/backend/src/serializers/permission.js

@@ -5,8 +5,8 @@ const permissionSerializer = (permission) => {
     action: permission.action,
     subject: permission.subject,
     conditions: permission.conditions,
-    createdAt: permission.createdAt,
-    updatedAt: permission.updatedAt,
+    createdAt: permission.createdAt.getTime(),
+    updatedAt: permission.updatedAt.getTime(),
   };
 };
 

packages/backend/src/serializers/permission.test.js

@@ -16,8 +16,8 @@ describe('permissionSerializer', () => {
       action: permission.action,
       subject: permission.subject,
       conditions: permission.conditions,
-      createdAt: permission.createdAt,
-      updatedAt: permission.updatedAt,
+      createdAt: permission.createdAt.getTime(),
+      updatedAt: permission.updatedAt.getTime(),
     };
 
     expect(permissionSerializer(permission)).toEqual(expectedPayload);

packages/backend/src/serializers/role.js

@@ -6,8 +6,8 @@ const roleSerializer = (role) => {
     name: role.name,
     key: role.key,
     description: role.description,
-    createdAt: role.createdAt,
-    updatedAt: role.updatedAt,
+    createdAt: role.createdAt.getTime(),
+    updatedAt: role.updatedAt.getTime(),
     isAdmin: role.isAdmin,
   };
 

packages/backend/src/serializers/role.test.js

@@ -29,8 +29,8 @@ describe('roleSerializer', () => {
       name: role.name,
       key: role.key,
       description: role.description,
-      createdAt: role.createdAt,
-      updatedAt: role.updatedAt,
+      createdAt: role.createdAt.getTime(),
+      updatedAt: role.updatedAt.getTime(),
       isAdmin: role.isAdmin,
     };
 

packages/backend/src/serializers/user.js

@@ -6,8 +6,8 @@ const userSerializer = (user) => {
   let userData = {
     id: user.id,
     email: user.email,
-    createdAt: user.createdAt,
-    updatedAt: user.updatedAt,
+    createdAt: user.createdAt.getTime(),
+    updatedAt: user.updatedAt.getTime(),
     fullName: user.fullName,
   };
 

packages/backend/src/serializers/user.test.js

@@ -31,11 +31,11 @@ describe('userSerializer', () => {
     vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
 
     const expectedPayload = {
-      createdAt: user.createdAt,
+      createdAt: user.createdAt.getTime(),
       email: user.email,
       fullName: user.fullName,
       id: user.id,
-      updatedAt: user.updatedAt,
+      updatedAt: user.updatedAt.getTime(),
     };
 
     expect(userSerializer(user)).toEqual(expectedPayload);
@@ -67,7 +67,7 @@ describe('userSerializer', () => {
   it('should return user data with trial expiry date', async () => {
     vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
 
-    await user.$query().patch({
+    await user.$query().patchAndFetch({
       trialExpiryDate: DateTime.now().plus({ days: 30 }).toISODate(),
     });
 

packages/backend/test/mocks/rest/api/v1/admin/roles/get-role.ee.js

@@ -5,16 +5,16 @@ const getRoleMock = async (role, permissions) => {
     name: role.name,
     isAdmin: role.isAdmin,
     description: role.description,
-    createdAt: role.createdAt.toISOString(),
-    updatedAt: role.updatedAt.toISOString(),
+    createdAt: role.createdAt.getTime(),
+    updatedAt: role.updatedAt.getTime(),
     permissions: permissions.map((permission) => ({
       id: permission.id,
       action: permission.action,
       conditions: permission.conditions,
       roleId: permission.roleId,
       subject: permission.subject,
-      createdAt: permission.createdAt.toISOString(),
-      updatedAt: permission.updatedAt.toISOString(),
+      createdAt: permission.createdAt.getTime(),
+      updatedAt: permission.updatedAt.getTime(),
     })),
   };
 

packages/backend/test/mocks/rest/api/v1/admin/roles/get-roles.ee.js

@@ -6,8 +6,8 @@ const getRolesMock = async (roles) => {
       name: role.name,
       isAdmin: role.isAdmin,
       description: role.description,
-      createdAt: role.createdAt.toISOString(),
-      updatedAt: role.updatedAt.toISOString(),
+      createdAt: role.createdAt.getTime(),
+      updatedAt: role.updatedAt.getTime(),
     };
   });
 

packages/backend/test/mocks/rest/api/v1/admin/users/get-user.js

@@ -1,21 +1,21 @@
 const getUserMock = (currentUser, role) => {
   return {
     data: {
-      createdAt: currentUser.createdAt.toISOString(),
+      createdAt: currentUser.createdAt.getTime(),
       email: currentUser.email,
       fullName: currentUser.fullName,
       id: currentUser.id,
       role: {
-        createdAt: role.createdAt.toISOString(),
+        createdAt: role.createdAt.getTime(),
         description: null,
         id: role.id,
         isAdmin: role.isAdmin,
         key: role.key,
         name: role.name,
-        updatedAt: role.updatedAt.toISOString(),
+        updatedAt: role.updatedAt.getTime(),
       },
       trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
-      updatedAt: currentUser.updatedAt.toISOString(),
+      updatedAt: currentUser.updatedAt.getTime(),
     },
     meta: {
       count: 1,

packages/backend/test/mocks/rest/api/v1/admin/users/get-users.js

@@ -3,23 +3,23 @@ const getUsersMock = async (users, roles) => {
     const role = roles.find((r) => r.id === user.roleId);
 
     return {
-      createdAt: user.createdAt.toISOString(),
+      createdAt: user.createdAt.getTime(),
       email: user.email,
       fullName: user.fullName,
       id: user.id,
       role: role
         ? {
-            createdAt: role.createdAt.toISOString(),
+            createdAt: role.createdAt.getTime(),
             description: role.description,
             id: role.id,
             isAdmin: role.isAdmin,
             key: role.key,
             name: role.name,
-            updatedAt: role.updatedAt.toISOString(),
+            updatedAt: role.updatedAt.getTime(),
           }
         : null,
       trialExpiryDate: user.trialExpiryDate.toISOString(),
-      updatedAt: user.updatedAt.toISOString(),
+      updatedAt: user.updatedAt.getTime(),
     };
   });
 

packages/backend/test/mocks/rest/api/v1/apps/get-app.js

@@ -0,0 +1,21 @@
+const getAppMock = (app) => {
+  return {
+    data: {
+      authDocUrl: app.authDocUrl,
+      iconUrl: app.iconUrl,
+      key: app.key,
+      name: app.name,
+      primaryColor: app.primaryColor,
+      supportsConnections: app.supportsConnections,
+    },
+    meta: {
+      count: 1,
+      currentPage: null,
+      isArray: false,
+      totalPages: null,
+      type: 'Object',
+    },
+  };
+};
+
+export default getAppMock;

packages/backend/test/mocks/rest/api/v1/users/get-current-user.js

@@ -1,22 +1,22 @@
 const getCurrentUserMock = (currentUser, role) => {
   return {
     data: {
-      createdAt: currentUser.createdAt.toISOString(),
+      createdAt: currentUser.createdAt.getTime(),
       email: currentUser.email,
       fullName: currentUser.fullName,
       id: currentUser.id,
       permissions: [],
       role: {
-        createdAt: role.createdAt.toISOString(),
+        createdAt: role.createdAt.getTime(),
         description: null,
         id: role.id,
         isAdmin: role.isAdmin,
         key: role.key,
         name: role.name,
-        updatedAt: role.updatedAt.toISOString(),
+        updatedAt: role.updatedAt.getTime(),
       },
       trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
-      updatedAt: currentUser.updatedAt.toISOString(),
+      updatedAt: currentUser.updatedAt.getTime(),
     },
     meta: {
       count: 1,

packages/docs/pages/.vitepress/config.js

@@ -41,6 +41,15 @@ export default defineConfig({
             { text: 'Connection', link: '/apps/carbone/connection' },
           ],
         },
+        {
+          text: 'Datastore',
+          collapsible: true,
+          collapsed: true,
+          items: [
+            { text: 'Actions', link: '/apps/datastore/actions' },
+            { text: 'Connection', link: '/apps/datastore/connection' },
+          ],
+        },
         {
           text: 'DeepL',
           collapsible: true,
@@ -305,7 +314,7 @@ export default defineConfig({
           collapsed: true,
           items: [
             { text: 'Actions', link: '/apps/removebg/actions' },
-            { text: 'Connection', link: '/apps/removebg/connection' }
+            { text: 'Connection', link: '/apps/removebg/connection' },
           ],
         },
         {

packages/docs/pages/apps/datastore/actions.md

@@ -0,0 +1,14 @@
+---
+favicon: /favicons/datastore.svg
+items:
+  - name: Get value
+    desc: Get value from the persistent datastore.
+  - name: Set value
+    desc: Set value to the persistent datastore.
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />

packages/docs/pages/apps/datastore/connection.md

@@ -0,0 +1,3 @@
+# Datastore
+
+Datastore is a persistent key-value storage system that allows you to store and retrieve data. Currently you can use it within the scope of the flow, meaning you can store and retrieve data within the same flow.

packages/docs/pages/public/favicons/datastore.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" id="icon">
+  <defs>
+    <style>.cls-1{fill:none;}</style>
+  </defs>
+  <title>datastore</title>
+  <circle cx="23" cy="23" r="1"/>
+  <rect x="8" y="22" width="12" height="2"/>
+  <circle cx="23" cy="9" r="1"/>
+  <rect x="8" y="8" width="12" height="2"/>
+  <path d="M26,14a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H6A2,2,0,0,0,4,6v6a2,2,0,0,0,2,2H8v4H6a2,2,0,0,0-2,2v6a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2V20a2,2,0,0,0-2-2H24V14ZM6,6H26v6H6ZM26,26H6V20H26Zm-4-8H10V14H22Z"/>
+  <rect id="_Transparent_Rectangle_" data-name="&lt;Transparent Rectangle&gt;" class="cls-1" width="32" height="32"/>
+</svg>