fix: improvements

Signed-off-by: Jan <60812202+janrtvld@users.noreply.github.com>
openwallet-foundation · Apr 5, 2022 · d2bf71f · d2bf71f
1 parent d214917
commit d2bf71f
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 21 deletions.
diff --git a/packages/rest/samples/utils/GreetingController.ts b/packages/rest/samples/utils/GreetingController.ts
@@ -1,13 +1,13 @@
 import { Agent, AgentConfig } from '@aries-framework/core'
 import { Get, JsonController } from 'routing-controllers'
-import { injectable, inject } from 'tsyringe'
+import { injectable } from 'tsyringe'
 
 @JsonController('/greeting')
 @injectable()
 export class GreetingController {
   private agent: Agent
 
-  public constructor(@inject('agent') agent: Agent) {
+  public constructor(agent: Agent) {
     this.agent = agent
   }
 

diff --git a/packages/rest/src/controllers/agent/AgentController.ts b/packages/rest/src/controllers/agent/AgentController.ts
@@ -1,13 +1,13 @@
 import { Agent } from '@aries-framework/core'
 import { Get, JsonController } from 'routing-controllers'
-import { inject, injectable } from 'tsyringe'
+import { injectable } from 'tsyringe'
 
 @JsonController('/agent')
 @injectable()
 export class AgentController {
   private agent: Agent
 
-  public constructor(@inject('agent') agent: Agent) {
+  public constructor(agent: Agent) {
     this.agent = agent
   }
 

diff --git a/packages/rest/src/controllers/basic-messages/BasicMessageController.ts b/packages/rest/src/controllers/basic-messages/BasicMessageController.ts
@@ -9,7 +9,7 @@ import {
   Param,
   Post,
 } from 'routing-controllers'
-import { inject, injectable } from 'tsyringe'
+import { injectable } from 'tsyringe'
 
 import { BasicMessageRequest } from '../../schemas/BasicMessageRequest'
 
@@ -18,7 +18,7 @@ import { BasicMessageRequest } from '../../schemas/BasicMessageRequest'
 export class BasicMessageController {
   private agent: Agent
 
-  public constructor(@inject('agent') agent: Agent) {
+  public constructor(agent: Agent) {
     this.agent = agent
   }
 

diff --git a/packages/rest/src/controllers/connections/ConnectionController.ts b/packages/rest/src/controllers/connections/ConnectionController.ts
@@ -10,7 +10,7 @@ import {
   Param,
   Post,
 } from 'routing-controllers'
-import { inject, injectable } from 'tsyringe'
+import { injectable } from 'tsyringe'
 
 import { InvitationConfigRequest } from '../../schemas/InvitationConfigRequest'
 import { ReceiveInvitationByUrlRequest } from '../../schemas/ReceiveInvitationByUrlRequest'
@@ -21,7 +21,7 @@ import { ReceiveInvitationRequest } from '../../schemas/ReceiveInvitationRequest
 export class ConnectionController {
   private agent: Agent
 
-  public constructor(@inject('agent') agent: Agent) {
+  public constructor(agent: Agent) {
     this.agent = agent
   }
 

diff --git a/packages/rest/src/controllers/credentials/CredentialController.ts b/packages/rest/src/controllers/credentials/CredentialController.ts
@@ -12,7 +12,7 @@ import {
   Delete,
   OnUndefined,
 } from 'routing-controllers'
-import { injectable, inject } from 'tsyringe'
+import { injectable } from 'tsyringe'
 
 import { AcceptCredentialProposalRequest } from '../../schemas/AcceptCredentialProposalRequest'
 import { CredentialOfferRequest } from '../../schemas/CredentialOfferRequest'
@@ -24,7 +24,7 @@ import { CredentialProposalRequest } from '../../schemas/CredentialProposalReque
 export class CredentialController {
   private agent: Agent
 
-  public constructor(@inject('agent') agent: Agent) {
+  public constructor(agent: Agent) {
     this.agent = agent
   }
 

diff --git a/packages/rest/src/controllers/credentials/CredentialDefinitionController.ts b/packages/rest/src/controllers/credentials/CredentialDefinitionController.ts
@@ -12,7 +12,7 @@ import {
   Param,
   Post,
 } from 'routing-controllers'
-import { injectable, inject } from 'tsyringe'
+import { injectable } from 'tsyringe'
 
 import { CredentialDefinitionRequest } from '../../schemas/CredentialDefinitionRequest'
 
@@ -21,7 +21,7 @@ import { CredentialDefinitionRequest } from '../../schemas/CredentialDefinitionR
 export class CredentialDefinitionController {
   private agent: Agent
 
-  public constructor(@inject('agent') agent: Agent) {
+  public constructor(agent: Agent) {
     this.agent = agent
   }
 

diff --git a/packages/rest/src/controllers/credentials/SchemaController.ts b/packages/rest/src/controllers/credentials/SchemaController.ts
@@ -13,7 +13,7 @@ import {
   Param,
   Body,
 } from 'routing-controllers'
-import { inject, injectable } from 'tsyringe'
+import { injectable } from 'tsyringe'
 
 import { SchemaTemplate } from '../../schemas/SchemaRequest'
 
@@ -22,7 +22,7 @@ import { SchemaTemplate } from '../../schemas/SchemaRequest'
 export class SchemaController {
   private agent: Agent
 
-  public constructor(@inject('agent') agent: Agent) {
+  public constructor(agent: Agent) {
     this.agent = agent
   }
 

diff --git a/packages/rest/src/controllers/proofs/ProofController.ts b/packages/rest/src/controllers/proofs/ProofController.ts
@@ -12,7 +12,7 @@ import {
   Post,
   QueryParam,
 } from 'routing-controllers'
-import { inject, injectable } from 'tsyringe'
+import { injectable } from 'tsyringe'
 
 import { AcceptProofProposalRequest } from '../../schemas/AcceptProofProposalRequest'
 import { PresentationProofRequest } from '../../schemas/PresentationProofRequest'
@@ -25,7 +25,7 @@ import { ProofRequestTemplate } from '../../schemas/ProofRequestTemplate'
 export class ProofController {
   private agent: Agent
 
-  public constructor(@inject('agent') agent: Agent) {
+  public constructor(agent: Agent) {
     this.agent = agent
   }
 

diff --git a/packages/rest/src/server.ts b/packages/rest/src/server.ts
@@ -1,8 +1,8 @@
 import 'reflect-metadata'
 import type { ServerConfig } from './utils/ServerConfig'
-import type { Agent } from '@aries-framework/core'
 import type { Express } from 'express'
 
+import { Agent } from '@aries-framework/core'
 import { validationMetadatasToSchemas } from 'class-validator-jsonschema'
 import { createExpressServer, getMetadataArgsStorage, useContainer, useExpressServer } from 'routing-controllers'
 import { routingControllersToSpec } from 'routing-controllers-openapi'
@@ -19,7 +19,7 @@ import TsyringeAdapter from './utils/TsyringeAdapter'
 const packageJson = require('../package.json')
 
 export const setupServer = async (agent: Agent, config: ServerConfig) => {
-  container.register('agent', { useValue: agent })
+  container.registerInstance(Agent, agent)
   useContainer(new TsyringeAdapter(container))
 
   // eslint-disable-next-line @typescript-eslint/ban-types

diff --git a/packages/rest/src/utils/TsyringeAdapter.ts b/packages/rest/src/utils/TsyringeAdapter.ts
@@ -2,12 +2,10 @@ import type { ClassConstructor, IocAdapter } from 'routing-controllers'
 import type { DependencyContainer } from 'tsyringe'
 
 class TsyringeAdapter implements IocAdapter {
-  // eslint-disable-next-line no-unused-vars,no-useless-constructor,no-empty-function
   public constructor(private readonly TsyringeContainer: DependencyContainer) {}
 
   public get<T>(someClass: ClassConstructor<T>): T {
-    const childContainer = this.TsyringeContainer.createChildContainer()
-    return childContainer.resolve<T>(someClass)
+    return this.TsyringeContainer.resolve<T>(someClass)
   }
 }