From 678962d4ca3045bd869930efef0a196a0f8a29ba Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Sat, 20 May 2023 19:39:01 +0430 Subject: some fix and prune for tgbot --- web/controller/index.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'web/controller/index.go') diff --git a/web/controller/index.go b/web/controller/index.go index ac2ceca1..7a7a0cce 100644 --- a/web/controller/index.go +++ b/web/controller/index.go @@ -60,15 +60,16 @@ func (a *IndexController) login(c *gin.Context) { pureJsonMsg(c, false, I18n(c, "pages.login.toasts.emptyPassword")) return } + user := a.userService.CheckUser(form.Username, form.Password, form.LoginSecret) timeStr := time.Now().Format("2006-01-02 15:04:05") if user == nil { - a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0) logger.Infof("wrong username or password: \"%s\" \"%s\"", form.Username, form.Password) + a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0) pureJsonMsg(c, false, I18n(c, "pages.login.toasts.wrongUsernameOrPassword")) return } else { - logger.Infof("%s login success,Ip Address:%s\n", form.Username, getRemoteIp(c)) + logger.Infof("%s login success, Ip Address: %s\n", form.Username, getRemoteIp(c)) a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 1) } -- cgit v1.2.3 From 9b7cddbec747af9d3a70dddb1179ecb14659d67e Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Sat, 20 May 2023 19:51:45 +0430 Subject: update to use WebI18n func --- web/controller/index.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'web/controller/index.go') diff --git a/web/controller/index.go b/web/controller/index.go index 7a7a0cce..a7fc1ea9 100644 --- a/web/controller/index.go +++ b/web/controller/index.go @@ -49,15 +49,15 @@ func (a *IndexController) login(c *gin.Context) { var form LoginForm err := c.ShouldBind(&form) if err != nil { - pureJsonMsg(c, false, I18n(c, "pages.login.toasts.invalidFormData")) + pureJsonMsg(c, false, WebI18n(c, "pages.login.toasts.invalidFormData")) return } if form.Username == "" { - pureJsonMsg(c, false, I18n(c, "pages.login.toasts.emptyUsername")) + pureJsonMsg(c, false, WebI18n(c, "pages.login.toasts.emptyUsername")) return } if form.Password == "" { - pureJsonMsg(c, false, I18n(c, "pages.login.toasts.emptyPassword")) + pureJsonMsg(c, false, WebI18n(c, "pages.login.toasts.emptyPassword")) return } @@ -66,7 +66,7 @@ func (a *IndexController) login(c *gin.Context) { if user == nil { logger.Infof("wrong username or password: \"%s\" \"%s\"", form.Username, form.Password) a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0) - pureJsonMsg(c, false, I18n(c, "pages.login.toasts.wrongUsernameOrPassword")) + pureJsonMsg(c, false, WebI18n(c, "pages.login.toasts.wrongUsernameOrPassword")) return } else { logger.Infof("%s login success, Ip Address: %s\n", form.Username, getRemoteIp(c)) @@ -87,7 +87,7 @@ func (a *IndexController) login(c *gin.Context) { err = session.SetLoginUser(c, user) logger.Info("user", user.Id, "login success") - jsonMsg(c, I18n(c, "pages.login.toasts.successLogin"), err) + jsonMsg(c, WebI18n(c, "pages.login.toasts.successLogin"), err) } func (a *IndexController) logout(c *gin.Context) { -- cgit v1.2.3 From d9b1b200cebb82087037d505f13151dd425577a6 Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Sun, 21 May 2023 03:29:27 +0430 Subject: rename I18n to I18nWeb --- web/controller/index.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'web/controller/index.go') diff --git a/web/controller/index.go b/web/controller/index.go index a7fc1ea9..0254106c 100644 --- a/web/controller/index.go +++ b/web/controller/index.go @@ -49,15 +49,15 @@ func (a *IndexController) login(c *gin.Context) { var form LoginForm err := c.ShouldBind(&form) if err != nil { - pureJsonMsg(c, false, WebI18n(c, "pages.login.toasts.invalidFormData")) + pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.invalidFormData")) return } if form.Username == "" { - pureJsonMsg(c, false, WebI18n(c, "pages.login.toasts.emptyUsername")) + pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.emptyUsername")) return } if form.Password == "" { - pureJsonMsg(c, false, WebI18n(c, "pages.login.toasts.emptyPassword")) + pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.emptyPassword")) return } @@ -66,7 +66,7 @@ func (a *IndexController) login(c *gin.Context) { if user == nil { logger.Infof("wrong username or password: \"%s\" \"%s\"", form.Username, form.Password) a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0) - pureJsonMsg(c, false, WebI18n(c, "pages.login.toasts.wrongUsernameOrPassword")) + pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.wrongUsernameOrPassword")) return } else { logger.Infof("%s login success, Ip Address: %s\n", form.Username, getRemoteIp(c)) @@ -87,7 +87,7 @@ func (a *IndexController) login(c *gin.Context) { err = session.SetLoginUser(c, user) logger.Info("user", user.Id, "login success") - jsonMsg(c, WebI18n(c, "pages.login.toasts.successLogin"), err) + jsonMsg(c, I18nWeb(c, "pages.login.toasts.successLogin"), err) } func (a *IndexController) logout(c *gin.Context) { -- cgit v1.2.3