Few adjustments to allow to use the server properly from the fronten…

electron-app/package.json

@@ -25,6 +25,7 @@
   "license": "MIT",
   "dependencies": {
     "compression": "^1.7.4",
+    "cors": "^2.8.5",
     "electron-squirrel-startup": "^1.0.0",
     "express": "^4.18.2",
     "rxjs": "^7.8.1",
@@ -41,6 +42,7 @@
     "@electron-forge/plugin-auto-unpack-natives": "^6.4.2",
     "@electron-forge/publisher-github": "^6.4.2",
     "@types/compression": "^1.7.5",
+    "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^6.12.0",

electron-app/src/logic/connector/infrastructure/connectors/folder.connector.ts

@@ -2,14 +2,7 @@ import { Blob as FSBlob } from 'buffer';
 import * as fs from 'fs';
 import path from 'path';
 import { Observable, forkJoin, map, of, switchMap } from 'rxjs';
-import {
-  ConnectorParameters,
-  FileStatus,
-  IConnector,
-  Link,
-  SearchResults,
-  SyncItem,
-} from 'src/logic/connector/domain/connector';
+import { ConnectorParameters, FileStatus, IConnector, Link, SearchResults, SyncItem } from '../../domain/connector';
 import { SourceConnectorDefinition } from '../factory';
 
 const FILES_TO_IGNORE = ['.DS_Store', 'Thumbs.db'];

electron-app/src/logic/connector/infrastructure/connectors/gdrive.connector.ts

@@ -29,7 +29,7 @@ export class GDriveImpl extends OAuthBaseConnector implements IConnector {
     if (!params?.token) {
       return false;
     }
-    if (!params?.refresh_token) {
+    if (!params?.refresh) {
       return false;
     }
     return true;

electron-app/src/logic/connector/infrastructure/connectors/tests/gdrive.connector.spec.js

@@ -79,7 +79,7 @@ describe('Test validate gdrive params', () => {
     expect(
       sourceConnector.areParametersValid({
         incorrect: 'test',
-        refresh_token: 'test',
+        refresh: 'test',
       }),
     ).toBe(false);
   });
@@ -88,7 +88,7 @@ describe('Test validate gdrive params', () => {
     expect(
       sourceConnector.areParametersValid({
         token: '',
-        refresh_token: '',
+        refresh: '',
       }),
     ).toBe(false);
   });
@@ -97,7 +97,7 @@ describe('Test validate gdrive params', () => {
     expect(
       sourceConnector.areParametersValid({
         token: 'test',
-        refresh_token: 'test',
+        refresh: 'test',
       }),
     ).toBe(true);
   });

electron-app/src/logic/sync/domain/dto/create-sync.dto.ts

@@ -28,10 +28,6 @@ export class CreateSyncDto {
     if (!connectorDefinition) {
       return ['Connector definition is not defined'];
     }
-    const sourceConnector = connectorDefinition.factory();
-    if (!sourceConnector.areParametersValid(props.connector.parameters)) {
-      return [`Connector ${props.connector.name} parameters are not valid`];
-    }
 
     if (!props.kb) {
       return ['The Knowledge Box info is mandatory'];

electron-app/src/logic/sync/domain/dto/tests/create-sync.dto.spec.ts

@@ -42,7 +42,7 @@ describe('Create Sync dto tests', () => {
     expect(dto).toBeUndefined();
   });
 
-  test('should not create a valid dto - connector params are not valid', () => {
+  test('should not create a valid dto - connector params are incomplete', () => {
     const [error, dto] = CreateSyncDto.create({
       ...props,
       id: undefined,
@@ -52,8 +52,8 @@ describe('Create Sync dto tests', () => {
       },
     });
 
-    expect(error).toEqual('Connector folder parameters are not valid');
-    expect(dto).toBeUndefined();
+    expect(error).toBeUndefined();
+    expect(dto).toBeDefined();
   });
 
   test('should not create a valid dto - kb params are not valid', () => {

electron-app/src/logic/sync/domain/sync.entity.ts

@@ -5,7 +5,7 @@ import { getConnector } from '../../connector/infrastructure/factory';
 
 export type Connector = {
   name: 'gdrive' | 'folder';
-  logo: string;
+  // logo: string;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   parameters: { [key: string]: any };
 };

electron-app/src/logic/sync/domain/use-cases/get-sync-auth.use-case.ts

@@ -0,0 +1,25 @@
+import { CustomError } from '../../../errors';
+import { ISyncRepository } from '../sync.repository';
+import { getConnector } from '../../../connector/infrastructure/factory';
+
+export interface GetSyncAuthUseCase {
+  execute(id: string): Promise<boolean>;
+}
+
+export class GetSyncAuth implements GetSyncAuthUseCase {
+  constructor(private readonly repository: ISyncRepository) {}
+
+  async execute(id: string) {
+    const data = await this.repository.getSync(id);
+    if (data === null) {
+      throw new CustomError(`Sync with id ${id} not found`, 404);
+    }
+    const connectorDefinition = getConnector(data.connector?.name || '');
+    if (!connectorDefinition) {
+      return false;
+    }
+    const sourceConnector = connectorDefinition.factory();
+    sourceConnector.setParameters(data.connector?.parameters ?? {});
+    return sourceConnector.hasAuthData();
+  }
+}

electron-app/src/logic/sync/presentation/routes.ts

@@ -11,6 +11,7 @@ import { GetSync } from '../domain/use-cases/get-sync.use-case';
 import { UpdateSync } from '../domain/use-cases/update-sync.use-case';
 import { FileSystemSyncDatasource } from '../infrastructure/file-system.sync.datasource';
 import { SyncRepository } from '../infrastructure/sync.repository';
+import { GetSyncAuth } from '../domain/use-cases/get-sync-auth.use-case';
 
 export class SyncFileSystemRoutes {
   private readonly basePath: string;
@@ -73,6 +74,16 @@ export class SyncFileSystemRoutes {
       }
     });
 
+    router.get('/:id/auth', async (req, res) => {
+      const { id } = req.params;
+      try {
+        const data = await new GetSyncAuth(syncRepository).execute(id);
+        res.status(200).send({ hasAuth: data });
+      } catch (error) {
+        this.handleError(res, error);
+      }
+    });
+
     router.get('/:id/folders', async (req, res) => {
       const { id } = req.params;
       try {

electron-app/src/server.ts

@@ -1,5 +1,6 @@
 import compression from 'compression';
 import express, { Router } from 'express';
+import cors from 'cors';
 import http from 'http';
 import { EVENTS, EventEmitter } from './events/events';
 
@@ -46,20 +47,30 @@ export class Server {
   }
 
   async start() {
+    //* CORS
+    this.app.use(
+      cors({
+        origin: '*',
+      }),
+    );
     //* Middlewares
     this.app.use(express.json()); // raw
     this.app.use(express.urlencoded({ extended: true })); // x-www-form-urlencoded
     this.app.use(compression());
+    this.app.use((req, res, next) => {
+      res.setHeader('Content-Type', 'application/json');
+      next();
+    });
 
     //* Routes
     this.app.use(this.routes);
 
     this.app.get('/', async (_req, res) => {
-      res.status(200).send('Server is running');
+      res.status(200).send(JSON.stringify('Server is running'));
     });
 
     this.app.get('/status', async (_req, res) => {
-      res.status(200).send('Server is running');
+      res.status(200).send(JSON.stringify({ running: true }));
     });
 
     this.app.post('/stop', async (_req, res) => {