fix(auth): grant trial only on email bind
Build docker and publish / build (20.15.1) (push) Successful in 5m17s
Build docker and publish / build (20.15.1) (push) Successful in 5m17s
Co-Authored-By: claude-flow <ruv@ruv.net>
This commit is contained in:
@@ -63,7 +63,7 @@ func main() {
|
||||
*ip = fmt.Sprintf("198.18.%d.%d", now%200+1, now/200%200+1)
|
||||
}
|
||||
|
||||
fmt.Println("== device trial registration test ==")
|
||||
fmt.Println("== device registration no-trial test ==")
|
||||
fmt.Printf("mysql: %s/%s\n", env.cfg.MySQL.Addr, env.cfg.MySQL.Dbname)
|
||||
fmt.Printf("redis: %s db=%d\n", env.cfg.Redis.Host, env.cfg.Redis.DB)
|
||||
fmt.Printf("device.enable=%v\n", env.svcCtx.Config.Device.Enable)
|
||||
@@ -111,11 +111,6 @@ func main() {
|
||||
Find(&subs).Error; err != nil {
|
||||
fail(fmt.Errorf("query user_subscribe failed: %w", err))
|
||||
}
|
||||
if len(subs) == 0 {
|
||||
fail(fmt.Errorf("FAIL: no user_subscribe rows created for user_id=%d", device.UserId))
|
||||
}
|
||||
|
||||
var trial *modelUser.Subscribe
|
||||
for i := range subs {
|
||||
sub := &subs[i]
|
||||
fmt.Printf("subscribe: id=%d order_id=%d subscribe_id=%d status=%d start=%s expire=%s token_empty=%v\n",
|
||||
@@ -131,17 +126,11 @@ func main() {
|
||||
sub.SubscribeId == env.svcCtx.Config.Register.TrialSubscribe &&
|
||||
(sub.Status == 0 || sub.Status == 1) &&
|
||||
sub.ExpireTime.After(time.Now()) {
|
||||
trial = sub
|
||||
fail(fmt.Errorf("FAIL: device registration unexpectedly granted trial user_subscribe_id=%d user_id=%d", sub.Id, device.UserId))
|
||||
}
|
||||
}
|
||||
|
||||
if trial == nil {
|
||||
fail(fmt.Errorf("FAIL: trial subscription was not granted for user_id=%d", device.UserId))
|
||||
}
|
||||
fmt.Printf("PASS: trial granted user_subscribe_id=%d expire_time=%s\n",
|
||||
trial.Id,
|
||||
trial.ExpireTime.Format(time.RFC3339),
|
||||
)
|
||||
fmt.Printf("PASS: device registration created no active trial subscription for user_id=%d\n", device.UserId)
|
||||
|
||||
if *cleanup {
|
||||
if err = cleanupTestRows(ctx, env.db, device.UserId); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user