Skip to content

Commit ad098f3

Browse files
committed
fix: unit tests
1 parent 8b0db2f commit ad098f3

File tree

4 files changed

+31
-30
lines changed

4 files changed

+31
-30
lines changed

src/core/resource_adapters/gql.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ResourceAdapter, QueryResult } from './adapter.js';
2-
import { ApolloClient } from 'apollo-client';
2+
import pkg from 'apollo-client';
33
import gql from 'graphql-tag';
44
import { InMemoryCache } from 'apollo-cache-inmemory';
55
import { HttpLink } from 'apollo-link-http';
@@ -9,6 +9,8 @@ import { Request } from '@restorecommerce/rc-grpc-clients/dist/generated-server/
99
import * as errors from '../errors.js';
1010
import fetch from 'cross-fetch';
1111

12+
const { ApolloClient } = pkg;
13+
1214
export class GraphQLAdapter implements ResourceAdapter {
1315
constructor(private url: string, private logger: any, private clientOpts: any = {}) {
1416
if (_.isEmpty(url) || _.isNil(url)) {

test/access_control.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

test/acl.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as mocha from 'mocha';
22
import * as should from 'should';
3-
import { Worker } from '../lib/worker.js';
3+
import { Worker } from '../src/worker';
44
import * as testUtils from './utils.js';
55
import * as yaml from 'js-yaml';
66
import * as fs from 'node:fs';

test/core.spec.ts

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,33 @@ import { UserServiceDefinition } from '@restorecommerce/rc-grpc-clients/dist/gen
99
import { Request, Response, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control.js';
1010
import { cfg, logger } from './utils.js';
1111

12-
const acConfig = require('./access_control.json');
12+
const acConfig = {
13+
"combiningAlgorithms": [
14+
{
15+
"urn": "urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:deny-overrides",
16+
"method": "denyOverrides"
17+
},
18+
{
19+
"urn": "urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides",
20+
"method": "permitOverrides"
21+
},
22+
{
23+
"urn": "urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:first-applicable",
24+
"method": "firstApplicable"
25+
}
26+
],
27+
"urns": {
28+
"roleScopingEntity": "urn:restorecommerce:acs:names:roleScopingEntity",
29+
"roleScopingInstance": "urn:restorecommerce:acs:names:roleScopingInstance",
30+
"hierarchicalRoleScoping": "urn:restorecommerce:acs:names:hierarchicalRoleScoping",
31+
"ownerEntity": "urn:restorecommerce:acs:names:ownerIndicatoryEntity",
32+
"ownerInstance": "urn:restorecommerce:acs:names:ownerInstance",
33+
"resourceID": "urn:oasis:names:tc:xacml:1.0:resource:resource-id",
34+
"entity": "urn:restorecommerce:acs:names:model:entity",
35+
"role": "urn:restorecommerce:acs:names:role",
36+
"operation": "urn:restorecommerce:acs:names:operation"
37+
}
38+
};
1339

1440
let ac: AccessController;
1541
let request: Request;

0 commit comments

Comments
 (0)