Merge remote-tracking branch 'origin/codex/batch10-openapi-oauth-tests' into codex/effect-lint-integration

Rhys Sullivan committed 6 months ago

Commit 86d576a2 parents a1200b1 4194ac62 files · +51 −19Browse files

Showing the changes to packages/plugins/openapi/src (2 of 2 files). Show all

Unified · Split

2 files

packages/plugins/openapi/src/sdk/client-credentials-oauth.test.ts +19 −5
packages/plugins/openapi/src/sdk/oauth-refresh.test.ts +32 −14

packages/plugins/openapi/src/sdk/client-credentials-oauth.test.ts+19−5

 const autoApprove: InvokeOptions = { onElicitation: "accept-all" };
+class OpenApiClientCredentialsTestSetupError extends Schema.TaggedErrorClass<OpenApiClientCredentialsTestSetupError>()(
+  "OpenApiClientCredentialsTestSetupError",
+  {
+    message: Schema.String,
+  },
+) {}
 // ---------------------------------------------------------------------------
 // Test API — single endpoint that echoes the Authorization header.
 // ---------------------------------------------------------------------------
       const clientLayer = FetchHttpClient.layer;
       const server = yield* HttpServer.HttpServer;
       const address = server.address;
-      if (address._tag !== "TcpAddress") return yield* Effect.die("test server must bind to TCP");
+      if (!("port" in address)) {
+        return yield* new OpenApiClientCredentialsTestSetupError({
+          message: "Test server must bind to TCP",
+        });
+      }
       const baseUrl = `http://127.0.0.1:${address.port}`;
       const plugins = [
         openApiPlugin({ httpClientLayer: clientLayer }),
         },
       });
-      if (!started.completedConnection) {
+      const completedConnection = started.completedConnection;
-        throw new Error("expected completed clientCredentials connection");
+      if (!completedConnection) {
+        return yield* new OpenApiClientCredentialsTestSetupError({
+          message: "Expected completed clientCredentials connection",
+        });
       }
       const auth = new OAuth2Auth({
         kind: "oauth2",
-        connectionId: started.completedConnection.connectionId,
+        connectionId: completedConnection.connectionId,
         securitySchemeName: "oauth2",
         flow: "clientCredentials",
         tokenUrl: "https://token.example.com/token",
       // Add the source with OAuth2Auth pointing at the completed connection.
       yield* userExec.openapi.addSpec({
         spec: specJson,
-        scope: userScope.id as string,
+        scope: userScope.id,
         namespace: "petstore",
         baseUrl,
         oauth2: auth,

packages/plugins/openapi/src/sdk/oauth-refresh.test.ts+32−14

 import {
   ConnectionId,
-  ConnectionReauthRequiredError,
   CreateConnectionInput,
   ScopeId,
   SecretId,
 const autoApprove: InvokeOptions = { onElicitation: "accept-all" };
+class OpenApiOauthTestSetupError extends Schema.TaggedErrorClass<OpenApiOauthTestSetupError>()(
+  "OpenApiOauthTestSetupError",
+  {
+    message: Schema.String,
+  },
+) {}
 // ---------------------------------------------------------------------------
 // Test API — one endpoint that echoes the Authorization header so we can
 // prove which access token was in flight at invoke time.
       storage: () => ({}),
       secretProviders: [memoryProvider],
     }));
-      const clientLayer = FetchHttpClient.layer;
+    const clientLayer = FetchHttpClient.layer;
-      const server = yield* HttpServer.HttpServer;
+    const server = yield* HttpServer.HttpServer;
-      const address = server.address;
+    const address = server.address;
-      if (address._tag !== "TcpAddress") return yield* Effect.die("test server must bind to TCP");
+    if (!("port" in address)) {
-      const baseUrl = `http://127.0.0.1:${address.port}`;
+      return yield* new OpenApiOauthTestSetupError({
+        message: "Test server must bind to TCP",
+      });
+    }
+    const baseUrl = `http://127.0.0.1:${address.port}`;
     const plugins = [
       openApiPlugin({ httpClientLayer: clientLayer }),
       memorySecretsPlugin(),
         yield* executor.openapi.addSpec({
           spec: specJson,
-          scope: String(scopeId),
+          scope: scopeId,
           namespace: "petstore",
           baseUrl,
           oauth2: auth,
         yield* executor.openapi.addSpec({
           spec: specJson,
-          scope: String(scopeId),
+          scope: scopeId,
           namespace: "petstore",
           baseUrl,
           oauth2: auth,
         yield* executor.openapi.addSpec({
           spec: specJson,
-          scope: String(scopeId),
+          scope: scopeId,
           namespace: "petstore",
           baseUrl,
           oauth2: auth,
         // generic Error (see openapi invokeTool), so we assert against
         // the `accessToken` call directly too — that's the surface
         // the UI bridges use to trigger re-auth.
-        const flipped = yield* executor.connections
+        const reauthRequired = yield* executor.connections
           .accessToken("conn-refresh-dead")
-          .pipe(Effect.flip);
+          .pipe(
-        expect(flipped._tag).toBe("ConnectionReauthRequiredError");
+            Effect.flatMap(() =>
-        expect((flipped as ConnectionReauthRequiredError).provider).toBe(
+              Effect.fail(
+                new OpenApiOauthTestSetupError({
+                  message: "Expected refresh to require re-auth",
+                }),
+              ),
+            ),
+            Effect.catchTag("ConnectionReauthRequiredError", Effect.succeed),
+          );
+        expect(reauthRequired.provider).toBe(
           "openapi:oauth2",
         );
         expect(
-          (flipped as ConnectionReauthRequiredError).message,
+          reauthRequired.message,
         ).toMatch(/invalid_grant|revoked/i);
       }),
   );