Skip to content

Commit 73a67d9

Browse files
Fix manifest creation
1 parent 39a9066 commit 73a67d9

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

src/OrbitDB.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ class OrbitDB {
268268
const accessControllerAddress = await accessController.save()
269269

270270
// Save the manifest to IPFS
271-
const manifest = createDBManifest(name, type, accessControllerAddress, this.identity)
271+
const manifest = createDBManifest(name, type, accessControllerAddress, this.identity.publicKey)
272272
const manifestHash = await uploadDBManifest(this._ipfs, manifest)
273273

274274
// Create the database address

src/db-manifest.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,32 @@
1-
const path = require('path')
2-
31
const encodeManifest = manifest => Buffer.from(JSON.stringify(manifest))
42

53
// Creates a DB manifest file and saves it in IPFS
6-
const createDBManifest = (name, type, accessControllerAddress, identity) => {
7-
const { orbitKey } = identity
8-
const owner = orbitKey.getPublic('hex')
4+
const createDBManifest = (name, type, accessControllerAddress, publicKey) => {
95
return {
106
name,
117
type,
12-
owner,
13-
accessController: path.join('/ipfs', accessControllerAddress),
8+
owner: publicKey,
9+
accessController: accessControllerAddress,
1410
}
1511
}
1612

1713
const uploadDBManifest = async (ipfs, manifest) => {
18-
console.log('uploading manifest:', manifest)
1914
const dag = await ipfs.object.put(encodeManifest(manifest))
2015
return dag.toJSON().multihash.toString()
2116
}
2217

2318
const signDBManifest = async (manifest, identity, identityProvider) => {
24-
console.log('signing manifest:', manifest)
2519
return identityProvider.sign(identity, encodeManifest(manifest))
2620
}
2721

2822
const verifyDBManifest = async (manifest, signature, identityProvider) => {
29-
console.log('verifying manifest:', manifest)
3023
const { owner } = manifest
3124
return identityProvider.verify(signature, owner, encodeManifest(manifest))
3225
}
3326

34-
module.exports.createDBManifest = createDBManifest
35-
module.exports.uploadDBManifest = uploadDBManifest
36-
module.exports.signDBManifest = signDBManifest
37-
module.exports.verifyDBManifest = verifyDBManifest
27+
module.exports = {
28+
createDBManifest,
29+
uploadDBManifest,
30+
signDBManifest,
31+
verifyDBManifest
32+
}

src/ipfs-access-controller.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict'
22

3+
const path = require('path')
34
const AbstractAccessController = require('./access-controller')
45

56
class IPFSAccessController extends AbstractAccessController {
@@ -41,7 +42,7 @@ class IPFSAccessController extends AbstractAccessController {
4142
} catch (e) {
4243
console.log("ACCESS ERROR:", e)
4344
}
44-
return hash
45+
return path.join('/ipfs', hash)
4546
}
4647

4748
async setup ({ accessControllerAddress: address }) {

0 commit comments

Comments
 (0)