New marketplace

docker-compose.dev.yml

@@ -30,6 +30,7 @@ services:
       - ./redis-data:/data
 
   zookeeper:
+    image: "confluentinc/cp-zookeeper:latest"
     image: "confluentinc/cp-zookeeper:latest"
     ports:
       - "2181:2181"
@@ -38,24 +39,34 @@ services:
       - ZOOKEEPER_TICK_TIME=2000
     volumes:
       - ./log4j.properties:/opt/bitnami/zookeeper/conf/log4j.properties
+      - ZOOKEEPER_CLIENT_PORT=2181
+      - ZOOKEEPER_TICK_TIME=2000
+    volumes:
+      - ./log4j.properties:/opt/bitnami/zookeeper/conf/log4j.properties
 
   kafka:
+    image: confluentinc/cp-kafka:latest
     image: confluentinc/cp-kafka:latest
     user: root
     ports:
       - "9092:9092"
     depends_on:
       - zookeeper
+    depends_on:
+      - zookeeper
     environment:
       - KAFKA_BROKER_ID=1
+      - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
       - KAFKA_LISTENERS=PLAINTEXT://:9092
       - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://127.0.0.1:9092
       - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
       - ALLOW_PLAINTEXT_LISTENER=yes
       - KAFKA_LOG4J_LOGGERS=org.apache.zookeeper=ERROR,org.apache.kafka=ERROR,kafka=ERROR,kafka.cluster=ERROR,kafka.controller=ERROR,kafka.coordinator=ERROR,kafka.log=ERROR,kafka.server=ERROR,kafka.zookeeper=ERROR,state.change.logger=ERROR
+      - KAFKA_LOG4J_LOGGERS=org.apache.zookeeper=ERROR,org.apache.kafka=ERROR,kafka=ERROR,kafka.cluster=ERROR,kafka.controller=ERROR,kafka.coordinator=ERROR,kafka.log=ERROR,kafka.server=ERROR,kafka.zookeeper=ERROR,state.change.logger=ERROR
     volumes:
       - ./Kafka:/bitnami/kafka
       - ./log4j.properties:/etc/kafka/log4j.properties
+      - ./log4j.properties:/etc/kafka/log4j.properties
 
   ocular-db:
     image: postgres:14-alpine
@@ -76,7 +87,7 @@ services:
     environment:
       - DATABASE_URL=postgresql://ocular:ocular@ocular-db:5432/ocular
       - DATABASE_NAME=ocular
-    command: npm run typeorm:local migration:run
+    command: npm run typeorm:dev migration:run
 
   pgadmin:
     image: dpage/pgadmin4

packages/apps/bitbucket/src/services/oauth.ts

