fix(backend): fix OP resource tests (#2969)

* feat(backend): create operator kratos identity on backend startup * chore: formatting * Add migration files * Update migration files * Fix file name for migrations * feat(auth): create basic tenant service and model plus graphql schema * feat(auth): add basic tenant schema and appropriate resources like model and service * feat(backend): add apollo client do dependencies * feat(auth): delete tenant * chore(auth): format * feat(backend): create tenant service implementation * feat(packages): make multi tenant work wip * feat(backend): update resolvers with tenant id and finish the tenant creation * feat(backend): small changes to schema + mapping of tenant to graphql + bruno * fix: outgoing/quote tests * fix: combined payments tests * chore: formatting * fix: update tenant id requirements for some services * chore: fix rebase issues * chore: try to fix apollo errors in ilp payment method tests --------- Co-authored-by: bsanduc <[email protected]> Co-authored-by: golobitch <[email protected]>
interledger · Oct 10, 2024 · 7bcb13a · 7bcb13a
1 parent 3ab716c
commit 7bcb13a
Show file tree

Hide file tree

Showing 30 changed files with 99 additions and 327 deletions.
diff --git a/localenv/mock-account-servicing-entity/generated/graphql.ts b/localenv/mock-account-servicing-entity/generated/graphql.ts
diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts
@@ -105,42 +105,6 @@ export function initIocContainer(
     }
   )
 
