Followup small changes

nucypher · Dec 19, 2024 · b24ba6a · b24ba6a
1 parent 2de6a5e
commit b24ba6a
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 6 deletions.
diff --git a/examples/pre/nextjs/next-env.d.ts b/examples/pre/nextjs/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/examples/taco/nextjs/next-env.d.ts b/examples/taco/nextjs/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/packages/taco/src/conditions/base/index.ts b/packages/taco/src/conditions/base/index.ts
@@ -4,5 +4,6 @@
 export * as contract from './contract';
 export * as jsonApi from './json-api';
 export * as jsonRpc from './json-rpc';
+export * as jwt from './jwt';
 export * as rpc from './rpc';
 export * as time from './time';
diff --git a/packages/taco/src/conditions/condition-factory.ts b/packages/taco/src/conditions/condition-factory.ts
@@ -13,6 +13,7 @@ import {
   JsonRpcConditionProps,
   JsonRpcConditionType,
 } from './base/json-rpc';
+import { JWTCondition, JWTConditionProps, JWTConditionType } from './base/jwt';
 import { RpcCondition, RpcConditionProps, RpcConditionType } from './base/rpc';
 import {
   TimeCondition,
@@ -53,6 +54,8 @@ export class ConditionFactory {
         return new JsonApiCondition(props as JsonApiConditionProps);
       case JsonRpcConditionType:
         return new JsonRpcCondition(props as JsonRpcConditionProps);
+      case JWTConditionType:
+        return new JWTCondition(props as JWTConditionProps);
       // Logical Conditions
       case CompoundConditionType:
         return new CompoundCondition(props as CompoundConditionProps);

diff --git a/packages/taco/src/conditions/schemas/utils.ts b/packages/taco/src/conditions/schemas/utils.ts
@@ -6,6 +6,7 @@ import { contractConditionSchema } from './contract';
 import { ifThenElseConditionSchema } from './if-then-else';
 import { jsonApiConditionSchema } from './json-api';
 import { jsonRpcConditionSchema } from './json-rpc';
+import { jwtConditionSchema } from './jwt';
 import { rpcConditionSchema } from './rpc';
 import { sequentialConditionSchema } from './sequential';
 import { timeConditionSchema } from './time';
@@ -18,6 +19,7 @@ export const anyConditionSchema: z.ZodSchema = z.lazy(() =>
     compoundConditionSchema,
     jsonApiConditionSchema,
     jsonRpcConditionSchema,
+    jwtConditionSchema,
     sequentialConditionSchema,
     ifThenElseConditionSchema,
   ]),

diff --git a/packages/taco/test/conditions/compound-condition.test.ts b/packages/taco/test/conditions/compound-condition.test.ts
@@ -11,6 +11,7 @@ import {
 } from '../../src/conditions/compound-condition';
 import {
   testContractConditionObj,
+  testJWTConditionObj,
   testRpcConditionObj,
   testSequentialConditionObj,
   testTimeConditionObj,
@@ -167,7 +168,11 @@ describe('validation', () => {
         testRpcConditionObj,
         {
           operator: 'or',
-          operands: [testTimeConditionObj, testContractConditionObj],
+          operands: [
+            testTimeConditionObj,
+            testContractConditionObj,
+            testJWTConditionObj,
+          ],
         },
         testSequentialConditionObj,
       ],
@@ -187,7 +192,11 @@ describe('validation', () => {
         {
           conditionType: CompoundConditionType,
           operator: 'or',
-          operands: [testTimeConditionObj, testContractConditionObj],
+          operands: [
+            testTimeConditionObj,
+            testContractConditionObj,
+            testJWTConditionObj,
+          ],
         },
         testSequentialConditionObj,
       ],

diff --git a/packages/taco/test/conditions/lingo.test.ts b/packages/taco/test/conditions/lingo.test.ts
@@ -1,4 +1,4 @@
-import { TEST_CHAIN_ID } from '@nucypher/test-utils';
+import { TEST_CHAIN_ID, TEST_ECDSA_PUBLIC_KEY } from '@nucypher/test-utils';
 import { describe, expect, it } from 'vitest';
 
 import { ConditionExpression } from '../../src/conditions/condition-expr';
@@ -69,6 +69,16 @@ describe('check that valid lingo in python is valid in typescript', () => {
       value: 2,
     },
   };
+  // TODO reuse similar object from test-utils
+  const jwtConditionProps = {
+    conditionType: 'jwt',
+    publicKey: TEST_ECDSA_PUBLIC_KEY,
+    expectedIssuer: '0xacbd',
+    subject: ':userAddress',
+    expirationWindow: 1800,
+    issuedWindow: 86400,
+    jwtToken: ':jwt',
+  };
   const sequentialConditionProps = {
     conditionType: 'sequential',
     conditionVariables: [
@@ -119,6 +129,7 @@ describe('check that valid lingo in python is valid in typescript', () => {
     contractConditionProps,
     jsonApiConditionProps,
     jsonRpcConditionProps,
+    jwtConditionProps,
     compoundConditionProps,
     sequentialConditionProps,
     ifThenElseConditionProps,

diff --git a/packages/taco/test/test-utils.ts b/packages/taco/test/test-utils.ts
@@ -49,7 +49,8 @@ import {
   JWTConditionProps,
   JWTConditionType,
 } from '../src/conditions/base/jwt';
-import {  RpcConditionProps,
+import {
+  RpcConditionProps,
   RpcConditionType,
 } from '../src/conditions/base/rpc';
 import {