Merge pull request #54 from diskcloud/feature/51

fix(auth): #51 JWT 及 Redis 改为通用环境变量'TOKEN_EXPIRE_TIME'

Author: CrazyMrYan

routers/users.js

@@ -11,6 +11,7 @@ const {
   USERS_LOGIN_POST,
   USER_REST_PARAMS_PATCH,
 } = require("../types/schema/users");
+const { convertTimeFormat } = require("../utils/convertTimeFormat")
 
 const { validateBody, validateParams } = require("../types");
 const { USER_STATUS, USER_ACTION_TYPES } = require("../constants/users");
@@ -41,7 +42,7 @@ router.post("/sessions", validateBody(USERS_LOGIN_POST), async (ctx) => {
     const token = jwt.sign(
       { id: user.id, username: user.username },
       process.env.JWT_SECRET,
-      { expiresIn: process.env.JWT_EXPIRES_IN }
+      { expiresIn: convertTimeFormat(process.env.TOKEN_EXPIRE_TIME, 's') }
     );
 
     jwt.verify(token, process.env.JWT_SECRET, (err, user) => {
@@ -52,7 +53,7 @@ router.post("/sessions", validateBody(USERS_LOGIN_POST), async (ctx) => {
 
     // 将 token 存储在 Redis 中
     await redisClient.set(`user_login:${user.id}`, token, {
-      EX: process.env.USER_LOGIN_TOKEN_EXPIRE_TIME,
+      EX: process.env.TOKEN_EXPIRE_TIME,
     });
 
     user.update({

scripts/setup.ps1

@@ -32,7 +32,7 @@ if (-Not (Test-Path .\.env.local)) {
     $MYSQL_PORT = Prompt-Input "Enter MySQL Port" "3306"
     $REDIS_HOST = Prompt-Input "Enter Redis Host" "127.0.0.1"
     $REDIS_PORT = Prompt-Input "Enter Redis Port" "6379"
-    $USER_LOGIN_TOKEN_EXPIRE_TIME = Prompt-Input "Enter User Login Token Expire Time" "3600"
+    $TOKEN_EXPIRE_TIME = Prompt-Input "Enter User Login Token Expire Time" "86400(1d)"
     $JWT_EXPIRES_IN = Prompt-Input "Enter JWT Expiry Time" "1h"
     $JWT_SECRET = Prompt-Input "Enter JWT Secret"
 

scripts/setup.sh

@@ -32,8 +32,7 @@ if [ ! -f .env.local ]; then
     MYSQL_PORT=$(prompt "MYSQL_PORT" "Enter MySQL Port" "3306")
     REDIS_HOST=$(prompt "REDIS_HOST" "Enter Redis Host" "127.0.0.1")
     REDIS_PORT=$(prompt "REDIS_PORT" "Enter Redis Port" "6379")
-    USER_LOGIN_TOKEN_EXPIRE_TIME=$(prompt "USER_LOGIN_TOKEN_EXPIRE_TIME" "Enter User Login Token Expire Time" "3600")
-    JWT_EXPIRES_IN=$(prompt "JWT_EXPIRES_IN" "Enter JWT Expiry Time" "1h")
+    TOKEN_EXPIRE_TIME=$(prompt "TOKEN_EXPIRE_TIME" "Enter User Login Token Expire Time" "86400(1d)")
     JWT_SECRET=$(prompt "JWT_SECRET" "Enter JWT Secret")
 
     # Create .env.local file

utils/convertTimeFormat.js

@@ -0,0 +1,41 @@
+function convertTimeFormat(time, unit = "ms") {
+  const timeUnits = [
+    { unit: "y", ms: 365 * 24 * 60 * 60 * 1000 }, // 年
+    { unit: "M", ms: 30 * 24 * 60 * 60 * 1000 }, // 月
+    { unit: "w", ms: 7 * 24 * 60 * 60 * 1000 }, // 周
+    { unit: "d", ms: 24 * 60 * 60 * 1000 }, // 天
+    { unit: "h", ms: 60 * 60 * 1000 }, // 小时
+    { unit: "m", ms: 60 * 1000 }, // 分钟
+    { unit: "s", ms: 1000 }, // 秒
+  ];
+
+  if (typeof time === "string") {
+    time = parseInt(time, 10);
+    if (isNaN(time)) {
+      throw new Error("Invalid input: unable to convert string to number.");
+    }
+  } else if (typeof time !== "number") {
+    throw new Error(
+      "Invalid input type: input should be a number or a numeric string."
+    );
+  }
+
+  // 将秒转换为毫秒
+  if (unit === "s") {
+    time = time * 1000;
+  }
+
+  for (let i = 0; i < timeUnits.length; i++) {
+    const { unit, ms } = timeUnits[i];
+    if (time >= ms) {
+      const value = Math.floor(time / ms);
+      return `${value}${unit}`;
+    }
+  }
+
+  return `${time}ms`; // For cases less than 1 second
+}
+
+module.exports = {
+  convertTimeFormat,
+};