-  container.singleton(
-    'tenantService',
-    async (deps: IocContract<AppServices>) => {
-      const [logger, knex] = await Promise.all([
-        deps.use('logger'),
-        deps.use('knex')
-      ])
-
-      return createTenantService({ logger, knex })
-    }
-  )
-
-  container.singleton(
-    'tenantService',
-    async (deps: IocContract<AppServices>) => {
-      const [logger, knex] = await Promise.all([
-        deps.use('logger'),
-        deps.use('knex')
-      ])
-
-      return createTenantService({ logger, knex })
-    }
-  )
-
-  container.singleton(
-    'tenantService',
-    async (deps: IocContract<AppServices>) => {
-      const [logger, knex] = await Promise.all([
-        deps.use('logger'),
-        deps.use('knex')
-      ])
-
-      return createTenantService({ logger, knex })
-    }
-  )
-
   container.singleton(
     'accessService',
     async (deps: IocContract<AppServices>) => {

diff --git a/packages/backend/migrations/20240827115832_update_resources_with_tenantId.js b/packages/backend/migrations/20240827115832_update_resources_with_tenantId.js
@@ -20,10 +20,6 @@ exports.up = function (knex) {
       table.uuid('tenantId').notNullable()
       table.foreign('tenantId').references('id').inTable('tenants')
     })
-    .table('grants', function (table) {
-      table.uuid('tenantId').notNullable()
-      table.foreign('tenantId').references('id').inTable('tenants')
-    })
 }
 
 /**
@@ -48,8 +44,4 @@ exports.down = function (knex) {
       table.dropForeign(['tenantId'])
       table.dropColumn('tenantId')
     })
-    .table('grants', function (table) {
-      table.dropForeign(['tenantId'])
-      table.dropColumn('tenantId')
-    })
 }
diff --git a/packages/backend/src/graphql/generated/graphql.schema.json b/packages/backend/src/graphql/generated/graphql.schema.json
diff --git a/packages/backend/src/graphql/generated/graphql.ts b/packages/backend/src/graphql/generated/graphql.ts
diff --git a/packages/backend/src/graphql/resolvers/outgoing_payment.test.ts b/packages/backend/src/graphql/resolvers/outgoing_payment.test.ts
@@ -740,6 +740,7 @@ describe('OutgoingPayment Resolvers', (): void => {
 
       const input = {
         walletAddressId: payment.walletAddressId,
+        tenantId,
         incomingPayment: mockIncomingPaymentUrl,
         debitAmount: {
           value: BigInt(56),
@@ -781,6 +782,7 @@ describe('OutgoingPayment Resolvers', (): void => {
 
       const input = {
         walletAddressId: uuid(),
+        tenantId,
         incomingPayment: mockIncomingPaymentUrl,
         debitAmount: {
           value: BigInt(56),
@@ -832,6 +834,7 @@ describe('OutgoingPayment Resolvers', (): void => {
 
       const input = {
         walletAddressId: uuid(),
+        tenantId,
         incomingPayment: mockIncomingPaymentUrl,
         debitAmount: {
           value: BigInt(56),

diff --git a/packages/backend/src/graphql/resolvers/quote.test.ts b/packages/backend/src/graphql/resolvers/quote.test.ts
@@ -71,7 +71,6 @@ describe('Quote Resolvers', (): void => {
   ): Promise<QuoteModel> => {
     return await createQuote(deps, {
       walletAddressId,
-      tenantId,
       receiver,
       debitAmount: {
         value: BigInt(56),
@@ -195,7 +194,6 @@ describe('Quote Resolvers', (): void => {
       }
       input = {
         walletAddressId: uuid(),
-        tenantId: uuid(),
         receiver,
         debitAmount
       }
@@ -217,7 +215,6 @@ describe('Quote Resolvers', (): void => {
       )
       const input = {
         walletAddressId,
-        tenantId,
         debitAmount: amount,
         receiveAmount,
         receiver

diff --git a/packages/backend/src/graphql/resolvers/quote.ts b/packages/backend/src/graphql/resolvers/quote.ts
@@ -42,7 +42,6 @@ export const createQuote: MutationResolvers<ApolloContext>['createQuote'] =
     const quoteService = await ctx.container.use('quoteService')
     const options: CreateQuoteOptions = {
       walletAddressId: args.input.walletAddressId,
-      tenantId: args.input.tenantId,
       receiver: args.input.receiver,
       method: 'ilp'
     }

diff --git a/packages/backend/src/graphql/resolvers/tenant_endpoints.ts b/packages/backend/src/graphql/resolvers/tenant_endpoints.ts
@@ -1,10 +1,5 @@
-import { ApolloContext } from '../../app'
-import { Pagination, SortOrder } from '../../shared/baseModel'
-import { getPageInfo } from '../../shared/pagination'
 import { EndpointType, TenantEndpoint } from '../../tenant/endpoints/model'
 import {
-  ResolversTypes,
-  TenantResolvers,
   TenantEndpoint as SchemaTenantEndpoint,
   TenantEndpointType
 } from '../generated/graphql'
@@ -14,45 +9,6 @@ export const mapTenantEndpointTypeToModelEndpointType = {
   [EndpointType.WebhookBaseUrl]: TenantEndpointType.WebhookBaseUrl
 }
 
-export const getTenantEndpoints: TenantResolvers<ApolloContext>['endpoints'] =
-  async (
-    parent,
-    args,
-    ctx
-  ): Promise<ResolversTypes['TenantEndpointsConnection']> => {
-    if (!parent.id) {
-      throw new Error('missing tenant id')
-    }
-    const tenantEndpointService = await ctx.container.use(
-      'tenantEndpointService'
-    )
-
-    const { sortOrder, ...pagination } = args
-    const order = sortOrder === 'ASC' ? SortOrder.Asc : SortOrder.Desc
-
-    const tenantEndpoints = await tenantEndpointService.getPage(
-      parent.id,
-      pagination,
-      order
-    )
-
-    console.log('TENANT ENDPOINTS: ', tenantEndpoints)
-
-    const pageInfo = await getPageInfo({
-      getPage: (pagination_?: Pagination, sortOrder_?: SortOrder) =>
-        tenantEndpointService.getPage(parent.id!, pagination_, sortOrder_),
-      page: tenantEndpoints
-    })
-
-    return {
-      pageInfo,
-      edges: tenantEndpoints.map((endpoint: TenantEndpoint) => ({
-        cursor: `${endpoint.tenantId}${endpoint.type}`,
-        node: tenantEndpointToGraphql(endpoint)
-      }))
-    }
-  }
-
 export function tenantEndpointToGraphql(
   tenantEndpoint: TenantEndpoint
 ): SchemaTenantEndpoint {

diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql
@@ -1071,8 +1071,6 @@ input CreateQuoteInput {
   receiver: String!
   "Unique key to ensure duplicate or retried requests are processed only once. See [idempotence](https://en.wikipedia.org/wiki/Idempotence)"
   idempotencyKey: String
-  "ID of the tenant"
-  tenantId: ID!
 }
 
 type QuoteResponse {
@@ -1110,6 +1108,8 @@ input CreateOutgoingPaymentFromIncomingPaymentInput {
   metadata: JSONObject
   "Unique key to ensure duplicate or retried requests are processed only once. See [idempotence](https://en.wikipedia.org/wiki/Idempotence)"
   idempotencyKey: String
+  "ID of a tenant"
+  tenantId: ID!
 }
 
 input CreateIncomingPaymentInput {

diff --git a/packages/backend/src/open_payments/grant/model.ts b/packages/backend/src/open_payments/grant/model.ts
@@ -32,7 +32,6 @@ export class Grant extends BaseModel {
   public managementId!: string
   public accessType!: AccessType
   public accessActions!: AccessAction[]
-  public tenantId!: string
   public expiresAt?: Date | null
   public deletedAt?: Date