@dxos/credentials 2.12.20 → 2.13.0

package/src/party/party-credential.ts

@@ -21,14 +21,14 @@ export const TYPE_URL_PARTY_INVITATION = 'dxos.credentials.party.PartyInvitation
  * signing this message.
  * @param signer
  * @param partyKeyPair
- * @param feedKeyPair
+ * @param feedKey
  * @param admitKeyPair
  * @returns Signed message
  */
 export const createPartyGenesisMessage = (
   signer: Signer,
   partyKeyPair: KeyRecord,
-  feedKeyPair: KeyRecord,
+  feedKey: PublicKey,
   admitKeyPair: KeyRecord
 ): Message => {
   assert(typeof admitKeyPair.type !== 'undefined');
@@ -38,13 +38,13 @@ export const createPartyGenesisMessage = (
     type: PartyCredential.Type.PARTY_GENESIS,
     partyGenesis: {
       partyKey: partyKeyPair.publicKey,
-      feedKey: feedKeyPair.publicKey,
+      feedKey: feedKey,
       admitKey: admitKeyPair.publicKey,
       admitKeyType: admitKeyPair.type
     }
   };
 
-  return wrapMessage(signer.sign(message, [partyKeyPair, feedKeyPair, admitKeyPair]));
+  return wrapMessage(signer.sign(message, [partyKeyPair, feedKey, admitKeyPair]));
 };
 
 /**
@@ -80,7 +80,7 @@ export const createKeyAdmitMessage = (
 export const createFeedAdmitMessage = (
   signer: Signer,
   partyKey: PublicKeyLike,
-  feedKeyPair: KeyRecord,
+  feedKey: PublicKey,
   signingKeys: (KeyRecord | KeyChain)[] = [],
   nonce?: Buffer
 ): Message => {
@@ -91,11 +91,11 @@ export const createFeedAdmitMessage = (
     type: PartyCredential.Type.FEED_ADMIT,
     feedAdmit: {
       partyKey,
-      feedKey: feedKeyPair.publicKey
+      feedKey: feedKey
     }
   };
 
-  return wrapMessage(signer.sign(message, [feedKeyPair, ...signingKeys], nonce));
+  return wrapMessage(signer.sign(message, [feedKey, ...signingKeys], nonce));
 };
 
 /**

package/src/party/party-invitations.test.js

@@ -52,7 +52,7 @@ it('PartyInvitation messages', async () => {
   const party = new PartyState(partyKey.publicKey);
 
   // First, configure the Party.
-  const genesisMessage = createPartyGenesisMessage(keyring, partyKey, feedKey, identityKey);
+  const genesisMessage = createPartyGenesisMessage(keyring, partyKey, feedKey.publicKey, identityKey);
   await party.processMessages([genesisMessage]);
 
   // Now 'write' an invitation message.

package/src/party/party-state.test.js

@@ -55,7 +55,7 @@ it('Process basic message types', async () => {
   let deviceKeyChain;
   {
     const haloMessages = new Map();
-    const haloGenesis = createPartyGenesisMessage(keyring, identityKeyB, haloFeedKey, deviceKey);
+    const haloGenesis = createPartyGenesisMessage(keyring, identityKeyB, haloFeedKey.publicKey, deviceKey);
     haloMessages.set(identityKeyB.publicKey.toHex(), haloGenesis);
     haloMessages.set(haloFeedKey.publicKey.toHex(), haloGenesis);
     haloMessages.set(deviceKey.publicKey.toHex(), haloGenesis);
@@ -66,11 +66,11 @@ it('Process basic message types', async () => {
 
   const messages = [
     // The Genesis message is signed by the party private key, the feed key, and one admitted key (IdentityA).
-    createPartyGenesisMessage(keyring, partyKey, feedKeyA, identityKeyA),
+    createPartyGenesisMessage(keyring, partyKey, feedKeyA.publicKey, identityKeyA),
     // Admit IdentityB using a KeyAdmit message.
     createKeyAdmitMessage(keyring, partyKey.publicKey, identityKeyB, [identityKeyA]),
     // Add another feed, and sign for it using the Device KeyChain associated with IdentityB.
-    createFeedAdmitMessage(keyring, partyKey.publicKey, feedKeyB, [deviceKeyChain]),
+    createFeedAdmitMessage(keyring, partyKey.publicKey, feedKeyB.publicKey, [deviceKeyChain]),
     // Add an IdentityInfo, wrapped in an Envelope signed by the device KeyChain, as when copied from the HALO.
     createEnvelopeMessage(
       keyring,
@@ -120,7 +120,7 @@ it('GreetingCommandPlugin envelopes', async () => {
   const genesis = codecLoop(
     createPartyGenesisMessage(greeterKeyring,
       greeterKeyring.findKey(Filter.matches({ type: KeyType.PARTY })),
-      greeterKeyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      greeterKeyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       greeterKeyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))
     )
   );
@@ -155,7 +155,7 @@ it('Reject message from unknown source', async () => {
   const messages = [
     createPartyGenesisMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })),
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))),
     createKeyAdmitMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })).publicKey,
@@ -181,7 +181,7 @@ it('Message signed by known and unknown key should not admit unknown key', async
   const messages = [
     createPartyGenesisMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })),
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))),
     createKeyAdmitMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })).publicKey,
@@ -208,7 +208,7 @@ it('Reject Genesis not signed by Party key', async () => {
   const messages = [
     createPartyGenesisMessage(keyring,
       wrongKey,
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))
     )
   ].map(codecLoop);
@@ -231,7 +231,7 @@ it('Reject admit key message with wrong Party', async () => {
   let messages = [
     createPartyGenesisMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })),
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))
     )
   ].map(codecLoop);
@@ -268,7 +268,7 @@ it('Reject admit feed message with wrong Party', async () => {
   let messages = [
     createPartyGenesisMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })),
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))
     )
   ].map(codecLoop);
@@ -284,7 +284,7 @@ it('Reject admit feed message with wrong Party', async () => {
   messages = [
     createFeedAdmitMessage(keyring,
       wrongParty.publicKey,
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[1],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[1].publicKey,
       [keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))]
     )
   ].map(codecLoop);
@@ -303,7 +303,7 @@ it('Reject tampered Genesis message', async () => {
   const messages = [
     createPartyGenesisMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })),
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))
     )
   ].map(codecLoop);
@@ -328,7 +328,7 @@ it('Reject tampered admit feed message', async () => {
   let messages = [
     createPartyGenesisMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })),
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))
     )
   ].map(codecLoop);
@@ -344,7 +344,7 @@ it('Reject tampered admit feed message', async () => {
   messages = [
     createFeedAdmitMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })).publicKey,
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[1],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[1].publicKey,
       [keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }))]
     )
   ].map(codecLoop);
@@ -365,7 +365,7 @@ it('Reject tampered admit key message', async () => {
   let messages = [
     createPartyGenesisMessage(keyring,
       keyring.findKey(Filter.matches({ type: KeyType.PARTY })),
-      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0],
+      keyring.findKeys(Keyring.signingFilter({ type: KeyType.FEED }))[0].publicKey,
       keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY })))
   ].map(codecLoop);
 

package/src/proto/defs/signed.proto

@@ -0,0 +1,41 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+syntax = "proto3";
+
+package dxos.credentials;
+
+import "keys.proto";
+import "google/protobuf/any.proto";
+
+// TODO(burdon): Use default from codec-protobuf
+message Message {
+  required google.protobuf.Any payload = 1;
+}
+
+//
+// A generic container message used whenever messages are signed (e.g. PartyCredential)
+//
+message SignedMessage {
+  //
+  // Provides the common metadata needed for all signed objects.
+  //
+  message Signed {
+    required string created = 1;                    // RFC-3339 datetime string.
+    required bytes nonce = 2;
+    required google.protobuf.Any payload = 10;      // The payload to be signed.
+  }
+
+  //
+  // The signature data itself.
+  //
+  message Signature {
+    required PubKey key = 1;                        // The publicKey of the keypair that made this signature.
+    required bytes signature = 2;                   // The bytes of the signature.
+    KeyChain keyChain = 3;                          // Optional. The certification chain of SignedMessages for this key.
+  }
+
+  required Signed signed = 1;                       // The signed message contents.
+  repeated Signature signatures = 2;                // An array of Signatures, one for each key that signed the message.
+}

package/src/proto/gen/google/protobuf.ts

@@ -17,10 +17,10 @@ export interface FloatValue {
     value?: number;
 }
 export interface Int64Value {
-    value?: number;
+    value?: string;
 }
 export interface UInt64Value {
-    value?: number;
+    value?: string;
 }
 export interface Int32Value {
     value?: number;

package/src/proto/index.ts

@@ -5,6 +5,7 @@
 export * from './any';
 export * from './codec';
 export * from './datetime';
+
 export * from './gen/dxos/credentials';
 export * from './gen/dxos/credentials/auth';
 export * from './gen/dxos/credentials/greet';

package/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: 'plugin:@dxos/recomended',
-  ignorePatterns: [
-    'src/proto/gen/*'
-  ]
-}

package/src/proto/signed.proto

@@ -1,41 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-syntax = "proto3";
-
-package dxos.credentials;
-
-import "keys.proto";
-import "google/protobuf/any.proto";
-
-// TODO(burdon): Use default from codec-protobuf
-message Message {
-  required google.protobuf.Any payload = 1;
-}
-
-//
-// A generic container message used whenever messages are signed (e.g. PartyCredential)
-//
-message SignedMessage {
-  //
-  // Provides the common metadata needed for all signed objects.
-  //
-  message Signed {
-    required string created = 1;                         // RFC-3339 datetime string.
-    required bytes nonce = 2;
-    required google.protobuf.Any payload = 10;           // The payload to be signed.
-  }
-
-  //
-  // The signature data itself.
-  //
-  message Signature {
-    required PubKey key = 1;                       // The publicKey of the keypair that made this signature.
-    required bytes signature = 2;                 // The bytes of the signature.
-    KeyChain keyChain = 3;                        // Optional. The certification chain of SignedMessages for this key.
-  }
-
-  required Signed signed = 1;                     // The signed message contents.
-  repeated Signature signatures = 2;              // An array of Signatures, one for each key that signed the message.
-}