creating new branch for #267

emmacasolin · emmacasolin · commit 50df7f3b1773 · 2021-11-03T08:47:58.000+11:00
changed message to identity_id in provider message

updating all commands that use provider message

updated everything on the agent side for augment command

started tests and debugging augment command

identities claim working in client service test

wrote test for command in identities
diff --git a/src/PolykeyAgent.ts b/src/PolykeyAgent.ts
@@ -464,6 +464,7 @@ class Polykey {
       nodeManager: this.nodes,
       notificationsManager: this.notifications,
       sessionManager: this.sessions,
+      sigchain: this.sigchain,
       vaultManager: this.vaults,
       fwdProxy: this.fwdProxy,
       revProxy: this.revProxy,
diff --git a/src/bin/identities/allow.ts b/src/bin/identities/allow.ts
@@ -70,7 +70,7 @@ allow.action(async (id, permissions, options) => {
       //  Setting by Identity
       const providerMessage = new identitiesPB.Provider();
       providerMessage.setProviderId(providerId!);
-      providerMessage.setMessage(identityId!);
+      providerMessage.setIdentityId(identityId!);
       setActionMessage.setIdentity(providerMessage);
       name = `${id}`;
       //Trusting.
diff --git a/src/bin/identities/authenticate.ts b/src/bin/identities/authenticate.ts
@@ -42,7 +42,7 @@ commandAugmentKeynode.action(async (providerId, identitiyId, options) => {
     //Constructing message.
     const providerMessage = new identitiesPB.Provider();
     providerMessage.setProviderId(providerId);
-    providerMessage.setMessage(identitiyId);
+    providerMessage.setIdentityId(identitiyId);
 
     //Sending message.
     const gen = grpcClient.identitiesAuthenticate(providerMessage);
@@ -57,7 +57,7 @@ commandAugmentKeynode.action(async (providerId, identitiyId, options) => {
     process.stdout.write(
       outputFormatter({
         type: options.format === 'json' ? 'json' : 'list',
-        data: [`Your device code is: ${codeMessage!.getMessage()}`],
+        data: [`Your device code is: ${codeMessage!.getIdentityId()}`],
       }),
     );
 
@@ -67,7 +67,7 @@ commandAugmentKeynode.action(async (providerId, identitiyId, options) => {
       outputFormatter({
         type: options.format === 'json' ? 'json' : 'list',
         data: [
-          `Successfully authenticated user: ${successMessage!.getMessage()}`,
+          `Successfully authenticated user: ${successMessage!.getIdentityId()}`,
         ],
       }),
     );
diff --git a/src/bin/identities/claim.ts b/src/bin/identities/claim.ts
@@ -42,7 +42,7 @@ claim.action(async (providerId, identitiyId, options) => {
     //Constructing message.
     const providerMessage = new identitiesPB.Provider();
     providerMessage.setProviderId(providerId);
-    providerMessage.setMessage(identitiyId);
+    providerMessage.setIdentityId(identitiyId);
 
     //Sending message.
     const pCall = grpcClient.identitiesClaim(providerMessage);
@@ -51,8 +51,23 @@ claim.action(async (providerId, identitiyId, options) => {
       await clientUtils.refreshSession(meta, client.session);
       resolveP(null);
     });
-    await pCall;
+    const response = await pCall;
     await p;
+
+    const output = [`Successfully published identity claim with id: ${response.getClaimId()}
+    on provider: ${providerId}`];
+
+    if (response.getUrl()) {
+      output.push(`See claim at: ${response.getUrl()}`);
+    }
+
+    process.stdout.write(
+      outputFormatter({
+        type: options.format === 'json' ? 'json' : 'list',
+        data: output,
+      }),
+    );
+
   } catch (err) {
     if (err instanceof errors.ErrorGRPCClientTimeout) {
       process.stderr.write(`${err.message}\n`);
diff --git a/src/bin/identities/disallow.ts b/src/bin/identities/disallow.ts
@@ -70,7 +70,7 @@ commandAllowGestalts.action(async (id, permissions, options) => {
       //  Setting by Identity
       const providerMessage = new identitiesPB.Provider();
       providerMessage.setProviderId(providerId!);
-      providerMessage.setMessage(identityId!);
+      providerMessage.setIdentityId(identityId!);
       setActionMessage.setIdentity(providerMessage);
       name = `${id}`;
       //Trusting.
diff --git a/src/bin/identities/discover.ts b/src/bin/identities/discover.ts
@@ -58,7 +58,7 @@ commandTrustGestalts.action(async (id, options) => {
       //  Discovery by Identity
       const providerMessage = new identitiesPB.Provider();
       providerMessage.setProviderId(providerId!);
-      providerMessage.setMessage(identityId!);
+      providerMessage.setIdentityId(identityId!);
       const pCall = grpcClient.gestaltsDiscoveryByIdentity(providerMessage);
       const { p, resolveP } = utils.promise();
       pCall.call.on('metadata', async (meta) => {
diff --git a/src/bin/identities/get.ts b/src/bin/identities/get.ts
@@ -61,7 +61,7 @@ get.action(async (id, options) => {
       //Getting from identity.
       const providerMessage = new identitiesPB.Provider();
       providerMessage.setProviderId(providerId!);
-      providerMessage.setMessage(identityId!);
+      providerMessage.setIdentityId(identityId!);
       const pCall = grpcClient.gestaltsGestaltGetByIdentity(providerMessage);
       const { p, resolveP } = utils.promise();
       pCall.call.on('metadata', async (meta) => {
diff --git a/src/bin/identities/permissions.ts b/src/bin/identities/permissions.ts
@@ -58,7 +58,7 @@ commandTrustGestalts.action(async (id, options) => {
       //Getting by Identity
       const providerMessage = new identitiesPB.Provider();
       providerMessage.setProviderId(providerId!);
-      providerMessage.setMessage(identityId!);
+      providerMessage.setIdentityId(identityId!);
       const pCall = grpcClient.gestaltsActionsGetByIdentity(providerMessage);
       const { p, resolveP } = utils.promise();
       pCall.call.on('metadata', async (meta) => {
diff --git a/src/bin/identities/search.ts b/src/bin/identities/search.ts
@@ -50,7 +50,7 @@ commandTrustGestalts.action(async (providerId, options) => {
     process.stdout.write(
       outputFormatter({
         type: options.format === 'json' ? 'json' : 'list',
-        data: [`Found identity: ${res.getProviderId()}:${res.getMessage()}`],
+        data: [`Found identity: ${res.getProviderId()}:${res.getIdentityId()}`],
       }),
     );
   } catch (err) {
diff --git a/src/bin/identities/trust.ts b/src/bin/identities/trust.ts
@@ -62,7 +62,7 @@ trust.action(async (id, options) => {
       //  Setting by Identity
       const providerMessage = new identitiesPB.Provider();
       providerMessage.setProviderId(providerId!);
-      providerMessage.setMessage(identityId!);
+      providerMessage.setIdentityId(identityId!);
       setActionMessage.setIdentity(providerMessage);
       const pCall = grpcClient.gestaltsActionsSetByIdentity(setActionMessage);
       const { p, resolveP } = utils.promise();
diff --git a/src/bin/identities/untrust.ts b/src/bin/identities/untrust.ts
@@ -62,7 +62,7 @@ commandTrustGestalts.action(async (id, options) => {
       //  Setting by Identity
       const providerMessage = new identitiesPB.Provider();
       providerMessage.setProviderId(providerId!);
-      providerMessage.setMessage(identityId!);
+      providerMessage.setIdentityId(identityId!);
       setActionMessage.setIdentity(providerMessage);
       const pCall = grpcClient.gestaltsActionsUnsetByIdentity(setActionMessage);
       const { p, resolveP } = utils.promise();
diff --git a/src/client/clientService.ts b/src/client/clientService.ts
@@ -8,6 +8,7 @@ import type { NotificationsManager } from '../notifications';
 import type { Discovery } from '../discovery';
 import type { ForwardProxy, ReverseProxy } from '../network';
 import type { GRPCServer } from '../grpc';
+import { Sigchain } from '../sigchain';
 
 import { promisify } from 'util';
 import * as grpc from '@grpc/grpc-js';
@@ -49,6 +50,7 @@ function createClientService({
   identitiesManager,
   gestaltGraph,
   sessionManager,
+  sigchain,
   notificationsManager,
   discovery,
   fwdProxy,
@@ -62,6 +64,7 @@ function createClientService({
   identitiesManager: IdentitiesManager;
   gestaltGraph: GestaltGraph;
   sessionManager: SessionManager;
+  sigchain: Sigchain;
   notificationsManager: NotificationsManager;
   discovery: Discovery;
   fwdProxy: ForwardProxy;
@@ -90,6 +93,7 @@ function createClientService({
     }),
     ...createIdentitiesRPC({
       identitiesManager,
+      sigchain,
       gestaltGraph,
       nodeManager,
       sessionManager,
diff --git a/src/client/rpcGestalts.ts b/src/client/rpcGestalts.ts
@@ -63,7 +63,7 @@ const createGestaltsRPC = ({
         call.sendMetadata(responseMeta);
         const gestalt = await gestaltGraph.getGestaltByIdentity(
           call.request.getProviderId() as ProviderId,
-          call.request.getMessage() as IdentityId,
+          call.request.getIdentityId() as IdentityId,
         );
         if (gestalt != null) {
           response.setGestaltGraph(JSON.stringify(gestalt));
@@ -134,7 +134,7 @@ const createGestaltsRPC = ({
         //Constructing identity info.
         const gen = discovery.discoverGestaltByIdentity(
           info.getProviderId() as ProviderId,
-          info.getMessage() as IdentityId,
+          info.getIdentityId() as IdentityId,
         );
         for await (const _ of gen) {
           // Empty
@@ -185,7 +185,7 @@ const createGestaltsRPC = ({
         );
         call.sendMetadata(responseMeta);
         const providerId = info.getProviderId() as ProviderId;
-        const identityId = info.getMessage() as IdentityId;
+        const identityId = info.getIdentityId() as IdentityId;
         const result = await gestaltGraph.getGestaltActionsByIdentity(
           providerId,
           identityId,
@@ -265,7 +265,7 @@ const createGestaltsRPC = ({
         //Setting the action.
         const action = makeGestaltAction(info.getAction());
         const providerId = info.getIdentity()?.getProviderId() as ProviderId;
-        const identityId = info.getIdentity()?.getMessage() as IdentityId;
+        const identityId = info.getIdentity()?.getIdentityId() as IdentityId;
         await gestaltGraph.setGestaltActionByIdentity(
           providerId,
           identityId,
@@ -338,7 +338,7 @@ const createGestaltsRPC = ({
         //Setting the action.
         const action = makeGestaltAction(info.getAction());
         const providerId = info.getIdentity()?.getProviderId() as ProviderId;
-        const identityId = info.getIdentity()?.getMessage() as IdentityId;
+        const identityId = info.getIdentity()?.getIdentityId() as IdentityId;
         await gestaltGraph.unsetGestaltActionByIdentity(
           providerId,
           identityId,
diff --git a/src/client/rpcIdentities.ts b/src/client/rpcIdentities.ts
@@ -1,29 +1,32 @@
 import type { NodeManager } from '../nodes';
-import type { NodeInfo } from '../nodes/types';
 import type { GestaltGraph } from '../gestalts';
 import type { SessionManager } from '../sessions';
+import type { Sigchain } from '../sigchain';
 import type { IdentitiesManager } from '../identities';
+import type { ClaimLinkIdentity, ClaimType } from '../claims/types';
 import type {
   IdentityId,
   ProviderId,
   TokenData,
-  IdentityInfo,
 } from '../identities/types';
 
 import * as utils from './utils';
 import * as errors from '../errors';
 import * as grpc from '@grpc/grpc-js';
+import * as claimsUtils from '../claims/utils';
 import * as grpcUtils from '../grpc/utils';
 import * as utilsPB from '../proto/js/polykey/v1/utils/utils_pb';
 import * as identitiesPB from '../proto/js/polykey/v1/identities/identities_pb';
 
 const createIdentitiesRPC = ({
   identitiesManager,
+  sigchain,
   nodeManager,
   gestaltGraph,
   sessionManager,
 }: {
   identitiesManager: IdentitiesManager;
+  sigchain: Sigchain;
   nodeManager: NodeManager;
   gestaltGraph: GestaltGraph;
   sessionManager: SessionManager;
@@ -53,7 +56,7 @@ const createIdentitiesRPC = ({
             'userCode was not a string',
           );
         }
-        response.setMessage(userCode);
+        response.setIdentityId(userCode);
         await genWritable.next(response);
 
         //Wait to finish.
@@ -62,7 +65,7 @@ const createIdentitiesRPC = ({
           throw new errors.ErrorProviderAuthentication(
             'Failed to authenticate.',
           );
-        response.setMessage(userName);
+        response.setIdentityId(userName);
         await genWritable.next(response);
         await genWritable.next(null);
       } catch (err) {
@@ -86,7 +89,7 @@ const createIdentitiesRPC = ({
         const provider = call.request.getProvider();
         await identitiesManager.putToken(
           provider?.getProviderId() as ProviderId,
-          provider?.getMessage() as IdentityId,
+          provider?.getIdentityId() as IdentityId,
           { accessToken: call.request.getToken() } as TokenData,
         );
       } catch (err) {
@@ -107,7 +110,7 @@ const createIdentitiesRPC = ({
         call.sendMetadata(responseMeta);
         const tokens = await identitiesManager.getToken(
           call.request.getProviderId() as ProviderId,
-          call.request.getMessage() as IdentityId,
+          call.request.getIdentityId() as IdentityId,
         );
         response.setToken(JSON.stringify(tokens));
       } catch (err) {
@@ -128,7 +131,7 @@ const createIdentitiesRPC = ({
         call.sendMetadata(responseMeta);
         await identitiesManager.delToken(
           call.request.getProviderId() as ProviderId,
-          call.request.getMessage() as IdentityId,
+          call.request.getIdentityId() as IdentityId,
         );
       } catch (err) {
         callback(grpcUtils.fromError(err), response);
@@ -171,7 +174,7 @@ const createIdentitiesRPC = ({
           ?.getProviderId() as ProviderId;
         const identityId = call.request
           .getProvider()
-          ?.getMessage() as IdentityId;
+          ?.getIdentityId() as IdentityId;
         const provider = identitiesManager.getProvider(providerId);
         if (provider == null)
           throw Error(
@@ -187,7 +190,7 @@ const createIdentitiesRPC = ({
           const identityInfoMessage = new identitiesPB.Info();
           const providerMessage = new identitiesPB.Provider();
           providerMessage.setProviderId(identity.providerId);
-          providerMessage.setMessage(identity.identityId);
+          providerMessage.setIdentityId(identity.identityId);
           identityInfoMessage.setProvider(providerMessage);
           identityInfoMessage.setName(identity.name ?? '');
           identityInfoMessage.setEmail(identity.email ?? '');
@@ -220,7 +223,7 @@ const createIdentitiesRPC = ({
         const identities = await provider.getAuthIdentityIds();
         if (identities.length !== 0) {
           providerMessage.setProviderId(providerId);
-          providerMessage.setMessage(identities[0]);
+          providerMessage.setIdentityId(identities[0]);
         } else throw Error(`No identities found for provider: ${providerId}`);
         callback(null, providerMessage);
       } catch (err) {
@@ -234,29 +237,39 @@ const createIdentitiesRPC = ({
       call: grpc.ServerUnaryCall<identitiesPB.Provider, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
-      // To augment a keynode we need a provider, generate an oauthkey and then
-      const info = call.request;
+      const response = new clientPB.IdentityClaimMessage();
       try {
         await sessionManager.verifyToken(utils.getToken(call.metadata));
         const responseMeta = utils.createMetaTokenResponse(
           await sessionManager.generateToken(),
         );
         call.sendMetadata(responseMeta);
-        const nodeId = nodeManager.getNodeId(); //Getting the local node ID.
 
-        //Do the deed...
-        const nodeInfo: NodeInfo = {
-          id: nodeId,
-          chain: {},
-        };
-        const identityInfo: IdentityInfo = {
-          providerId: info.getProviderId() as ProviderId,
-          identityId: info.getMessage() as IdentityId,
-          claims: {},
-        };
-        await gestaltGraph.linkNodeAndIdentity(nodeInfo, identityInfo); //Need to call this
-        // it takes NodeInfo and IdentityInfo.
-        // Getting and creating NodeInfo is blocked by
+        // Check provider is authenticated
+        const providerId = call.request.getProviderId() as ProviderId;
+        const provider = identitiesManager.getProvider(providerId);
+        if (provider == null) throw Error(`Invalid provider: ${providerId}`);
+
+        const identityId = call.request.getIdentityId() as IdentityId;
+        const token = await identitiesManager.getToken(providerId, identityId);
+        if (token == null) {
+          throw Error(`${identityId} has not been authenticated`);
+        }
+        
+        await provider.checkToken(token, identityId);
+
+        // Create identity claim on our node
+        const claim = await nodeManager.claimIdentity(providerId, identityId);
+
+        // Publish claim on identity
+        const claimDecoded = claimsUtils.decodeClaim(claim);
+        const publishedClaimData = await provider.publishClaim(identityId, claimDecoded);
+
+        response.setClaimId(publishedClaimData.id);
+        if (publishedClaimData.url !== undefined) {
+          response.setUrl(publishedClaimData.url);
+        }
+
       } catch (err) {
         callback(grpcUtils.fromError(err), null);
       }
diff --git a/src/nodes/NodeManager.ts b/src/nodes/NodeManager.ts
diff --git a/tests/bin/identities.test.ts b/tests/bin/identities.test.ts
diff --git a/tests/client/clientService.test.ts b/tests/client/clientService.test.ts
