new: return keyId with project response.

getodk · Jul 19, 2019 · da2623a · da2623a
1 parent 103ae84
commit da2623a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/model/instance/project.js b/lib/model/instance/project.js
@@ -32,7 +32,7 @@ const ExtendedProject = ExtendedInstance({
 
 module.exports = Instance.with(ActeeTrait('project'), HasExtended(ExtendedProject))('projects', {
   all: [ 'id', 'name', 'archived', 'acteeId', 'keyId', 'createdAt', 'updatedAt', 'deletedAt' ],
-  readable: [ 'id', 'name', 'archived', 'createdAt', 'updatedAt' ],
+  readable: [ 'id', 'name', 'archived', 'keyId', 'createdAt', 'updatedAt' ],
   writable: [ 'name', 'archived' ]
 })(({ simply, fieldKeys, formDefs, projects, Key }) => class {
   forCreate() { return withCreateTime(this); }

diff --git a/test/integration/api/projects.js b/test/integration/api/projects.js
@@ -404,6 +404,15 @@ describe('api: /projects', () => {
             .send({ passphrase: 'supersecret', hint: 'it is a secret' })
             .expect(409)))));
 
+    it('should return a keyId if managed encryption is active', testService((service) =>
+      service.login('alice', (asAlice) =>
+        asAlice.post('/v1/projects/1/key')
+          .send({ passphrase: 'supersecret', hint: 'it is a secret' })
+          .expect(200)
+          .then(() => asAlice.get('/v1/projects/1')
+            .expect(200)
+            .then(({ body }) => { body.keyId.should.be.a.Number(); })))));
+
     it('should modify extant forms', testService((service) =>
       service.login('alice', (asAlice) =>
         asAlice.post('/v1/projects/1/key')