chore: further-refactor, working swagger

Author: ryanbas21

e2e/mock-api-v2/package.json

@@ -8,8 +8,8 @@
   "scripts": {
     "build": "pnpm nx nxBuild",
     "lint": "pnpm nx nxLint",
-    "serve": "node dist/e2e/mock-api-v2/src/main.js",
-    "serve:dev": "nodemon dist/e2e/mock-api-v2/src/main.js",
+    "serve": "node dist/src/main.js",
+    "serve:dev": "nodemon dist/src/main.js",
     "test": "pnpm nx nxTest"
   },
   "dependencies": {
@@ -28,7 +28,7 @@
         "executor": "@nx/js:tsc",
         "outputs": ["{options.outputPath}"],
         "options": {
-          "outputPath": "e2e/mock-api-v2/dist",
+          "outputPath": "./dist",
           "main": "e2e/mock-api-v2/src/main.ts",
           "tsConfig": "e2e/mock-api-v2/tsconfig.app.json",
           "generatePackageJson": true

e2e/mock-api-v2/src/example-server.ts

@@ -1,41 +1,41 @@
-/*
- * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-import { toCookieHeader } from '@effect/platform/Cookies';
-import { Effect } from 'effect';
-import { RouterBuilder } from 'effect-http';
-
-import { CookieService } from '../services/cookie.service.js';
-import { CustomHtmlTemplate } from '../services/custom-html-template.service.js';
-import { apiSpec } from '../spec.js';
-
-const customHtmlHandler = RouterBuilder.handler(
-  apiSpec,
-  'PingOneCustomHtml',
-  ({ headers, query, body }) =>
-    Effect.gen(function* () {
-      const { handleCustomHtmlTemplate } = yield* CustomHtmlTemplate;
-      const response = yield* handleCustomHtmlTemplate<typeof headers, typeof query>(
-        headers,
-        query,
-        body,
-      );
-
-      const { writeCookie } = yield* CookieService;
-
-      const cookie = yield* writeCookie(headers, response.interactionToken);
-
-      return {
-        status: 200 as const,
-        body: response,
-        headers: {
-          'Set-Cookie': toCookieHeader(cookie),
-        },
-      };
-    }),
-);
-
-export { customHtmlHandler };
+// /*
+//  * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.
+//  *
+//  * This software may be modified and distributed under the terms
+//  * of the MIT license. See the LICENSE file for details.
+//  */
+// import { toCookieHeader } from '@effect/platform/Cookies';
+// import { Effect } from 'effect';
+// import { RouterBuilder } from 'effect-http';
+//
+// import { CookieService } from '../services/cookie.service.js';
+// import { CustomHtmlTemplate } from '../services/custom-html-template.service.js';
+// import { apiSpec } from '../spec.js';
+//
+// const customHtmlHandler = RouterBuilder.handler(
+//   apiSpec,
+//   'PingOneCustomHtml',
+//   ({ headers, query, body }) =>
+//     Effect.gen(function* () {
+//       const { handleCustomHtmlTemplate } = yield* CustomHtmlTemplate;
+//       const response = yield* handleCustomHtmlTemplate<typeof headers, typeof query>(
+//         headers,
+//         query,
+//         body,
+//       );
+//
+//       const { writeCookie } = yield* CookieService;
+//
+//       const cookie = yield* writeCookie(headers, response.interactionToken);
+//
+//       return {
+//         status: 200 as const,
+//         body: response,
+//         headers: {
+//           'Set-Cookie': toCookieHeader(cookie),
+//         },
+//       };
+//     }),
+// );
+//
+// export { customHtmlHandler };

e2e/mock-api-v2/src/handlers/custom-html-template.handler.ts

@@ -9,7 +9,7 @@ import { Tokens } from '../services/tokens.service.js';
 import { HttpApiBuilder } from '@effect/platform';
 import { Effect } from 'effect';
 
-const tokenHandler = HttpApiBuilder.group(MockApi, 'Tokens', (handlers) =>
+const TokensHandler = HttpApiBuilder.group(MockApi, 'Tokens', (handlers) =>
   handlers.handle('Tokens', () =>
     Effect.gen(function* () {
       const { getTokens } = yield* Tokens;
@@ -20,4 +20,4 @@ const tokenHandler = HttpApiBuilder.group(MockApi, 'Tokens', (handlers) =>
   ),
 );
 
-export { tokenHandler };
+export { TokensHandler };

e2e/mock-api-v2/src/handlers/token.handler.ts

@@ -12,16 +12,16 @@ import { HttpApiBuilder } from '@effect/platform';
 /**
  * TODO: Need to implement an Authorization middleware
  */
-const userInfoHandler = HttpApiBuilder.group(MockApi, 'Protected Requests', (handlers) =>
+const UserInfoMockHandler = HttpApiBuilder.group(MockApi, 'Protected Requests', (handlers) =>
   handlers.handle('UserInfo', () =>
     Effect.gen(function* () {
       const { getUserInfo } = yield* UserInfo;
 
-      const response = yield* getUserInfo();
+      const response = yield* getUserInfo;
 
       return response;
     }),
   ),
 );
 
-export { userInfoHandler };
+export { UserInfoMockHandler };

e2e/mock-api-v2/src/handlers/userinfo.handler.ts

@@ -4,8 +4,7 @@
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
  */
-import { Schema } from '@effect/schema';
-import { Effect, Match } from 'effect';
+import { Effect, Match, Schema } from 'effect';
 
 import { InvalidUsernamePassword, InvalidProtectNode } from '../errors/index.js';
 import { PingOneCustomHtmlRequestBody } from '../schemas/custom-html-template/custom-html-template-request.schema.js';

e2e/mock-api-v2/src/helpers/match.ts

@@ -14,17 +14,25 @@ import { OpenidConfigMock } from './handlers/open-id-configuration.handler.js';
 import { IncrementStepIndexMock } from './middleware/CookieMiddleware.js';
 import { AuthorizeHandlerMock } from './handlers/authorize.handler.js';
 import { AuthorizeMock } from './services/authorize.service.js';
+import { TokensMock } from './services/tokens.service.js';
+import { TokensHandler } from './handlers/token.handler.js';
+import { UserInfoMockHandler } from './handlers/userinfo.handler.js';
+import { UserInfoMockService } from './services/userinfo.service.js';
 
 const APIMock = HttpApiBuilder.api(MockApi).pipe(
   Layer.provide(HealthCheckLive),
   Layer.provide(OpenidConfigMock),
   Layer.provide(AuthorizeHandlerMock),
+  Layer.provide(TokensHandler),
+  Layer.provide(UserInfoMockHandler),
 );
 
 const ServerMock = HttpApiBuilder.serve(HttpMiddleware.logger).pipe(
   Layer.provide(HttpApiSwagger.layer()),
   Layer.provide(APIMock),
   Layer.provide(AuthorizeMock),
+  Layer.provide(TokensMock),
+  Layer.provide(UserInfoMockService),
   Layer.provide(IncrementStepIndexMock),
   // Layer.provide(AuthorizationLive),
   Layer.provide(HttpApiBuilder.middlewareCors()),

e2e/mock-api-v2/src/main.ts

@@ -4,7 +4,7 @@
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
  */
-import { Schema } from '@effect/schema';
+import { Schema } from 'effect';
 
 const _SuccessResponseRedirect = Schema.Struct({
   interactionId: Schema.String,