|
|
19777df2ed
|
fix: bindEmailWithVerificationLogic 邮箱绑定后赠送逻辑错误
**问题**: 邮箱绑定后应该赠送 trial 的逻辑判断错误，导致以下场景无法赠送：
- EnableTrial=true, EnableTrialEmailWhitelist=false → 应该赠送但未赠送
**根本原因**: 第215行条件判断使用 OR 逻辑，要求白名单必须启用才处理
```go
if !rc.EnableTrial || !rc.EnableTrialEmailWhitelist {
return // ❌ 错误：关闭白名单时也返回，无法赠送
}
```
**修复**: 改为正确的逻辑
```go
if !rc.EnableTrial {
return // 关闭赠送时不处理
}
if rc.EnableTrialEmailWhitelist && !IsEmailDomainWhitelisted(...) {
return // 白名单启用但域名不匹配时不赠送
}
// 否则赠送
```
**影响场景**:
- 设备登录 → 绑定邮箱 → 应该赠送 trial
- 当 EnableTrialEmailWhitelist=false 时，应该赠送（修复前未赠送）
- 当 EnableTrialEmailWhitelist=true 且域名在白名单 → 赠送（修复前未赠送）
Co-Authored-By: claude-flow <ruv@ruv.net>
|
2026-04-03 07:17:27 -07:00 |
|
|
|
3417da2a9e
|
feat: trial 赠送改为白名单邮箱域名控制
Build docker and publish / build (20.15.1) (push) Failing after 7m14s
- 新增 EnableTrialEmailWhitelist + TrialEmailDomainWhitelist 配置
- 邮箱注册/登录：加白名单域名判断，域名匹配才赠送 trial
- 设备登录/手机注册：移除 activeTrial，不再自动赠送
- 绑定邮箱(bindEmailWithVerification)：绑定成功后检查白名单+防重复赠送
- 新增 IsEmailDomainWhitelisted 导出函数供跨包调用
- 清理 deviceLoginLogic/telephoneUserRegisterLogic 中的 activeTrial 死代码
Co-Authored-By: claude-flow <ruv@ruv.net>
|
2026-04-02 05:46:04 -07:00 |
|
|
|
a3cc23bbd4
|
feat: 绑定新邮箱时创建独立邮箱用户并转移订阅，而非挂在设备用户上
Build docker and publish / build (20.15.1) (push) Successful in 8m5s
- bindEmailWithVerificationLogic: 新邮箱路径改为创建独立 email user + joinFamily
- familyBindingHelper: clearMemberSubscribes → transferMemberSubscribesToOwner，订阅转移给 owner 而非删除
- accountMergeHelper: 同步更新调用点
Co-Authored-By: claude-flow <ruv@ruv.net>
|
2026-03-12 00:52:50 -07:00 |
|
|
|
69ac1f104d
|
修复订单支付显示方式
Build docker and publish / build (20.15.1) (push) Has been cancelled
|
2026-03-04 23:20:36 -08:00 |
|
|
|
70c0483ca9
|
修复订阅
Build docker and publish / build (20.15.1) (push) Failing after 8m2s
|
2026-03-04 23:08:46 -08:00 |
|
|
|
b08202fd08
|
fix gitea workflow path and runner label
Build docker and publish / build (20.15.1) (push) Failing after 7m52s
|
2026-03-04 03:30:17 -08:00 |
|
|
|
6c370485d1
|
fix gitea workflow path and runner label
Build docker and publish / build (20.15.1) (push) Failing after 8m1s
|
2026-03-04 03:07:41 -08:00 |
|
|
|
4d8516b2e1
|
同步历史版本代码
|
2026-03-03 09:32:22 -08:00 |
|
