wip - admin routes

packages/api-express-router/src/apiExpressRouterFactory.ts

@@ -46,31 +46,24 @@ class ApiExpressRouterFactory {
 		apiEndpointAdapter: ApiExpressEndpointAdapter,
 	): void {
 		for (const route of routes) {
-			this.registerRoute(router, route, apiEndpointAdapter);
+			console.log("registering route", route.path);
+			router.post(
+				route.path,
+				async (
+					request: Request,
+					response: Response,
+					next: NextFunction,
+				): Promise<void> => {
+					await apiEndpointAdapter.handleRequest(
+						route.endpoint,
+						request,
+						response,
+						next,
+					);
+				},
+			);
 		}
 	}
-
-	protected registerRoute(
-		router: Router,
-		route: ApiRoute,
-		apiEndpointAdapter: ApiExpressEndpointAdapter,
-	): void {
-		router.post(
-			route.path,
-			async (
-				request: Request,
-				response: Response,
-				next: NextFunction,
-			): Promise<void> => {
-				await apiEndpointAdapter.handleRequest(
-					route.endpoint,
-					request,
-					response,
-					next,
-				);
-			},
-		);
-	}
 }
 
 export { ApiExpressRouterFactory };

packages/cli/src/start.ts

@@ -22,7 +22,7 @@ import { ProviderEnvironment } from "@prosopo/env";
 import { getPairAsync } from "@prosopo/keyring";
 import { i18nMiddleware } from "@prosopo/locale";
 import {
-	api,
+	createApiAdminRoutesProvider,
 	domainMiddleware,
 	getClientList,
 	headerCheckMiddleware,
@@ -37,6 +37,7 @@ import {
 	createApiRuleRoutesProvider,
 	getExpressApiRuleRateLimits,
 } from "@prosopo/user-access-policy";
+import { apiRulePaths } from "@prosopo/user-access-policy";
 import cors from "cors";
 import express from "express";
 import rateLimit from "express-rate-limit";
@@ -57,7 +58,7 @@ function startApi(
 	const apiRuleRoutesProvider = createApiRuleRoutesProvider(
 		env.getDb().getUserAccessRulesStorage(),
 	);
-	const apiAdminRoutesProvider = api.admin.createApiAdminRoutesProvider(env);
+	const apiAdminRoutesProvider = createApiAdminRoutesProvider(env);
 
 	// https://express-rate-limit.mintlify.app/guides/troubleshooting-proxy-issues
 	apiApp.set(
@@ -77,21 +78,22 @@ function startApi(
 	apiApp.use(publicRouter(env));
 
 	// Admin routes
+	env.logger.info("Enabling admin auth middleware");
 	apiApp.use("/v1/prosopo/provider/admin", authMiddleware(env));
+	apiApp.use(apiRulePaths.INSERT_MANY, authMiddleware(env));
+	apiApp.use(apiRulePaths.DELETE_MANY, authMiddleware(env));
 	apiApp.use(
 		apiExpressRouterFactory.createRouter(
 			apiRuleRoutesProvider,
 			apiEndpointAdapter,
 		),
-		authMiddleware(env),
 	);
 	apiApp.use(
 		apiExpressRouterFactory.createRouter(
 			apiAdminRoutesProvider,
 			// unlike the default one, it should have errorStatusCode as 400
 			createApiExpressDefaultEndpointAdapter(env.logger, 400),
 		),
-		authMiddleware(env),
 	);
 
 	// Rate limiting

packages/provider/src/api/admin/createApiAdminRoutesProvider.ts

@@ -17,12 +17,10 @@ import type { ProviderEnvironment } from "@prosopo/types-env";
 import { Tasks } from "../../tasks/index.js";
 import { ApiAdminRoutesProvider } from "./apiAdminRoutesProvider.js";
 
-const createApiAdminRoutesProvider = (
+export const createApiAdminRoutesProvider = (
 	providerEnvironment: ProviderEnvironment,
 ): ApiRoutesProvider => {
 	const tasks = new Tasks(providerEnvironment);
 
 	return new ApiAdminRoutesProvider(tasks);
 };
-
-export { createApiAdminRoutesProvider };

packages/provider/src/api/authMiddleware.ts

@@ -27,6 +27,7 @@ export const authMiddleware = (env: ProviderEnvironment) => {
 				return;
 			}
 
+			console.log("In admin auth middleware");
 			const { signature, timestamp } = extractHeaders(req);
 
 			if (env.authAccount) {

packages/provider/src/index.ts

@@ -22,4 +22,4 @@ export * from "./api/domainMiddleware.js";
 export * from "./schedulers/captchaScheduler.js";
 export * from "./schedulers/getClientList.js";
 export * from "./api/headerCheckMiddleware.js";
-export * as api from "./api/export.js";
+export * from "./api/admin/createApiAdminRoutesProvider.js";

packages/provider/src/tests/integration/imgCaptcha.integration.test.ts

@@ -39,7 +39,7 @@ describe("Image Captcha Integration Tests", () => {
 			await registerSiteKey(dappAccount, CaptchaType.image);
 		});
 
-		it("should supply an image captcha challenge to a Dapp User", async () => {
+		it.only("should supply an image captcha challenge to a Dapp User", async () => {
 			const origin = "http://localhost";
 			const getImageCaptchaURL = `${baseUrl}${ApiPaths.GetImageCaptchaChallenge}`;
 			const getImgCaptchaBody: CaptchaRequestBodyType = {

packages/user-access-policy/src/index.ts

@@ -16,6 +16,7 @@ import type { ApiRoutesProvider } from "@prosopo/api-route";
 import type { Logger } from "@prosopo/common";
 import type { Model } from "mongoose";
 import type { BlacklistInspector } from "./blacklistInspector.js";
+import { apiRulePaths } from "./rules/api/apiRulePaths.js";
 import { ApiRuleRoutesProvider } from "./rules/api/apiRuleRoutesProvider.js";
 import { getExpressApiRuleRateLimits } from "./rules/api/getExpressApiRuleRateLimits.js";
 import { BlacklistRulesInspector } from "./rules/blacklistRulesInspector.js";
@@ -63,4 +64,5 @@ export {
 	createApiRuleRoutesProvider,
 	getRuleMongooseSchema,
 	getExpressApiRuleRateLimits,
+	apiRulePaths,
 };

packages/user-access-policy/src/rules/api/apiRulePaths.ts

@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const apiRulePaths = {
+export const apiRulePaths = {
 	INSERT_MANY: "/v1/prosopo/user-access-policy/rules/insert-many",
 	DELETE_MANY: "/v1/prosopo/user-access-policy/rules/delete-many",
 };
-
-export { apiRulePaths };