fix: oauth2 callback failed (#691)

CHANGELOG.md

@@ -1,7 +1,11 @@
 <!-- markdownlint-disable-file MD004 MD024 MD034 MD036 -->
 # CHANGE LOG
 
-## main(v1.0.1)
+## v1.0.2
+
+- fix: 修复 oauth2 登录失败的问题
+
+## v1.0.1
 
 - feat: |UI| 增加极简模式主页, 可在 `外观` 中切换
 - fix: 修复 oauth2 登录时，default role 不生效的问题

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare_temp_email",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "type": "module",
   "scripts": {

pages/package.json

@@ -1,6 +1,6 @@
 {
   "name": "temp-email-pages",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {

vitepress-docs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "temp-mail-docs",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "devDependencies": {
     "@types/node": "^24.0.15",

worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare_temp_email",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "type": "module",
   "scripts": {

worker/src/constants.ts

@@ -1,5 +1,5 @@
 export const CONSTANTS = {
-    VERSION: 'v' + '1.0.1',
+    VERSION: 'v' + '1.0.2',
 
     // DB Version
     DB_VERSION_KEY: 'db_version',

worker/src/user_api/oauth2.ts

@@ -110,20 +110,22 @@ export default {
         if (!user_id) {
             return c.text(msgs.UserNotFoundMsg, 400)
         }
+        // process user roles
         const defaultRole = getStringValue(c.env.USER_DEFAULT_ROLE);
-        if (!defaultRole) return c.json({ success: true })
-        const user_roles = getUserRoles(c);
-        if (!user_roles.find((r) => r.role === defaultRole)) {
-            return c.text(msgs.InvalidUserDefaultRoleMsg, 500);
-        }
-        // update user roles
-        const { success: success2 } = await c.env.DB.prepare(
-            `INSERT INTO user_roles (user_id, role_text)`
-            + ` VALUES (?, ?)`
-            + ` ON CONFLICT(user_id) DO NOTHING`
-        ).bind(user_id, defaultRole).run();
-        if (!success2) {
-            return c.text(msgs.FailedUpdateUserDefaultRoleMsg, 500);
+        if (defaultRole) {
+            const user_roles = getUserRoles(c);
+            if (!user_roles.find((r) => r.role === defaultRole)) {
+                return c.text(msgs.InvalidUserDefaultRoleMsg, 500);
+            }
+            // update user roles
+            const { success: success2 } = await c.env.DB.prepare(
+                `INSERT INTO user_roles (user_id, role_text)`
+                + ` VALUES (?, ?)`
+                + ` ON CONFLICT(user_id) DO NOTHING`
+            ).bind(user_id, defaultRole).run();
+            if (!success2) {
+                return c.text(msgs.FailedUpdateUserDefaultRoleMsg, 500);
+            }
         }
         // create jwt
         const jwt = await Jwt.sign({