Restructure MIs to more generic Identity

backend/src/ee/routes/v1/identities.ts

@@ -0,0 +1,31 @@
+import express from "express";
+const router = express.Router();
+import { requireAuth } from "../../../middleware";
+import { AuthMode } from "../../../variables";
+import { identitiesController } from "../../controllers/v1";
+
+router.post(
+  "/",
+  requireAuth({
+    acceptedAuthModes: [AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]
+  }),
+  identitiesController.createIdentity
+);
+
+router.patch(
+  "/:identityId",
+  requireAuth({
+    acceptedAuthModes: [AuthMode.JWT]
+  }),
+  identitiesController.updateIdentity
+);
+
+router.delete(
+  "/:identityId",
+  requireAuth({
+    acceptedAuthModes: [AuthMode.JWT]
+  }),
+  identitiesController.deleteIdentity
+);
+
+export default router;

backend/src/ee/routes/v1/index.ts

@@ -1,4 +1,4 @@
-import machineIdentities from "./machineIdentities";
+import identities from "./identities";
 import secret from "./secret";
 import secretSnapshot from "./secretSnapshot";
 import organizations from "./organizations";
@@ -14,7 +14,7 @@ import secretRotationProvider from "./secretRotationProvider";
 import secretRotation from "./secretRotation";
 
 export {
-  machineIdentities,
+  identities,
   secret,
   secretSnapshot,
   organizations,

backend/src/ee/routes/v1/machineIdentities.ts

@@ -1,66 +0,0 @@
-import express from "express";
-const router = express.Router();
-import { requireAuth } from "../../../middleware";
-import { AuthMode } from "../../../variables";
-import { machineIdentitiesController } from "../../controllers/v1";
-
-router.get(
-  "/:machineId/client-secrets",
-  requireAuth({
-    acceptedAuthModes: [AuthMode.JWT]
-  }),
-  machineIdentitiesController.getMIClientSecrets
-);
-
-router.post(
-  "/:machineId/client-secrets",
-  requireAuth({
-    acceptedAuthModes: [AuthMode.JWT]
-  }),
-  machineIdentitiesController.createMIClientSecret
-);
-
-router.post(
-  "/:machineId/client-secrets/:clientSecretId/revoke",
-  requireAuth({
-    acceptedAuthModes: [AuthMode.JWT]
-  }),
-  machineIdentitiesController.revokeMIClientSecret
-);
-
-router.post(
-  "/login",
-  machineIdentitiesController.loginMI
-);
-
-// note: currently this is machine-identity specific
-router.post(
-  "/access-token/renew",
-  machineIdentitiesController.renewAccessToken
-);
-
-router.post(
-  "/",
-  requireAuth({
-    acceptedAuthModes: [AuthMode.JWT, AuthMode.MACHINE_ACCESS_TOKEN]
-  }),
-  machineIdentitiesController.createMachineIdentity
-);
-
-router.patch(
-  "/:machineId",
-  requireAuth({
-    acceptedAuthModes: [AuthMode.JWT]
-  }),
-  machineIdentitiesController.updateMachineIdentity
-);
-
-router.delete(
-  "/:machineId",
-  requireAuth({
-    acceptedAuthModes: [AuthMode.JWT]
-  }),
-  machineIdentitiesController.deleteMachineIdentity
-);
-
-export default router;