chore: aligned rpc with tailscale login flow

Author: aryanjassal

src/client/handlers/AuthSignToken.ts

@@ -1,56 +1,27 @@
 import type {
   ClientRPCRequestParams,
   ClientRPCResponseResult,
-  IdentityRequestData,
   IdentityResponseData,
-  TokenIdentityRequest,
   TokenIdentityResponse,
 } from '../types.js';
 import type KeyRing from '../../keys/KeyRing.js';
-import type { PublicKey } from '../../keys/types.js';
 import { UnaryHandler } from '@matrixai/rpc';
 import Token from '../../tokens/Token.js';
-import * as clientErrors from '../errors.js';
 import * as nodesUtils from '../../nodes/utils.js';
 
 class AuthSignToken extends UnaryHandler<
   {
     keyRing: KeyRing;
   },
-  ClientRPCRequestParams<TokenIdentityRequest>,
+  ClientRPCRequestParams,
   ClientRPCResponseResult<TokenIdentityResponse>
 > {
-  public handle = async (
-    input: ClientRPCRequestParams<TokenIdentityRequest>,
-  ): Promise<TokenIdentityResponse> => {
+  public handle = async (): Promise<TokenIdentityResponse> => {
     const { keyRing }: { keyRing: KeyRing } = this.container;
-
-    // Get and verify incoming node
-    const inputToken = { payload: input.payload, signatures: input.signatures };
-    const incomingToken = Token.fromEncoded<IdentityRequestData>(inputToken);
-    if (!('publicKey' in incomingToken.payload)) {
-      throw new clientErrors.ErrorClientAuthenticationInvalidToken(
-        'Input token does not contain public key',
-      );
-    }
-    const incomingPublicKey = Buffer.from(
-      incomingToken.payload.publicKey,
-      'base64url',
-    ) as PublicKey;
-    if (!incomingToken.verifyWithPublicKey(incomingPublicKey)) {
-      throw new clientErrors.ErrorClientAuthenticationInvalidToken(
-        'Incoming token does not match its signature',
-      );
-    }
-
-    // Create the outgoing token with the incoming token integrated into the
-    // payload.
-    const outgoingTokenPayload: IdentityResponseData = {
-      requestToken: inputToken,
+    const tokenPayload: IdentityResponseData = {
       nodeId: nodesUtils.encodeNodeId(keyRing.getNodeId()),
     };
-    const outgoingToken =
-      Token.fromPayload<IdentityResponseData>(outgoingTokenPayload);
+    const outgoingToken = Token.fromPayload<IdentityResponseData>(tokenPayload);
     outgoingToken.signWithPrivateKey(keyRing.keyPair);
     return outgoingToken.toEncoded();
   };

src/client/types.ts

@@ -108,17 +108,7 @@ type TokenMessage = {
   token: ProviderToken;
 };
 
-// Return URL must be present on the token, otherwise token contents is decided
-// by the client.
-type IdentityRequestData = TokenPayload & {
-  returnURL: string;
-  publicKey: string;
-};
-
-type TokenIdentityRequest = SignedTokenEncoded;
-
 type IdentityResponseData = TokenPayload & {
-  requestToken: TokenIdentityRequest;
   nodeId: NodeIdEncoded;
 };
 
@@ -422,9 +412,7 @@ export type {
   ClaimIdMessage,
   ClaimNodeMessage,
   TokenMessage,
-  IdentityRequestData,
   IdentityResponseData,
-  TokenIdentityRequest,
   TokenIdentityResponse,
   NodeIdMessage,
   AddressMessage,