Move common code

Author: MarceloRGonc

packages/react-ui/src/app/constants/cloud.ts

@@ -1,4 +1,4 @@
-export const OPENOPS_CLOUD_URL = 'https://test.internal.openops.com';
+export const OPENOPS_CLOUD_URL = 'https://app.openops.com';
 export const OPENOPS_CONNECT_TEMPLATES_URL = `${OPENOPS_CLOUD_URL}/connect`;
 export const OPENOPS_CONNECT_TEMPLATES_LOGOUT_URL = `${OPENOPS_CLOUD_URL}/oauth/logout`;
 export const OPENOPS_CONNECT_TEMPLATES_POLL_INTERVAL_MS = 800;

packages/server/api/src/app/flow-template/cloud-template.controller.ts

@@ -4,6 +4,7 @@ import {
 } from '@fastify/type-provider-typebox';
 import { AppSystemProp, logger, system } from '@openops/server-shared';
 import { ALL_PRINCIPAL_TYPES, OpenOpsId } from '@openops/shared';
+import { allowAllOriginsHookHandler } from '../helper/allow-all-origins-hook-handler';
 import { getVerifiedUser } from '../user-info/cloud-auth';
 import { flowTemplateService } from './flow-template.service';
 
@@ -23,24 +24,7 @@ export const cloudTemplateController: FastifyPluginAsyncTypebox = async (
   }
 
   // cloud templates are available on any origin
-  app.addHook('onSend', (request, reply, payload, done) => {
-    void reply.header(
-      'Access-Control-Allow-Origin',
-      request.headers.origin || request.headers['Ops-Origin'] || '*',
-    );
-    void reply.header('Access-Control-Allow-Methods', 'GET,OPTIONS');
-    void reply.header(
-      'Access-Control-Allow-Headers',
-      'Content-Type,Ops-Origin,Authorization',
-    );
-    void reply.header('Access-Control-Allow-Credentials', 'true');
-    if (request.method === 'OPTIONS') {
-      return reply.status(204).send();
-    }
-
-    done(null, payload);
-    return;
-  });
+  app.addHook('onSend', allowAllOriginsHookHandler);
 
   app.get(
     '/',
@@ -67,8 +51,6 @@ export const cloudTemplateController: FastifyPluginAsyncTypebox = async (
     async (request) => {
       const user = getVerifiedUser(request, publicKey);
       if (!user) {
-        logger.info('User is not authenticated');
-
         return flowTemplateService.getFlowTemplates({
           search: request.query.search,
           tags: request.query.tags,
@@ -84,8 +66,6 @@ export const cloudTemplateController: FastifyPluginAsyncTypebox = async (
         });
       }
 
-      logger.info('User is authenticated');
-      return [];
       return flowTemplateService.getFlowTemplates({
         search: request.query.search,
         tags: request.query.tags,

packages/server/api/src/app/helper/allow-all-origins-hook-handler.ts

@@ -0,0 +1,29 @@
+import { onSendHookHandler } from 'fastify/types/hooks';
+
+export const allowAllOriginsHookHandler: onSendHookHandler = (
+  request,
+  reply,
+  payload,
+  done,
+) => {
+  void reply.header(
+    'Access-Control-Allow-Origin',
+    request.headers.origin || request.headers['Ops-Origin'] || '*',
+  );
+
+  void reply.header('Access-Control-Allow-Methods', 'GET,OPTIONS');
+
+  void reply.header(
+    'Access-Control-Allow-Headers',
+    'Content-Type,Ops-Origin,Authorization',
+  );
+
+  void reply.header('Access-Control-Allow-Credentials', 'true');
+
+  if (request.method === 'OPTIONS') {
+    return reply.status(204).send();
+  }
+
+  done(null, payload);
+  return;
+};

packages/server/api/src/app/user-info/user-info.module.ts

@@ -1,6 +1,7 @@
 import { FastifyPluginAsyncTypebox } from '@fastify/type-provider-typebox';
 import { AppSystemProp, logger, system } from '@openops/server-shared';
 import { ALL_PRINCIPAL_TYPES } from '@openops/shared';
+import { allowAllOriginsHookHandler } from '../helper/allow-all-origins-hook-handler';
 import { getVerifiedUser } from './cloud-auth';
 
 export const userInfoModule: FastifyPluginAsyncTypebox = async (app) => {
@@ -21,24 +22,7 @@ export const userInfoController: FastifyPluginAsyncTypebox = async (app) => {
   }
 
   // user-info is available on any origin
-  app.addHook('onSend', (request, reply, payload, done) => {
-    void reply.header(
-      'Access-Control-Allow-Origin',
-      request.headers.origin || request.headers['Ops-Origin'] || '*',
-    );
-    void reply.header('Access-Control-Allow-Methods', 'GET,OPTIONS');
-    void reply.header(
-      'Access-Control-Allow-Headers',
-      'Content-Type,Ops-Origin,Authorization',
-    );
-    void reply.header('Access-Control-Allow-Credentials', 'true');
-    if (request.method === 'OPTIONS') {
-      return reply.status(204).send();
-    }
-
-    done(null, payload);
-    return;
-  });
+  app.addHook('onSend', allowAllOriginsHookHandler);
 
   app.get(
     '/',
@@ -52,11 +36,9 @@ export const userInfoController: FastifyPluginAsyncTypebox = async (app) => {
       const user = getVerifiedUser(request, publicKey);
 
       if (!user) {
-        logger.info('User is not authenticated');
         return reply.status(401).send();
       }
 
-      logger.info('User is authenticated');
       return user;
     },
   );