chore: cleaned up code

Author: aryanjassal

src/auth/CommandLogin.ts

@@ -1,8 +1,15 @@
 import type PolykeyClient from 'polykey/PolykeyClient.js';
+import type {
+  TokenPayloadEncoded,
+  TokenProtectedHeaderEncoded,
+  TokenSignatureEncoded,
+} from 'polykey/tokens/types.js';
+import type { IdentityRequestData } from 'polykey/client/types.js';
 import CommandPolykey from '../CommandPolykey.js';
 import * as binProcessors from '../utils/processors.js';
 import * as binUtils from '../utils/index.js';
 import * as binOptions from '../utils/options.js';
+import * as binErrors from '../errors.js';
 
 class CommandLogin extends CommandPolykey {
   constructor(...args: ConstructorParameters<typeof CommandPolykey>) {
@@ -17,10 +24,7 @@ class CommandLogin extends CommandPolykey {
       const { default: PolykeyClient } = await import(
         'polykey/PolykeyClient.js'
       );
-      const { default: Token } = await import('polykey/tokens/Token.js');
-      const keysUtils = await import('polykey/keys/utils/index.js');
       const tokensUtils = await import('polykey/tokens/utils.js');
-
       const clientOptions = await binProcessors.processClientOptions(
         options.nodePath,
         options.nodeId,
@@ -48,57 +52,53 @@ class CommandLogin extends CommandPolykey {
           },
           logger: this.logger.getChild(PolykeyClient.name),
         });
-        const keyPair = keysUtils.generateKeyPair();
-        const inTok = Token.fromPayload({
-          returnUrl: 'localhost:8000',
-          publicKey: keyPair.publicKey.toString('base64url'),
-        });
-        inTok.signWithPrivateKey(keyPair);
-        console.log(`tok: ${inTok.toEncoded()}`);
-        // token = inTok.toEncoded();
-
-        // // Compact JWTs are in xxxx.yyyy.zzzz format where x is the protected
-        // // header, y is the payload, and z is the binary signature.
-        // const [protectedHeader, payload, signature] = token.split('.');
-        // const tokenProtectedHeader =
-        //   tokensUtils.parseTokenProtectedHeader(protectedHeader);
-        // const tokenPayload = tokensUtils.parseTokenPayload(payload);
-        // const tokenSignature = tokensUtils.parseTokenSignature(signature);
-        // const parsedToken = {
-        //   payload: tokenPayload,
-        //   signatures: [
-        //     {
-        //       protected: tokenProtectedHeader,
-        //       signature: tokenSignature,
-        //     }
-        //   ]
-        // };
-        const parsedToken = inTok;
-        console.log(`parsed: ${JSON.stringify(parsedToken)}\n`);
-        // const incomingToken = Token.fromSigned(parsedToken);
-        // const tokenJson = incomingToken.toJSON();
+        // Compact JWTs are in xxxx.yyyy.zzzz format where x is the protected
+        // header, y is the payload, and z is the binary signature.
+        const [protectedHeader, payload, signature]: [string, string, string] =
+          token.split('.');
+        const incomingTokenEncoded = {
+          payload: payload as TokenPayloadEncoded,
+          signatures: [
+            {
+              protected: protectedHeader as TokenProtectedHeaderEncoded,
+              signature: signature as TokenSignatureEncoded,
+            },
+          ],
+        };
         const response = await binUtils.retryAuthentication(
           (auth) =>
             pkClient.rpcClient.methods.authSignToken({
               metadata: auth,
-              payload: inTok.toEncoded().payload,
-              signatures: inTok.toEncoded().signatures,
-              // signatures: [{protectees.protecHeaderteok.signature}],
+              ...incomingTokenEncoded,
             }),
           meta,
         );
-        const tokenOut = {
-          payload: response.payload,
-          signatures: response.signatures,
-        };
-        console.log(`received: ${JSON.stringify(tokenOut)}\n`);
-        console.log(`payload: ${JSON.stringify(tokensUtils.parseTokenPayload(tokenOut.payload))}\n`);
-        console.log(`inc payload: ${JSON.stringify(tokensUtils.parseTokenPayload((tokensUtils.parseTokenPayload(tokenOut.payload).requestToken! as any).payload!))}\n`);
-        // await fetch(parsedToken.payload.returnUrl, {
-        //   method: 'POST',
-        //   body: JSON.stringify(tokenOut),
-        // });
-        // console.log(`sent payload`);
+        // We don't expect multiple signatures so a compact JWT will suffice
+        const compactHeader = `${response.signatures[0].protected}.${response.payload}.${response.signatures[0].signature}`;
+        const incomingPayload = tokensUtils.parseTokenPayload<IdentityRequestData>(payload);
+        let result: Response;
+        try {
+          result = await fetch(incomingPayload.returnUrl, {
+            method: 'POST',
+            body: JSON.stringify({ token: compactHeader }),
+          });
+        } catch (e) {
+          throw new binErrors.ErrorPolykeyCLILoginFailed(
+            'Failed to send token to return url',
+            { cause: e, },
+          );
+        }
+        // Handle non-200 response
+        if (!result.ok) {
+          throw new binErrors.ErrorPolykeyCLILoginFailed(
+            'Return url returned failure',
+            {
+              data: {
+                code: result.status,
+              },
+            },
+          );
+        }
       } finally {
         if (pkClient! != null) await pkClient.stop();
       }

src/errors.ts

@@ -196,6 +196,11 @@ class ErrorPolykeyCLITouchSecret<T> extends ErrorPolykeyCLI<T> {
   exitCode = 1;
 }
 
+class ErrorPolykeyCLILoginFailed<T> extends ErrorPolykeyCLI<T> {
+  static description = 'Failed to login using Polykey';
+  exitCode = sysexits.SOFTWARE;
+}
+
 export {
   ErrorPolykeyCLI,
   ErrorPolykeyCLIUncaughtException,
@@ -224,4 +229,5 @@ export {
   ErrorPolykeyCLICatSecret,
   ErrorPolykeyCLIEditSecret,
   ErrorPolykeyCLITouchSecret,
+  ErrorPolykeyCLILoginFailed,
 };