Code cleanup to remove redundancy

Author: jamesliupenn

server/dimo-service.ts

@@ -26,9 +26,8 @@ export class DimoService {
   // Get Vehicle JWT for specific vehicle access (using new preferred method)
   async getVehicleJwt(developerJwt: any, tokenId: number) {
     try {
-      return await this.dimo.tokenexchange.exchange({
+      return await this.dimo.tokenexchange.getVehicleJwt({
         ...developerJwt,
-        privileges: [1, 3, 4, 5, 6],
         tokenId: tokenId,
       });
     } catch (error) {
@@ -72,21 +71,7 @@ export class DimoService {
     }
   }
 
-  async getVehicleData(vehicleId: string, userToken: string) {
-    try {
-      // Get vehicle information using the data SDK
-      const vehicleData = await this.dimo.identity.getVehicle({
-        tokenId: parseInt(vehicleId),
-      });
-
-      return vehicleData;
-    } catch (error) {
-      console.error("Error fetching DIMO vehicle data:", error);
-      throw error;
-    }
-  }
-
-  async getVehicleLocation(vehicleId: string, userToken: string) {
+  async getVehicleLocation(vehicleId: string) {
     try {
       const tokenId = parseInt(vehicleId);
 
@@ -144,7 +129,7 @@ export class DimoService {
     }
   }
 
-  async getVehicleWeeklyHistory(vehicleId: string, userToken: string) {
+  async getVehicleWeeklyHistory(vehicleId: string) {
     try {
       const tokenId = parseInt(vehicleId);
 
@@ -209,31 +194,6 @@ export class DimoService {
       throw error;
     }
   }
-
-  async getVehicleTelemetry(vehicleId: string, signals: string[] = []) {
-    try {
-      // Get telemetry data for specified signals
-      const defaultSignals = [
-        "location.latitude",
-        "location.longitude",
-        "location.accuracy",
-        "speed",
-        "odometer",
-      ];
-
-      const requestedSignals = signals.length > 0 ? signals : defaultSignals;
-
-      const telemetryData = await this.dimo.telemetry.getLatest({
-        tokenId: parseInt(vehicleId),
-        signals: requestedSignals,
-      });
-
-      return telemetryData;
-    } catch (error) {
-      console.error("Error fetching DIMO vehicle telemetry:", error);
-      throw error;
-    }
-  }
 }
 
 export const dimoService = new DimoService();

server/routes.ts

@@ -95,15 +95,10 @@ export async function registerRoutes(app: Express): Promise<Server> {
         return;
       }
 
-      const userToken = authHeader.substring(7);
-
       console.log("Fetching real-time location for vehicle:", vehicleId);
 
       // Use the real DIMO service to get vehicle location
-      const locationData = await dimoService.getVehicleLocation(
-        vehicleId,
-        userToken,
-      );
+      const locationData = await dimoService.getVehicleLocation(vehicleId);
 
       // Automatically save to GPS storage for visualization
       const savedData = await storage.saveGpsData(locationData);
@@ -133,15 +128,10 @@ export async function registerRoutes(app: Express): Promise<Server> {
         return;
       }
 
-      const userToken = authHeader.substring(7);
-
       console.log("Fetching weekly location for vehicle:", vehicleId);
 
       // Use the real DIMO service to get vehicle location
-      const locationData = await dimoService.getVehicleWeeklyHistory(
-        vehicleId,
-        userToken,
-      );
+      const locationData = await dimoService.getVehicleWeeklyHistory(vehicleId);
       console.log("Weekly location data:", locationData);
       // Automatically save to GPS storage for visualization
       const savedData = await storage.saveGpsData(locationData);
@@ -158,67 +148,6 @@ export async function registerRoutes(app: Express): Promise<Server> {
     }
   });
 
-  app.get("/api/dimo/vehicles/:vehicleId/data", async (req, res) => {
-    try {
-      const { vehicleId } = req.params;
-      const authHeader = req.headers.authorization;
-
-      if (!authHeader || !authHeader.startsWith("Bearer ")) {
-        res
-          .status(401)
-          .json({ message: "Missing or invalid authorization token" });
-        return;
-      }
-
-      const userToken = authHeader.substring(7);
-      const vehicleData = await dimoService.getVehicleData(
-        vehicleId,
-        userToken,
-      );
-      res.json(vehicleData);
-    } catch (error) {
-      console.error("Error fetching DIMO vehicle data:", error);
-      res
-        .status(500)
-        .json({ message: "Failed to fetch vehicle data from DIMO" });
-    }
-  });
-
-  app.get("/api/dimo/vehicles/:vehicleId/telemetry", async (req, res) => {
-    try {
-      const { vehicleId } = req.params;
-      const { signals } = req.query;
-      const authHeader = req.headers.authorization;
-
-      if (!authHeader || !authHeader.startsWith("Bearer ")) {
-        res
-          .status(401)
-          .json({ message: "Missing or invalid authorization token" });
-        return;
-      }
-
-      const requestedSignals = signals ? (signals as string).split(",") : [];
-      const telemetryData = await dimoService.getVehicleTelemetry(
-        vehicleId,
-        requestedSignals,
-      );
-      res.json(telemetryData);
-    } catch (error) {
-      console.error("Error fetching DIMO vehicle telemetry:", error);
-      res
-        .status(500)
-        .json({ message: "Failed to fetch vehicle telemetry from DIMO" });
-    }
-  });
-
-  // Legacy route - redirects to new endpoint
-  app.get("/api/dimo/shared-vehicles", async (req, res) => {
-    res.status(410).json({
-      message:
-        "This endpoint has been deprecated. Please use /api/dimo/vehicles with proper authentication.",
-    });
-  });
-
   const httpServer = createServer(app);
   return httpServer;
 }