@terreno/api 0.20.0 → 0.20.2

package/dist/auth.js

@@ -90,6 +90,7 @@ exports.addMeRoutes = exports.addAuthRoutes = exports.setupAuth = exports.genera
 var node_crypto_1 = require("node:crypto");
 var express_1 = __importDefault(require("express"));
 var jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+var luxon_1 = require("luxon");
 var ms_1 = __importDefault(require("ms"));
 var passport_1 = __importDefault(require("passport"));
 var passport_anonymous_1 = require("passport-anonymous");
@@ -247,7 +248,6 @@ var generateTokens = function (user_1, authOptions_1) {
     });
 };
 exports.generateTokens = generateTokens;
-// TODO allow customization
 var setupAuth = function (app, userModel) {
     passport_1.default.use(new passport_anonymous_1.Strategy());
     passport_1.default.use(userModel.createStrategy());
@@ -371,7 +371,7 @@ var setupAuth = function (app, userModel) {
                             ? error.expiredAt
                             : undefined;
                         message = (0, errors_1.errorMessage)(error);
-                        details = "[jwt] Error decoding token".concat(userText, ": ").concat(error, ", expired at ").concat(expiredAt, ", current time: ").concat(Date.now());
+                        details = "[jwt] Error decoding token".concat(userText, ": ").concat(error, ", expired at ").concat(expiredAt, ", current time: ").concat(luxon_1.DateTime.now().toMillis());
                         logger_1.logger.debug(details);
                         return [2 /*return*/, res.status(401).json({ details: details, message: message })];
                     }

package/dist/secretProviders.js

@@ -97,6 +97,7 @@ var __values = (this && this.__values) || function(o) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CachingSecretProvider = exports.CompositeSecretProvider = exports.GcpSecretProvider = exports.EnvSecretProvider = void 0;
+var luxon_1 = require("luxon");
 var errors_1 = require("./errors");
 var logger_1 = require("./logger");
 /**
@@ -368,7 +369,7 @@ var CachingSecretProvider = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         key = this.cacheKey(secretName, version);
-                        now = Date.now();
+                        now = luxon_1.DateTime.now().toMillis();
                         cached = this.cache.get(key);
                         if (cached && cached.expiresAt > now) {
                             return [2 /*return*/, cached.value];

package/package.json

@@ -109,5 +109,5 @@
     "updateSnapshot": "bun test --update-snapshots"
   },
   "types": "dist/index.d.ts",
-  "version": "0.20.0"
+  "version": "0.20.2"
 }

package/src/auth.ts

@@ -1,6 +1,7 @@
 import {randomUUID} from "node:crypto";
 import express from "express";
 import jwt, {type JwtPayload} from "jsonwebtoken";
+import {DateTime} from "luxon";
 import type {Model, ObjectId} from "mongoose";
 import ms, {type StringValue} from "ms";
 import passport from "passport";
@@ -185,7 +186,6 @@ export const generateTokens = async (
   return {refreshToken, sessionId, token};
 };
 
-// TODO allow customization
 export const setupAuth = (app: express.Application, userModel: UserModel): void => {
   passport.use(new AnonymousStrategy());
   passport.use(userModel.createStrategy());
@@ -300,7 +300,7 @@ export const setupAuth = (app: express.Application, userModel: UserModel): void
           ? (error as {expiredAt?: unknown}).expiredAt
           : undefined;
       const message = errorMessage(error);
-      const details = `[jwt] Error decoding token${userText}: ${error}, expired at ${expiredAt}, current time: ${Date.now()}`;
+      const details = `[jwt] Error decoding token${userText}: ${error}, expired at ${expiredAt}, current time: ${DateTime.now().toMillis()}`;
       logger.debug(details);
       return res.status(401).json({details, message});
     }

package/src/secretProviders.ts

@@ -1,3 +1,5 @@
+import {DateTime} from "luxon";
+
 import type {SecretProvider} from "./configurationPlugin";
 import {APIError} from "./errors";
 import {logger} from "./logger";
@@ -245,7 +247,7 @@ export class CachingSecretProvider implements SecretProvider {
 
   async getSecret(secretName: string, version?: string): Promise<string | null> {
     const key = this.cacheKey(secretName, version);
-    const now = Date.now();
+    const now = DateTime.now().toMillis();
     const cached = this.cache.get(key);
     if (cached && cached.expiresAt > now) {
       return cached.value;