fix(acs): fix decorator declaration

restorecommerce · Oct 13, 2023 · 9847528 · 9847528
1 parent e6a4d24
commit 9847528
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/packages/acs-client/src/acs/decorators.ts b/packages/acs-client/src/acs/decorators.ts
@@ -33,7 +33,7 @@ import {
 export type ACSClientContextFactory = (self: any, ...args: any) => Promise<ACSClientContext>;
 export type ResourceFactory = (self: any, ...args: any) => Promise<Resource[]>;
 
-export function access_controlled_service<T extends { new (...args: any): {} }>(baseService: T) {
+export function access_controlled_service<T extends { new (...args: any): {} }>(baseService: T): any {
   return class extends baseService {
     public readonly user_service: Client<UserServiceDefinition>;
 

diff --git a/packages/facade/src/modules/access-control/gql/schema.generated.ts b/packages/facade/src/modules/access-control/gql/schema.generated.ts
@@ -63,8 +63,8 @@ export type IoRestorecommerceAccessControlResponse = {
 };
 
 export enum IoRestorecommerceAccessControlResponseDecision {
-  Permit = 0,
-  Deny = 1,
+  Deny = 0,
+  Permit = 1,
   NotApplicable = 2,
   Indeterminate = 3
 }
@@ -902,7 +902,7 @@ export type IoRestorecommerceAccessControlResponseResolvers<ContextType = Access
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
-export type IoRestorecommerceAccessControlResponseDecisionResolvers = { PERMIT: 0, DENY: 1, NOT_APPLICABLE: 2, INDETERMINATE: 3 };
+export type IoRestorecommerceAccessControlResponseDecisionResolvers = { DENY: 0, PERMIT: 1, NOT_APPLICABLE: 2, INDETERMINATE: 3 };
 
 export type IoRestorecommerceAttributeAttributeResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommerceAttributeAttribute'] = ResolversParentTypes['IoRestorecommerceAttributeAttribute']> = ResolversObject<{
   id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;

diff --git a/packages/facade/src/modules/identity/gql/schema.generated.ts b/packages/facade/src/modules/identity/gql/schema.generated.ts
@@ -718,6 +718,7 @@ export type IIoRestorecommerceUserRegisterRequest = {
   defaultScope?: InputMaybe<Scalars['String']['input']>;
   userType?: InputMaybe<IoRestorecommerceUserUserType>;
   captchaCode?: InputMaybe<Scalars['String']['input']>;
+  data?: InputMaybe<IGoogleProtobufAny>;
 };
 
 export type ProtoIoRestorecommerceStatusOperationStatusObj = {

diff --git a/packages/facade/src/modules/invoicing/gql/schema.generated.ts b/packages/facade/src/modules/invoicing/gql/schema.generated.ts
@@ -1166,6 +1166,7 @@ export type ProtoIoRestorecommerceInvoiceInvoiceNumberResponse = {
 export type IoRestorecommerceInvoiceInvoiceNumberResponse = {
   __typename?: 'IoRestorecommerceInvoiceInvoiceNumberResponse';
   invoiceNumber?: Maybe<Scalars['String']['output']>;
+  operationStatus?: Maybe<IoRestorecommerceStatusOperationStatus>;
 };
 
 export type IIoRestorecommerceInvoiceRequestInvoiceNumber = {
@@ -2332,6 +2333,7 @@ export type ProtoIoRestorecommerceInvoiceInvoiceNumberResponseResolvers<ContextT
 
 export type IoRestorecommerceInvoiceInvoiceNumberResponseResolvers<ContextType = InvoicingContext, ParentType extends ResolversParentTypes['IoRestorecommerceInvoiceInvoiceNumberResponse'] = ResolversParentTypes['IoRestorecommerceInvoiceInvoiceNumberResponse']> = ResolversObject<{
   invoiceNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  operationStatus?: Resolver<Maybe<ResolversTypes['IoRestorecommerceStatusOperationStatus']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 

diff --git a/packages/service-config/src/index.ts b/packages/service-config/src/index.ts
@@ -1,5 +1,4 @@
 import * as path from 'path';
-import * as nconf from 'nconf';
 import { Provider as ServiceConfig } from 'nconf';
 
 export interface ServiceConfigLogger {
@@ -29,7 +28,7 @@ export interface ServiceConfigOptions {
 
 // read the layered configurations and merge into one
 export function createServiceConfig(baseDir: string, opts:ServiceConfigOptions = {}): ServiceConfig {
-  const nconfInstance = new nconf.Provider();
+  const nconfInstance = new ServiceConfig();
   const logger = opts.logger;
 
   // static data from runtime