Skip to content

Commit

Permalink
Merge f9a4608 into 3cbf803
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed May 7, 2024
2 parents 3cbf803 + f9a4608 commit 7b8ad6d
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 10 deletions.
13 changes: 7 additions & 6 deletions packages/acs-client/src/acs/decorators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,18 @@ export const DefaultACSClientContextFactory = async <T extends ResourceList>(
});

export function DefaultResourceFactory<T extends ResourceList>(
resourceName: string
...resourceNames: string[]
): ResourceFactory<T> {
return async (
self: any,
request: T,
context: any,
) => [{
resource: resourceName,
id: request.items?.map((item: any) => item.id)
}];
) => resourceNames.map(
resourceName => ({
resource: resourceName,
id: request.items?.map((item: any) => item.id)
})
);
}

export const DefaultMetaDataInjector = async <T extends ResourceList>(
Expand Down Expand Up @@ -213,7 +215,6 @@ export function access_controlled_function<T extends ResourceList>(kwargs: {
}
catch (err: any) {
return {
decision: Response_Decision.DENY,
operation_status: {
code: err.code ?? 500,
message: err.details ?? err.message ?? err,
Expand Down
2 changes: 1 addition & 1 deletion packages/acs-client/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ export const createResourceFilterMap = async (
*
*/
export const mapResourceURNObligationProperties = (obligations: Attribute[]): Obligation[] => {
let mappedResourceObligation: Obligation[] = [];
const mappedResourceObligation: Obligation[] = [];
const urns = cfg.get('authorization:urns');
if (obligations?.length > 0) {
for (let obligationObj of obligations) {
Expand Down
2 changes: 2 additions & 0 deletions packages/facade/src/modules/master_data/gql/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { protoMetadata as metaPackageIoRestorecommerceTimezone } from '@restorec
import { protoMetadata as metaPackageIoRestorecommerceContact_point_type } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/contact_point_type.js';
import { protoMetadata as metaPackageIoRestorecommerceCustomer } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/customer.js';
import { protoMetadata as metaPackageIoRestorecommerceContact_point } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/contact_point.js';
import { protoMetadata as metaPackageIoRestorecommerceCredential } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/credential.js';
import { protoMetadata as metaPackageIoRestorecommerceLocale } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/locale.js';
import { protoMetadata as metaPackageIoRestorecommerceLocation } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/location.js';
import { protoMetadata as metaPackageIoRestorecommerceOrganization } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/organization.js';
Expand All @@ -23,6 +24,7 @@ export const subServices: ProtoMetadata[] = [
metaPackageIoRestorecommerceContact_point_type,
metaPackageIoRestorecommerceCustomer,
metaPackageIoRestorecommerceContact_point,
metaPackageIoRestorecommerceCredential,
metaPackageIoRestorecommerceLocale,
metaPackageIoRestorecommerceLocation,
metaPackageIoRestorecommerceOrganization,
Expand Down
6 changes: 6 additions & 0 deletions packages/facade/src/modules/master_data/grpc/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ import {
type TemplateServiceClient,
TemplateServiceDefinition
} from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/template.js';
import {
type CredentialServiceClient,
CredentialServiceDefinition
} from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/credential.js';
import {
CommandServiceDefinition
} from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/command.js';
Expand All @@ -67,6 +71,7 @@ export class ResourceSrvGrpcClient extends RestoreCommerceGrpcClient {
readonly timezone: TimezoneServiceClient;
readonly contact_point_type: ContactPointTypeServiceClient;
readonly customer: CustomerServiceClient;
readonly credential: CredentialServiceClient;
readonly contact_point: ContactPointServiceClient;
readonly locale: LocaleServiceClient;
readonly location: LocationServiceClient;
Expand Down Expand Up @@ -95,6 +100,7 @@ export class ResourceSrvGrpcClient extends RestoreCommerceGrpcClient {
this.tax_type = this.createClient(cfg, TaxTypeServiceDefinition, this.channel);
this.unit_code = this.createClient(cfg, UnitCodeServiceDefinition, this.channel);
this.template = this.createClient(cfg, TemplateServiceDefinition, this.channel);
this.credential = this.createClient(cfg, CredentialServiceDefinition, this.channel);
this.command = this.createClient(cfg, CommandServiceDefinition, this.channel);
}

Expand Down
3 changes: 2 additions & 1 deletion packages/protos/io/restorecommerce/fulfillment_courier.proto
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ message FulfillmentCourier {
optional string logo = 6;
optional string website = 7;
optional string stub_type = 8;
optional google.protobuf.Any configuration = 9;
optional string credential_id = 9;
optional google.protobuf.Any configuration = 10;
}

message FulfillmentCourierList {
Expand Down
2 changes: 1 addition & 1 deletion packages/protos/io/restorecommerce/notification.proto
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ message NotificationListResponse {
}

message NotificationResponse {
optional Notification items = 1;
optional Notification payload = 1;
optional io.restorecommerce.status.Status status = 2;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ message NotificationChannelListResponse {
}

message NotificationChannelResponse {
optional NotificationChannel items = 1;
optional NotificationChannel payload = 1;
optional io.restorecommerce.status.Status status = 2;
}

Expand Down

0 comments on commit 7b8ad6d

Please sign in to comment.