cleanup (#3401)

boxyhq · Dec 25, 2024 · 3317b35 · 3317b35
1 parent 3f586ef
commit 3317b35
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 310 deletions.
diff --git a/.env.example b/.env.example
@@ -107,10 +107,6 @@ BOXYHQ_HOSTED=0
 # Setup link expiry in days
 SETUP_LINK_EXPIRY_DAYS=3
 
-# Ory integration. You need BOXYHQ_LICENSE_KEY to be set to use this.
-ENTERPRISE_ORY_SDK_TOKEN=
-ENTERPRISE_ORY_PROJECT_ID=
-
 # Uncomment below if you wish to opt-out of sending `profile` scope in OIDC Provider Authorization Request
 #OPENID_REQUEST_PROFILE_SCOPE=false
 

diff --git a/lib/env.ts b/lib/env.ts
@@ -126,10 +126,6 @@ const jacksonOptions: JacksonOption = {
   },
   setupLinkExpiryDays,
   boxyhqHosted,
-  ory: {
-    projectId: process.env.ENTERPRISE_ORY_PROJECT_ID,
-    sdkToken: process.env.ENTERPRISE_ORY_SDK_TOKEN,
-  },
   ssoTraces,
 };
 

diff --git a/npm/src/controller/api.ts b/npm/src/controller/api.ts
@@ -24,19 +24,16 @@ import { JacksonError } from './error';
 import { IndexNames, appID, transformConnections, transformConnection, isConnectionActive } from './utils';
 import oidcConnection from './connection/oidc';
 import samlConnection from './connection/saml';
