From 39d6bc10f7dc5b1a4f4f54fb927ebcd9e53ce7d6 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sat, 13 Jan 2024 18:04:38 +0800
Subject: [PATCH] Fix GetCaptchaStatus() crash if not logged in

---
 controllers/auth.go            | 20 ++++++++++++--------
 web/src/table/ProviderTable.js |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/controllers/auth.go b/controllers/auth.go
index b96a3804..80936956 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -980,16 +980,20 @@ func (c *ApiController) GetCaptchaStatus() {
 		return
 	}
 
-	failedSigninLimit, _, err := object.GetFailedSigninConfigByUser(user)
-	if err != nil {
-		c.ResponseError(err.Error())
-		return
+	captchaEnabled := false
+	if user != nil {
+		var failedSigninLimit int
+		failedSigninLimit, _, err = object.GetFailedSigninConfigByUser(user)
+		if err != nil {
+			c.ResponseError(err.Error())
+			return
+		}
+
+		if user.SigninWrongTimes >= failedSigninLimit {
+			captchaEnabled = true
+		}
 	}
 
-	var captchaEnabled bool
-	if user != nil && user.SigninWrongTimes >= failedSigninLimit {
-		captchaEnabled = true
-	}
 	c.ResponseOk(captchaEnabled)
 }
 
diff --git a/web/src/table/ProviderTable.js b/web/src/table/ProviderTable.js
index 3e161053..c9383cac 100644
--- a/web/src/table/ProviderTable.js
+++ b/web/src/table/ProviderTable.js
@@ -193,7 +193,7 @@ class ProviderTable extends React.Component {
         title: i18next.t("application:Rule"),
         dataIndex: "rule",
         key: "rule",
-        width: "100px",
+        width: "120px",
         render: (text, record, index) => {
           if (record.provider?.type === "Google") {
             if (text === "None") {