@dxos/credentials 2.33.5-dev.ea3876ba → 2.33.5-dev.ebc105f7

package/src/keys/keyring-helpers.ts

@@ -19,7 +19,7 @@ import { SecretKey } from './keytype';
  * Checks for a valid publicKey Buffer.
  */
 // TODO(burdon): Move to dxos/crypto.
-export function isValidPublicKey (key: PublicKeyLike, keyType?: KeyType): key is PublicKeyLike {
+export const isValidPublicKey = (key: PublicKeyLike, keyType?: KeyType): key is PublicKeyLike => {
   try {
     PublicKey.from(key);
     if (keyType && [KeyType.PARTY, KeyType.IDENTITY, KeyType.FEED, KeyType.DEVICE].includes(keyType)) {
@@ -29,12 +29,13 @@ export function isValidPublicKey (key: PublicKeyLike, keyType?: KeyType): key is
   } catch (e: any) {
   }
   return false;
-}
+};
 
 /**
  * Checks for a valid publicKey Buffer.
  */
 // TODO(burdon): Move to dxos/crypto.
+// eslint-disable-next-line @stayradiated/prefer-arrow-functions/prefer-arrow-functions
 export function assertValidPublicKey (key: PublicKeyLike, keyType?: KeyType): asserts key is PublicKeyLike {
   assert(key);
   assert(isValidPublicKey(key, keyType));
@@ -44,6 +45,7 @@ export function assertValidPublicKey (key: PublicKeyLike, keyType?: KeyType): as
  * Checks for a valid secretKey Buffer.
  */
 // TODO(burdon): Move to dxos/crypto.
+// eslint-disable-next-line @stayradiated/prefer-arrow-functions/prefer-arrow-functions
 export function assertValidSecretKey (key?: SecretKey, keyType?: KeyType): asserts key is SecretKey {
   assert(key);
   if (keyType && [KeyType.PARTY, KeyType.IDENTITY, KeyType.FEED, KeyType.DEVICE].includes(keyType)) {
@@ -55,6 +57,7 @@ export function assertValidSecretKey (key?: SecretKey, keyType?: KeyType): asser
  * Checks for a valid publicKey/secretKey KeyPair.
  */
 // TODO(burdon): Move to dxos/crypto.
+// eslint-disable-next-line @stayradiated/prefer-arrow-functions/prefer-arrow-functions
 export function assertValidKeyPair (keyRecord: any): asserts keyRecord is KeyPair {
   const { publicKey, secretKey, type } = keyRecord;
   assertValidPublicKey(publicKey, type);
@@ -128,40 +131,36 @@ export const createKeyRecord = (attributes: Partial<KeyRecord> = {},
  * Utility method to produce stable output for signing/verifying.
  */
 // TODO(burdon): Factor out.
-export const canonicalStringify = (obj: any) => {
-  return stableStringify(obj, {
-    /* The point of signing and verifying is not that the internal, private state of the objects be
+export const canonicalStringify = (obj: any) => stableStringify(obj, {
+  /* The point of signing and verifying is not that the internal, private state of the objects be
      * identical, but that the public contents can be verified not to have been altered. For that reason,
      * really private fields (indicated by '__') are not included in the signature.
      * This gives a mechanism for attaching other attributes to an object without breaking the signature.
      * We also skip @type.
      */
-    replacer: (key: any, value: any) => {
-      if (key.toString().startsWith('__') || key.toString() === '@type') {
-        return undefined;
+  replacer: (key: any, value: any) => {
+    if (key.toString().startsWith('__') || key.toString() === '@type') {
+      return undefined;
+    }
+    if (value) {
+      if (PublicKey.isPublicKey(value)) {
+        return value.toHex();
+      }
+      if (Buffer.isBuffer(value)) {
+        return value.toString('hex');
       }
-      if (value) {
-        if (PublicKey.isPublicKey(value)) {
-          return value.toHex();
-        }
-        if (Buffer.isBuffer(value)) {
-          return value.toString('hex');
-        }
-        if (value instanceof Uint8Array || (value.data && value.type === 'Buffer')) {
-          return Buffer.from(value).toString('hex');
-        }
+      if (value instanceof Uint8Array || (value.data && value.type === 'Buffer')) {
+        return Buffer.from(value).toString('hex');
       }
-      return value;
     }
-  });
-};
+    return value;
+  }
+});
 
 /**
  * Is object `key` a KeyChain?
  */
-export const isKeyChain = (key: any = {}): key is KeyChain => {
-  return isValidPublicKey(key.publicKey) && key.message && key.message.signed && Array.isArray(key.message.signatures);
-};
+export const isKeyChain = (key: any = {}): key is KeyChain => isValidPublicKey(key.publicKey) && key.message && key.message.signed && Array.isArray(key.message.signatures);
 
 /**
  * Checks conformity and normalizes the KeyRecord. (Used before storing, so that only well-formed records are stored.)

package/src/keys/keystore.ts

@@ -17,12 +17,8 @@ import { KeyRecord } from '../proto';
 const log = debug('dxos:halo:keys:keystore'); // eslint-disable-line unused-imports/no-unused-vars
 
 const marshaller = {
-  marshall (record: KeyRecord) {
-    return { ...record, publicKey: record.publicKey.asBuffer() };
-  },
-  unmarshall (raw: any): KeyRecord {
-    return { ...raw, publicKey: PublicKey.from(raw.publicKey) };
-  }
+  marshall: (record: KeyRecord) => ({ ...record, publicKey: record.publicKey.asBuffer() }),
+  unmarshall: (raw: any): KeyRecord => ({ ...raw, publicKey: PublicKey.from(raw.publicKey) })
 };
 
 /**

package/src/keys/keytype.ts

@@ -6,6 +6,4 @@ import { KeyType } from '../proto/gen/dxos/halo/keys';
 
 export type SecretKey = Buffer;
 
-export const keyTypeName = (keyType: KeyType) => {
-  return KeyType[keyType];
-};
+export const keyTypeName = (keyType: KeyType) => KeyType[keyType];

package/src/party/party-credential.ts

@@ -143,12 +143,12 @@ export const isPartyCredentialMessage = (message: Message | SignedMessage) => {
  * @return {boolean}
  * @private
  */
-export function isEnvelope (message: any) {
+export const isEnvelope = (message: any) => {
   assert(message);
   const type = message?.signed?.payload?.type;
   const envelope = message?.signed?.payload?.envelope;
   return type === PartyCredential.Type.ENVELOPE && envelope;
-}
+};
 
 /**
  * Is this a SignedMessage?
@@ -156,30 +156,28 @@ export function isEnvelope (message: any) {
  * @return {boolean}
  * @private
  */
-export function isSignedMessage (message: any): message is SignedMessage {
-  return message && message.signed && message.signed.payload && message.signatures && Array.isArray(message.signatures);
-}
+export const isSignedMessage = (message: any): message is SignedMessage => message && message.signed && message.signed.payload && message.signatures && Array.isArray(message.signatures);
 
 /**
  * Wraps a SignedMessage with a Message.
  */
 // TODO(burdon): Typespec is too loose.
-export function wrapMessage (message: Message | SignedMessage | Command | Auth): WithTypeUrl<Message> {
+export const wrapMessage = (message: Message | SignedMessage | Command | Auth): WithTypeUrl<Message> => {
   const payload = message as any;
   return { '@type': TYPE_URL_MESSAGE, payload } as WithTypeUrl<Message>;
-}
+};
 
 /**
  * Unwraps (if necessary) a Message to its contents.
  */
-export function unwrapMessage (message: any): any {
+export const unwrapMessage = (message: any): any => {
   let result: any = message;
   while (result.payload) { // TODO(burdon): Recursion!
     result = result.payload;
   }
 
   return result;
-}
+};
 
 /**
  * Unwrap a SignedMessage from its Envelopes.

package/src/party/party-state.ts

@@ -516,15 +516,13 @@ export class PartyState extends EventEmitter {
     publicKey = PublicKey.from(publicKey);
     const keyStr = publicKey.toHex();
 
-    const makeRecord = () => {
-      return {
-        type: KeyType.UNKNOWN,
-        trusted: true,
-        own: false,
-        ...attributes, // Let attributes clobber the defaults.
-        publicKey
-      };
-    };
+    const makeRecord = () => ({
+      type: KeyType.UNKNOWN,
+      trusted: true,
+      own: false,
+      ...attributes, // Let attributes clobber the defaults.
+      publicKey
+    });
 
     let keyRecord = this._keyring.getKey(publicKey);
     if (!keyRecord) {

package/src/proto/datetime.ts

@@ -8,6 +8,4 @@ import moment from 'moment';
  * Creates a properly formatted RFC-3339 date-time string for "now".
  * @returns {string}
  */
-export const createDateTimeString = () => {
-  return moment().format('YYYY-MM-DDTHH:mm:ssZ');
-};
+export const createDateTimeString = () => moment().format('YYYY-MM-DDTHH:mm:ssZ');