Fix credentials

server/private/routers/re-key/reGenerateClientSecret.ts

@@ -13,7 +13,7 @@
 
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db, olms } from "@server/db";
+import { db, Olm, olms } from "@server/db";
 import { clients } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -146,7 +146,9 @@ export async function reGenerateClientSecret(
         });
 
         return response(res, {
-            data: existingOlms,
+            data: {
+                olmId: existingOlms[0].olmId,
+            },
             success: true,
             error: false,
             message: "Credentials regenerated successfully",

server/private/routers/re-key/reGenerateExitNodeSecret.ts

@@ -12,7 +12,7 @@
  */
 
 import { NextFunction, Request, Response } from "express";
-import { db, exitNodes, exitNodeOrgs, ExitNode, ExitNodeOrg } from "@server/db";
+import { db, exitNodes, exitNodeOrgs, ExitNode, ExitNodeOrg, RemoteExitNode } from "@server/db";
 import HttpCode from "@server/types/HttpCode";
 import { z } from "zod";
 import { remoteExitNodes } from "@server/db";
@@ -22,7 +22,6 @@ import { fromError } from "zod-validation-error";
 import { hashPassword } from "@server/auth/password";
 import logger from "@server/logger";
 import { and, eq } from "drizzle-orm";
-import { UpdateRemoteExitNodeResponse } from "@server/routers/remoteExitNode/types";
 import { OpenAPITags, registry } from "@server/openApi";
 import { disconnectClient } from "@server/routers/ws";
 
@@ -108,11 +107,8 @@ export async function reGenerateExitNodeSecret(
             }
         );
 
-        return response<UpdateRemoteExitNodeResponse>(res, {
-            data: {
-                remoteExitNodeId,
-                secret
-            },
+        return response(res, {
+            data: null, 
             success: true,
             error: false,
             message: "Remote Exit Node secret updated successfully",

server/private/routers/re-key/reGenerateSiteSecret.ts

@@ -214,7 +214,9 @@ export async function reGenerateSiteSecret(
         }
 
         return response(res, {
-            data: existingNewt,
+            data: {
+                newtId: existingNewt ? existingNewt.newtId : undefined
+            },
             success: true,
             error: false,
             message: "Credentials regenerated successfully",

server/routers/remoteExitNode/types.ts

@@ -6,11 +6,6 @@ export type CreateRemoteExitNodeResponse = {
     secret: string;
 };
 
-export type UpdateRemoteExitNodeResponse = {
-    remoteExitNodeId: string;
-    secret: string;
-}
-
 export type PickRemoteExitNodeDefaultsResponse = {
     remoteExitNodeId: string;
     secret: string;