@@ -25,6 +25,7 @@ class BitBucketOauth extends OauthService {
     const client_id = options.client_id;
     const client_secret = options.client_secret;
     const redirect = options.redirect_uri;
+    const auth_strategy = options.auth_strategy;
     return {
       name: AppNameDefinitions.BITBUCKET,
       logo: '/bitbucket.svg',
@@ -35,6 +36,7 @@ class BitBucketOauth extends OauthService {
       category: AppCategoryDefinitions.FILE_STORAGE,
       developer: 'Ocular AI',
       images: ['/bitbucket.svg'],
+      auth_strategy: auth_strategy,
       overview:
         'Bitbucket is a Git-based source code repository hosting service owned by Atlassian',
       docs: 'https://developer.atlassian.com/cloud/bitbucket/rest',

packages/apps/confluence/src/services/oauth.ts

@@ -25,6 +25,7 @@ class ConfluenceOauth extends OauthService {
     const client_id = options.client_id;
     const client_secret = options.client_secret;
     const redirect = options.redirect_uri;
+    const auth_strategy = options.auth_strategy;
 
     return {
       name: AppNameDefinitions.CONFLUENCE,
@@ -35,6 +36,7 @@ class ConfluenceOauth extends OauthService {
         redirect
       )}&response_type=code&prompt=consent`,
       slug: AppNameDefinitions.CONFLUENCE,
+      auth_strategy: auth_strategy,
       category: AppCategoryDefinitions.PRODUCTIVITY,
       developer: 'Ocular AI',
       images: ['/confluence.svg'],

packages/apps/github/src/services/oauth.ts

@@ -26,12 +26,14 @@ class GithubOauth extends OauthService {
     const client_id = options.client_id
     const client_secret = options.client_secret
     const redirect = options.redirect_uri
+    const auth_strategy = options.auth_strategy;
     return {
       name: AppNameDefinitions.GITHUB,
       logo: "/github.svg",
       description: "GitHub is a web code hosting platform for version control and collaboration. It lets you and others work together on projects from anywhere.",
       oauth_url: `https://github.com/apps/ocular-ai/installations/new`,
       slug:AppNameDefinitions.GITHUB,
+      auth_strategy: auth_strategy,
       category:AppCategoryDefinitions.SOTWARE_DEVELOPMENT,
       developer:"Ocular AI",
       images:["/github.svg"],

packages/apps/gmail/src/services/oauth.ts

@@ -37,7 +37,7 @@ class GmailOauth extends OauthService {
     });
     const client_id = options.client_id
     const client_secret = options.client_secret
-
+    const auth_strategy = options.auth_strategy;
     return {
       name: AppNameDefinitions.GMAIL,
       logo: "/gmail.png",
@@ -46,6 +46,7 @@ class GmailOauth extends OauthService {
       oauth_url: authorizeUrl,
       slug:AppNameDefinitions.GMAIL,
       category:AppCategoryDefinitions.FILE_STORAGE,
+      auth_strategy: auth_strategy,
       developer:"Ocular AI",
       images:["/gmail.png"],
       overview: "Gmail uses industry-leading encryption for all messages you receive and send. We never use your Gmail content to personalize ads.",

packages/apps/jira/src/services/oauth.ts

@@ -25,6 +25,7 @@ class JiarOauth extends OauthService {
     const client_id = options.client_id;
     const client_secret = options.client_secret;
     const redirect = options.redirect_uri;
+    const auth_strategy = options.auth_strategy;
     return {
       name: AppNameDefinitions.JIRA,
       logo: '/jira.svg',
@@ -34,6 +35,7 @@ class JiarOauth extends OauthService {
         redirect
       )}&response_type=code&prompt=consent`,
       slug: AppNameDefinitions.JIRA,
+      auth_strategy: auth_strategy,
       category: AppCategoryDefinitions.PRODUCTIVITY,
       developer: 'Ocular AI',
       images: ['/jira.svg'],

packages/apps/notion/src/services/oauth.ts

@@ -26,6 +26,7 @@ class NotionOauth extends OauthService {
     const client_id = options.client_id;
     const client_secret = options.client_secret;
     const redirect = options.redirect_uri;
+    const auth_strategy = options.auth_strategy;
     return {
       name: AppNameDefinitions.NOTION,
       logo: '/notion.svg',
@@ -37,6 +38,7 @@ class NotionOauth extends OauthService {
       slug: AppNameDefinitions.NOTION,
       category: AppCategoryDefinitions.PRODUCTIVITY,
       developer: 'Ocular AI',
+      auth_strategy: auth_strategy,
       images: ['/notion.svg'],
       overview:
         'Notion is a single space where you can think, write, and plan. Capture thoughts, manage projects, or even run an entire company — and do it exactly the way you want.',

packages/apps/slack/src/services/oauth.ts

@@ -25,6 +25,7 @@ class SlackOauth extends OauthService {
     const client_id = options.client_id;
     const client_secret = options.client_secret;
     const redirect = options.redirect_uri;
+    const auth_strategy = options.auth_strategy;
     return {
       name: AppNameDefinitions.SLACK,
       logo: '/slack.svg',
@@ -34,6 +35,7 @@ class SlackOauth extends OauthService {
       slug: AppNameDefinitions.SLACK,
       category: AppCategoryDefinitions.PRODUCTIVITY,
       developer: 'Ocular AI',
+      auth_strategy: auth_strategy,
       images: ['/slack.svg'],
       overview:
         'Slack is a new way to communicate with your team. Its faster, better organised and more secure than email.',