Skip to content

Commit 2fd50d3

Browse files
committed
Load and fix up zcap policy HTTP APIs.
1 parent b9b397a commit 2fd50d3

File tree

5 files changed

+50
-17
lines changed

5 files changed

+50
-17
lines changed

lib/documentLoader.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*!
2+
* Copyright (c) 2018-2022 Digital Bazaar, Inc. All rights reserved.
3+
*/
4+
import {documentLoader as brDocumentLoader}
5+
from '@bedrock/jsonld-document-loader';
6+
import {didIo} from '@bedrock/did-io';
7+
8+
import '@bedrock/did-context';
9+
import '@bedrock/security-context';
10+
import '@bedrock/veres-one-context';
11+
12+
// load config defaults
13+
import './config.js';
14+
15+
export async function documentLoader(url) {
16+
if(url.startsWith('did:')) {
17+
const document = await didIo.get({did: url});
18+
return {
19+
contextUrl: null,
20+
documentUrl: url,
21+
document
22+
};
23+
}
24+
25+
// finally, try the bedrock document loader
26+
return brDocumentLoader(url);
27+
}

lib/http.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
import './profiles.js';
55
import './profileAgents.js';
66
import './interactions.js';
7+
import './zcaps.js';

lib/middleware.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
authorizeZcapInvocation as _authorizeZcapInvocation
1414
} from '@digitalbazaar/ezcap-express';
1515
import {asyncHandler} from '@bedrock/express';
16-
import {documentLoader} from '../documentLoader.js';
16+
import {documentLoader} from './documentLoader.js';
1717
import {
1818
Ed25519Signature2020
1919
} from '@digitalbazaar/ed25519-signature-2020';

package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,18 @@
4040
"peerDependencies": {
4141
"@bedrock/app-identity": "^4.0.0",
4242
"@bedrock/core": "^6.3.0",
43+
"@bedrock/did-context": "^6.0.0",
44+
"@bedrock/did-io": "^10.4.0",
4345
"@bedrock/express": "^8.3.1",
4446
"@bedrock/https-agent": "^4.1.0",
47+
"@bedrock/jsonld-document-loader": "^5.2.0",
4548
"@bedrock/notify": "^1.1.0",
4649
"@bedrock/passport": "^12.0.0",
4750
"@bedrock/profile": "^26.3.0",
51+
"@bedrock/security-context": "^9.0.0",
4852
"@bedrock/validation": "^7.1.1",
49-
"@bedrock/zcap-storage": "^9.4.0"
53+
"@bedrock/veres-one-context": "^16.0.0",
54+
"@bedrock/zcap-storage": "^9.4.1"
5055
},
5156
"directories": {
5257
"lib": "./lib"

test/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,46 +12,46 @@
1212
},
1313
"dependencies": {
1414
"@bedrock/account": "^10.0.0",
15-
"@bedrock/app-identity": "^4.0.0",
15+
"@bedrock/app-identity": "^4.1.0",
1616
"@bedrock/core": "^6.3.0",
1717
"@bedrock/did-context": "^6.0.0",
1818
"@bedrock/did-io": "^10.4.0",
19-
"@bedrock/edv-storage": "^20.0.0",
20-
"@bedrock/express": "^8.3.1",
19+
"@bedrock/edv-storage": "^21.2.0",
20+
"@bedrock/express": "^8.5.1",
2121
"@bedrock/https-agent": "^4.1.0",
2222
"@bedrock/jsonld-document-loader": "^5.2.0",
2323
"@bedrock/kms": "^16.0.0",
24-
"@bedrock/kms-http": "^22.0.0",
24+
"@bedrock/kms-http": "^23.0.0",
2525
"@bedrock/ledger-context": "^25.0.0",
2626
"@bedrock/meter": "^6.0.0",
2727
"@bedrock/meter-http": "^14.0.0",
28-
"@bedrock/meter-usage-reporter": "^10.0.0",
29-
"@bedrock/mongodb": "^11.0.0",
30-
"@bedrock/notify": "^1.1.0",
28+
"@bedrock/meter-usage-reporter": "^10.1.0",
29+
"@bedrock/mongodb": "^11.0.1",
30+
"@bedrock/notify": "^1.1.1",
3131
"@bedrock/oauth2-verifier": "^2.4.0",
3232
"@bedrock/package-manager": "^3.0.0",
33-
"@bedrock/passport": "^12.0.0",
33+
"@bedrock/passport": "^12.1.0",
3434
"@bedrock/profile": "^26.3.0",
3535
"@bedrock/profile-http": "file:..",
3636
"@bedrock/security-context": "^9.0.0",
3737
"@bedrock/server": "^5.1.0",
3838
"@bedrock/service-agent": "^10.2.0",
39-
"@bedrock/service-core": "^11.2.1",
39+
"@bedrock/service-core": "^11.4.0",
4040
"@bedrock/ssm-mongodb": "^13.0.0",
4141
"@bedrock/test": "^8.2.0",
4242
"@bedrock/validation": "^7.1.1",
43-
"@bedrock/vc-delivery": "^7.7.1",
44-
"@bedrock/vc-verifier": "^22.1.0",
43+
"@bedrock/vc-delivery": "^7.7.2",
44+
"@bedrock/vc-verifier": "^23.3.0",
4545
"@bedrock/veres-one-context": "^16.0.0",
46-
"@bedrock/zcap-storage": "^9.4.0",
46+
"@bedrock/zcap-storage": "^9.4.1",
4747
"@digitalbazaar/ed25519-signature-2020": "^5.4.0",
48+
"@digitalbazaar/ezcap": "^4.1.0",
4849
"@digitalbazaar/webkms-client": "^14.2.0",
4950
"@digitalbazaar/zcap": "^9.0.1",
5051
"@digitalbazaar/zcap-context": "^2.0.0",
51-
"apisauce": "^3.1.0",
52+
"apisauce": "^3.2.1",
5253
"c8": "^10.1.3",
53-
"cross-env": "^7.0.3",
54-
"uuid": "^11.1.0"
54+
"cross-env": "^10.1.0"
5555
},
5656
"c8": {
5757
"excludeNodeModules": false,

0 commit comments

Comments
 (0)