chore: rolled back changes for session tokens

Author: aryanjassal

src/client/handlers/AuthIdentityToken.ts

@@ -1,9 +1,9 @@
 import type {
   ClientRPCRequestParams,
   ClientRPCResponseResult,
-  IdentityResponseData,
   TokenIdentityResponse,
 } from '../types.js';
+import type { AuthIdentityToken as AuthIdentityJWT } from '../../tokens/payloads/authIdentityToken.js';
 import type KeyRing from '../../keys/KeyRing.js';
 import { IdSortable } from '@matrixai/id';
 import { UnaryHandler } from '@matrixai/rpc';
@@ -25,7 +25,7 @@ class AuthIdentityToken extends UnaryHandler<
     if (jti == null) {
       throw new clientErrors.ErrorClientAuthenticationInvalidJTI();
     }
-    const outgoingToken = Token.fromPayload<IdentityResponseData>({
+    const outgoingToken = Token.fromPayload<AuthIdentityJWT>({
       jti: jti.toMultibase('base64'),
       exp: Math.floor(Date.now() / 1000) + 60, // 60 seconds after issuing
       iss: nodesUtils.encodeNodeId(keyRing.getNodeId()),

src/client/types.ts

@@ -108,12 +108,6 @@ type TokenMessage = {
   token: ProviderToken;
 };
 
-type IdentityResponseData = TokenPayload & {
-  jti: string;
-  exp: number;
-  iss: NodeIdEncoded;
-};
-
 type TokenIdentityResponse = SignedTokenEncoded;
 
 // Nodes messages
@@ -421,7 +415,6 @@ export type {
   ClaimIdMessage,
   ClaimNodeMessage,
   TokenMessage,
-  IdentityResponseData,
   TokenIdentityResponse,
   NodeIdMessage,
   AddressMessage,

src/tokens/payloads/authSignedIdentity.ts src/tokens/payloads/authIdentityToken.tssrc/tokens/payloads/authSignedIdentity.ts renamed to src/tokens/payloads/authIdentityToken.ts

@@ -5,51 +5,45 @@ import * as ids from '../../ids/index.js';
 import * as validationErrors from '../../validation/errors.js';
 import * as utils from '../../utils/index.js';
 
-interface AuthSignedIdentity extends TokenPayload {
-  typ: 'AuthSignedIdentity';
+interface AuthIdentityToken extends TokenPayload {
   iss: NodeIdEncoded;
   exp: number;
   jti: string;
 }
 
 function assertAuthSignedIdentity(
-  authSignedIdentity: unknown,
-): asserts authSignedIdentity is AuthSignedIdentity {
-  if (!utils.isObject(authSignedIdentity)) {
+  authIdentityToken: unknown,
+): asserts authIdentityToken is AuthIdentityToken {
+  if (!utils.isObject(authIdentityToken)) {
     throw new validationErrors.ErrorParse('must be POJO');
   }
-  if (authSignedIdentity['typ'] !== 'AuthSignedIdentity') {
-    throw new validationErrors.ErrorParse(
-      '`typ` property must be `AuthSignedToken`',
-    );
-  }
   if (
-    authSignedIdentity['iss'] == null ||
-    ids.decodeNodeId(authSignedIdentity['iss'] == null)
+    authIdentityToken['iss'] == null ||
+    ids.decodeNodeId(authIdentityToken['iss'] == null)
   ) {
     throw new validationErrors.ErrorParse(
       '`iss` property must be an encoded node ID',
     );
   }
-  if (typeof authSignedIdentity['exp'] !== 'number') {
+  if (typeof authIdentityToken['exp'] !== 'number') {
     throw new validationErrors.ErrorParse('`exp` property must be a number');
   }
-  if (typeof authSignedIdentity['jti'] !== 'string') {
+  if (typeof authIdentityToken['jti'] !== 'string') {
     throw new validationErrors.ErrorParse('`jti` property must be a string');
   }
 }
 
 function parseAuthSignedIdentity(
   authIdentityEncoded: unknown,
-): SignedToken<AuthSignedIdentity> {
+): SignedToken<AuthIdentityToken> {
   const encodedToken =
-    tokensUtils.parseSignedToken<AuthSignedIdentity>(authIdentityEncoded);
+    tokensUtils.parseSignedToken<AuthIdentityToken>(authIdentityEncoded);
   const authIdentity =
-    tokensUtils.parseTokenPayload<AuthSignedIdentity>(encodedToken);
+    tokensUtils.parseTokenPayload<AuthIdentityToken>(encodedToken);
   assertAuthSignedIdentity(authIdentity);
   return encodedToken;
 }
 
 export { assertAuthSignedIdentity, parseAuthSignedIdentity };
 
-export type { AuthSignedIdentity };
+export type { AuthIdentityToken };

src/tokens/payloads/index.ts

@@ -1 +1 @@
-export * from './authSignedIdentity.js';
+export * from './authIdentityToken.js';