fix: align gestalt parser types with polykey

Author: aryanjassal

npmDepsHash

@@ -1 +1 @@
-sha256-XCPXt+ESgufgJBBTvy+TZBjcovFef4pW/E0f4/JaAc0=
+sha256-j3S6Zig9cm8n29qoJxBmj82WE6YHG2SOSFBuDhJ7xmo=

package-lock.json

@@ -162,7 +162,7 @@
     "nexpect": "^0.6.0",
     "node-gyp-build": "^4.8.4",
     "open": "^10.1.2",
-    "polykey": "^2.4.0",
+    "polykey": "^2.5.0",
     "shelljs": "^0.8.5",
     "shx": "^0.3.4",
     "tsx": "^3.12.7",

package.json

@@ -8,7 +8,7 @@ class CommandLogin extends CommandPolykey {
   constructor(...args: ConstructorParameters<typeof CommandPolykey>) {
     super(...args);
     this.name('login');
-    this.description('Login to a platform with Polykey identity');
+    this.description('Login to a platform with your Polykey identity');
     this.argument('<url>', 'The URL to login using Polykey');
     this.addOption(binOptions.nodeId);
     this.addOption(binOptions.clientHost);
@@ -70,7 +70,9 @@ class CommandLogin extends CommandPolykey {
 
         // Try to open the URL in the browser
         try {
-          process.stderr.write('Opening URL in browser...\n');
+          process.stderr.write(
+            'Attempting to open this URL in your browser...\n',
+          );
           await open(targetURL.toString());
         } catch (e) {
           process.stderr.write(`Failed to open browser: ${e.message}\n`);

src/auth/CommandLogin.ts

@@ -1,3 +1,4 @@
+import type { GestaltAction } from 'polykey/gestalts/types.js';
 import type { Host, Hostname, Port } from 'polykey/network/types.js';
 import type { SeedNodes } from 'polykey/nodes/types.js';
 import type { ParsedSecretPathValue } from '../types.js';
@@ -13,7 +14,6 @@ const vaultNameRegex = /^(?!.*[:])[ -~\t\n]*$/s;
 const secretPathRegex = /^(?!.*[=])[ -~\t\n]*$/s;
 const secretPathValueRegex = /^([a-zA-Z_][\w]+)?$/;
 const environmentVariableRegex = /^([a-zA-Z_]+[a-zA-Z0-9_]*)?$/;
-const base64UrlRegex = /^[A-Za-z0-9\-_]+$/;
 
 /**
  * Converts a validation parser to commander argument parser
@@ -163,7 +163,7 @@ const parseIdentityId: (data: string) => ids.IdentityId =
 const parseProviderIdList: (data: string) => Array<ids.ProviderId> =
   validateParserToArgListParser(ids.parseProviderId);
 
-const parseGestaltAction: (data: string) => 'notify' | 'scan' | 'claim' =
+const parseGestaltAction: (data: string) => GestaltAction =
   validateParserToArgParser(gestaltsUtils.parseGestaltAction);
 
 const parseHost: (data: string) => Host = validateParserToArgParser(

src/utils/parsers.ts

@@ -3,12 +3,12 @@ import type {
   TokenProtectedHeaderEncoded,
   TokenSignatureEncoded,
 } from 'polykey/tokens/types.js';
-import path from 'node:path';
 import type open from 'open';
+import path from 'node:path';
 import fs from 'node:fs';
+import { spawn } from 'node:child_process';
 import { jest } from '@jest/globals';
 import { test } from '@fast-check/jest';
-import { spawn } from 'node:child_process';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyAgent from 'polykey/PolykeyAgent.js';
 import Token from 'polykey/tokens/Token.js';
@@ -46,6 +46,7 @@ describe('commandAuthLogin', () => {
     });
   });
   afterEach(async () => {
+    jest.useRealTimers();
     jest.restoreAllMocks();
     await polykeyAgent.stop();
     await fs.promises.rm(dataDir, {
@@ -92,7 +93,7 @@ describe('commandAuthLogin', () => {
     expect(nodeId).toBeDefined();
     const nodeIdPublicKey = keysUtils.publicKeyFromNodeId(nodeId!);
     expect(receivedToken.verifyWithPublicKey(nodeIdPublicKey)).toBeTrue();
-    expect(receivedToken.payload.exp).toBe(Math.floor(Date.now() / 1000));
+    expect(receivedToken.payload.exp).toBe(Math.floor(Date.now() / 1000) + 60);
     expect(receivedToken.payload.jti).toBeDefined();
   });
 });