👔 Captcha usage in check in & register
🐛 Fix counting streak bugs etc
This commit is contained in:
@ -31,16 +31,27 @@ func CheckCanCheckIn(user models.Account) error {
|
||||
func GetCheckInStreak(user models.Account) (int64, error) {
|
||||
var streaks int64
|
||||
if err := database.C.Raw(`WITH dates AS (
|
||||
SELECT DISTINCT created_at::DATE AS created_date
|
||||
FROM check_in_records
|
||||
WHERE created_at::DATE <= CURRENT_DATE AND account_id = ?
|
||||
),
|
||||
streak AS (
|
||||
SELECT created_date,
|
||||
created_date - INTERVAL '1 day' * ROW_NUMBER() OVER (ORDER BY created_date) AS grp
|
||||
FROM dates
|
||||
)
|
||||
SELECT COUNT(*) FROM streak WHERE grp = (SELECT MIN(grp) FROM streak);`, user.ID).Scan(&streaks).Error; err != nil {
|
||||
SELECT DISTINCT created_at::DATE AS created_date
|
||||
FROM check_in_records
|
||||
WHERE created_at::DATE <= CURRENT_DATE
|
||||
AND account_id = ?
|
||||
),
|
||||
streak AS (
|
||||
SELECT created_date,
|
||||
created_date - INTERVAL '1 day' * (ROW_NUMBER() OVER (ORDER BY created_date)) AS grp
|
||||
FROM dates
|
||||
),
|
||||
grouped_streaks AS (
|
||||
SELECT grp, COUNT(*) AS streak_length, MAX(created_date) AS last_date
|
||||
FROM streak
|
||||
GROUP BY grp
|
||||
),
|
||||
last_streak AS (
|
||||
SELECT streak_length
|
||||
FROM grouped_streaks
|
||||
WHERE last_date = (SELECT MAX(created_date) FROM dates)
|
||||
)
|
||||
SELECT COALESCE(streak_length, 0) FROM last_streak;`, user.ID).Scan(&streaks).Error; err != nil {
|
||||
return streaks, err
|
||||
}
|
||||
return streaks, nil
|
||||
|
@ -9,6 +9,7 @@ import (
|
||||
"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"git.solsynth.dev/hypernet/passport/pkg/internal/gap"
|
||||
"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
|
||||
|
||||
"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
|
||||
@ -136,7 +137,7 @@ func updateUserinfo(c *fiber.Ctx) error {
|
||||
} else {
|
||||
data.Nick = strings.TrimSpace(data.Nick)
|
||||
}
|
||||
if !services.ValidateAccountName(data.Nick, 4, 24) {
|
||||
if !services.ValidateAccountName(data.Nick, 1, 24) {
|
||||
return fiber.NewError(fiber.StatusBadRequest, "invalid account nick, length requires 4 to 24")
|
||||
}
|
||||
|
||||
@ -205,12 +206,13 @@ func updateAccountLanguage(c *fiber.Ctx) error {
|
||||
|
||||
func doRegister(c *fiber.Ctx) error {
|
||||
var data struct {
|
||||
Name string `json:"name" validate:"required,lowercase,alphanum,min=4,max=16"`
|
||||
Nick string `json:"nick" validate:"required"`
|
||||
Email string `json:"email" validate:"required,email"`
|
||||
Password string `json:"password" validate:"required,min=4,max=32"`
|
||||
Language string `json:"language" validate:"required,bcp47_language_tag"`
|
||||
MagicToken string `json:"magic_token"`
|
||||
Name string `json:"name" validate:"required,lowercase,alphanum,min=4,max=16"`
|
||||
Nick string `json:"nick" validate:"required"`
|
||||
Email string `json:"email" validate:"required,email"`
|
||||
Password string `json:"password" validate:"required,min=4,max=32"`
|
||||
Language string `json:"language" validate:"required,bcp47_language_tag"`
|
||||
CaptchaToken string `json:"captcha_token" validate:"required"`
|
||||
MagicToken string `json:"magic_token"`
|
||||
}
|
||||
|
||||
if err := exts.BindAndValidate(c, &data); err != nil {
|
||||
@ -223,7 +225,7 @@ func doRegister(c *fiber.Ctx) error {
|
||||
if _, err := strconv.Atoi(data.Name); err == nil {
|
||||
return fiber.NewError(fiber.StatusBadRequest, "invalid account name, cannot be pure number")
|
||||
}
|
||||
if !services.ValidateAccountName(data.Nick, 4, 24) {
|
||||
if !services.ValidateAccountName(data.Nick, 1, 24) {
|
||||
return fiber.NewError(fiber.StatusBadRequest, "invalid account nick, length requires 4 to 24")
|
||||
}
|
||||
if viper.GetBool("use_registration_magic_token") && len(data.MagicToken) <= 0 {
|
||||
@ -236,6 +238,10 @@ func doRegister(c *fiber.Ctx) error {
|
||||
}
|
||||
}
|
||||
|
||||
if !gap.Nx.ValidateCaptcha(data.CaptchaToken, c.IP()) {
|
||||
return fiber.NewError(fiber.StatusBadRequest, "captcha check failed")
|
||||
}
|
||||
|
||||
if user, err := services.CreateAccount(
|
||||
data.Name,
|
||||
data.Nick,
|
||||
|
@ -3,6 +3,7 @@ package api
|
||||
import (
|
||||
"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
|
||||
"git.solsynth.dev/hypernet/passport/pkg/internal/database"
|
||||
"git.solsynth.dev/hypernet/passport/pkg/internal/gap"
|
||||
"git.solsynth.dev/hypernet/passport/pkg/internal/services"
|
||||
"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
|
||||
"github.com/gofiber/fiber/v2"
|
||||
@ -95,6 +96,17 @@ func doCheckIn(c *fiber.Ctx) error {
|
||||
}
|
||||
user := c.Locals("user").(models.Account)
|
||||
|
||||
var data struct {
|
||||
CaptchaToken string `json:"captcha_token" validate:"required"`
|
||||
}
|
||||
if err := exts.BindAndValidate(c, &data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !gap.Nx.ValidateCaptcha(data.CaptchaToken, c.IP()) {
|
||||
return fiber.NewError(fiber.StatusBadRequest, "captcha check failed")
|
||||
}
|
||||
|
||||
if record, err := services.CheckIn(user); err != nil {
|
||||
return fiber.NewError(fiber.StatusBadRequest, err.Error())
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user