-import { OryController } from '../ee/ory/ory';
 
 export class ConnectionAPIController implements IConnectionAPIController {
   private connectionStore: Storable;
   private opts: JacksonOption;
   private eventController: IEventController;
-  private oryController: OryController;
 
-  constructor({ connectionStore, opts, eventController, oryController }) {
+  constructor({ connectionStore, opts, eventController }) {
     this.connectionStore = connectionStore;
     this.opts = opts;
     this.eventController = eventController;
-    this.oryController = oryController;
   }
 
   /**
@@ -198,7 +195,7 @@ export class ConnectionAPIController implements IConnectionAPIController {
   ): Promise<SAMLSSORecord> {
     metrics.increment('createConnection');
 
-    const connection = await samlConnection.create(body, this.connectionStore, this.oryController);
+    const connection = await samlConnection.create(body, this.connectionStore);
 
     await this.eventController.notify('sso.created', connection);
 
@@ -221,7 +218,7 @@ export class ConnectionAPIController implements IConnectionAPIController {
       throw new JacksonError('Please set OpenID response handler path (oidcPath) on Jackson', 500);
     }
 
-    const connection = await oidcConnection.create(body, this.connectionStore, this.oryController);
+    const connection = await oidcConnection.create(body, this.connectionStore);
 
     await this.eventController.notify('sso.created', connection);
 
@@ -378,8 +375,7 @@ export class ConnectionAPIController implements IConnectionAPIController {
     const connection = await samlConnection.update(
       body,
       this.connectionStore,
-      this.getConnections.bind(this),
-      this.oryController
+      this.getConnections.bind(this)
     );
 
     if ('deactivated' in body) {
@@ -406,8 +402,7 @@ export class ConnectionAPIController implements IConnectionAPIController {
     const connection = await oidcConnection.update(
       body,
       this.connectionStore,
-      this.getConnections.bind(this),
-      this.oryController
+      this.getConnections.bind(this)
     );
 
     if ('deactivated' in body) {

diff --git a/npm/src/controller/connection/oidc.ts b/npm/src/controller/connection/oidc.ts
@@ -18,13 +18,11 @@ import {
   validateSortOrder,
 } from '../utils';
 import { JacksonError } from '../error';
-import { OryController } from '../../ee/ory/ory';
 
 const oidc = {
   create: async (
     body: OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata,
-    connectionStore: Storable,
-    oryController: OryController
+    connectionStore: Storable
   ) => {
     validateSSOConnection(body, 'oidc');
 
@@ -87,9 +85,6 @@ const oidc = {
     record.clientID = dbutils.keyDigest(dbutils.keyFromParts(tenant, product, oidcClientId));
 
     const exists = await connectionStore.get(record.clientID);
-    const oryProjectId = exists?.ory?.projectId;
-    const oryOrganizationId = exists?.ory?.organizationId;
-
     if (exists) {
       connectionClientSecret = exists.clientSecret;
     } else {
@@ -98,21 +93,6 @@ const oidc = {
 
     record.clientSecret = connectionClientSecret;
 
-    const oryRes = await oryController.createConnection(
-      {
-        sdkToken: undefined,
-        projectId: oryProjectId,
-        domains: body.ory?.domains,
-        organizationId: oryOrganizationId,
-        error: undefined,
-      },
-      tenant,
-      product
-    );
-    if (oryRes) {
-      record.ory = oryRes;
-    }
-
     await connectionStore.put(
       record.clientID,
       record,
@@ -134,8 +114,7 @@ const oidc = {
   update: async (
     body: UpdateOIDCConnectionParams,
     connectionStore: Storable,
-    connectionsGetter: IConnectionAPIController['getConnections'],
-    oryController: OryController
+    connectionsGetter: IConnectionAPIController['getConnections']
   ) => {
     const {
       defaultRedirectUrl,
@@ -234,21 +213,6 @@ const oidc = {
       record['deactivated'] = body.deactivated;
     }
 
-    const oryRes = await oryController.updateConnection(
-      {
-        sdkToken: undefined,
-        projectId: _savedConnection.ory?.projectId,
-        domains: _savedConnection.ory?.domains,
-        organizationId: _savedConnection.ory?.organizationId,
-        error: undefined,
-      },
-      _savedConnection.tenant,
-      _savedConnection.product
-    );
-    if (oryRes) {
-      record.ory = oryRes;
-    }
-
     await connectionStore.put(
       clientInfo?.clientID,
       record,

diff --git a/npm/src/controller/connection/saml.ts b/npm/src/controller/connection/saml.ts
@@ -22,7 +22,6 @@ import {
   validateSortOrder,
 } from '../utils';
 import { JacksonError } from '../error';
-import { OryController } from '../../ee/ory/ory';
 
 async function fetchMetadata(resource: string) {
   try {
@@ -60,8 +59,7 @@ function validateMetadataURL(metadataUrl: string) {
 const saml = {
   create: async (
     body: SAMLSSOConnectionWithRawMetadata | SAMLSSOConnectionWithEncodedMetadata,
-    connectionStore: Storable,
-    oryController: OryController
+    connectionStore: Storable
   ) => {
     const {
       encodedRawMetadata,
@@ -155,8 +153,6 @@ const saml = {
     }
 
     const exists = await connectionStore.get(record.clientID);
-    const oryProjectId = exists?.ory?.projectId;
-    const oryOrganizationId = exists?.ory?.organizationId;
 
     if (exists) {
       connectionClientSecret = exists.clientSecret;
@@ -166,21 +162,6 @@ const saml = {
 
     record.clientSecret = connectionClientSecret;
 
-    const oryRes = await oryController.createConnection(
-      {
-        sdkToken: undefined,
-        projectId: oryProjectId,
-        domains: body.ory?.domains,
-        organizationId: oryOrganizationId,
-        error: undefined,
-      },
-      tenant,
-      product
-    );
-    if (oryRes) {
-      record.ory = oryRes;
-    }
-
     await connectionStore.put(
       record.clientID,
       record,
@@ -206,8 +187,7 @@ const saml = {
   update: async (
     body: UpdateSAMLConnectionParams,
     connectionStore: Storable,
-    connectionsGetter: IConnectionAPIController['getConnections'],
-    oryController: OryController
+    connectionsGetter: IConnectionAPIController['getConnections']
   ) => {
     const {
       encodedRawMetadata, // could be empty
@@ -319,21 +299,6 @@ const saml = {
       record['identifierFormat'] = body.identifierFormat;
     }
 
-    const oryRes = await oryController.updateConnection(
-      {
-        sdkToken: undefined,
-        projectId: _savedConnection.ory?.projectId,
-        domains: _savedConnection.ory?.domains,
-        organizationId: _savedConnection.ory?.organizationId,
-        error: undefined,
-      },
-      _savedConnection.tenant,
-      _savedConnection.product
-    );
-    if (oryRes) {
-      record.ory = oryRes;
-    }
-
     await connectionStore.put(
       clientInfo?.clientID,
       record,