对照参考主题(Zibll)修正四项偏差,申诉链路从页面整体迁移至弹窗:
- feat(ban): 新增三个 1:1 复刻弹窗(REST /user-ban/{info,appeal,log}-modal):
查看禁封状态(多彩头 c-gray + 信息行 + 申诉按钮)、禁封申诉(edit-header
gavel/c-blue + 信息框 + 资料项 data[key] 输入 + 审核中态 + 禁止申诉态)、
禁封记录(多彩头 c-yellow + 计数 + 逐条卡片);user-ban.js 增加
data-aksrt-ban-info/appeal/log 委托与 admin-ajax 申诉提交
- feat(ban): 禁封/解封弹窗的「当前用户已有N次禁封记录」静态文案改为可点击
黄链(N>1),打开禁封记录弹窗;解封视图信息行改复用统一数据源
- refactor(ban): 治理展示态收敛至 Restriction::state_badges()(封号=c-red
违规已封号 / 小黑屋=c-yellow 小黑屋禁封中 / 禁言=c-gray 禁言中,颜色与
字段统一管理)+ get_ban_info()(状态/起止时间/原因/说明/申诉权限,
三弹窗与禁封页共用)
- feat(ban): 登录行为对齐参考主题——移除登录期拦截(enforce_login_ban)
与 complete_login 禁封闸门,封号用户可正常登录;新增 template_redirect
前台禁封页(1:1 zib_user_ban_restrict_login/zib_die_page:红盒提示 +
信息行 + 申诉权限 + 退出登录/申诉按钮,模板 templates/parts/user/ban-block.php)
- feat(profile): 公开主页禁封状态从资料卡下方提示框改为占据身份行元信息位
的 badg 徽章(参考主题 author_header_identity 语义);用户中心元信息改为
but 按钮(徽章+箭头)打开查看禁封状态弹窗;评论拒绝态链接同源
- refactor: 移除申诉页面模板(page-ban-appeal.php)及其资产/注册/入队、
get_profile_notice/profile_notice 链、state_labels/state_notices/
login_ban_message、UserRuntime 的 public_notice/ban_notice_text 死配置、
report_settings 死键、无消费方的 aksrt_ban_appeal_status 端点
- feat(ban): BanAppeal::ajax_submit 兼容弹窗 data[key] 表单结构
(逐项清洗入库,申诉说明取 data['申诉说明'],旧平铺字段保持兼容)
- chore: 重新构建 public.css/public.min.css(三个新弹窗几何与头部样式)
- test: 契约测试重写(徽章元信息位、三弹窗与记录链接、禁封页、允许登录 +
前台拦截、死代码移除断言),全量 362 项通过
134 lines
5.1 KiB
PHP
134 lines
5.1 KiB
PHP
<?php
|
|
/**
|
|
* @package AKSRT
|
|
*/
|
|
|
|
namespace AKSRT\Auth;
|
|
|
|
defined('ABSPATH') || exit;
|
|
|
|
final class OAuthAccountService {
|
|
|
|
public static function resolve(string $provider, array $identity) {
|
|
$provider = sanitize_key($provider);
|
|
$provider_id = (string) ($identity['provider_id'] ?? '');
|
|
$user = self::find($provider, $provider_id);
|
|
if ($user instanceof \WP_User) {
|
|
self::refresh($user->ID, $provider, $identity);
|
|
return $user;
|
|
}
|
|
if (
|
|
OAuthProviderCatalog::bind_type() === 'auto'
|
|
&& !empty($identity['email_verified'])
|
|
&& is_email((string) ($identity['email'] ?? ''))
|
|
) {
|
|
$user = get_user_by('email', sanitize_email((string) $identity['email']));
|
|
if ($user instanceof \WP_User) {
|
|
$result = self::bind($user->ID, $provider, $identity);
|
|
return is_wp_error($result) ? $result : $user;
|
|
}
|
|
}
|
|
return new \WP_Error('oauth_no_match', __('需要绑定已有账号', 'aksrt'), [
|
|
'provider' => $provider,
|
|
'user_data' => $identity,
|
|
]);
|
|
}
|
|
|
|
public static function find(string $provider, string $provider_id): ?\WP_User {
|
|
$provider = sanitize_key($provider);
|
|
if (!OAuthProviderCatalog::is_binding_provider($provider) || $provider_id === '') {
|
|
return null;
|
|
}
|
|
$users = get_users([
|
|
'meta_key' => 'aksrt_' . $provider . '_id',
|
|
'meta_value' => $provider_id,
|
|
'number' => 1,
|
|
'fields' => 'all',
|
|
]);
|
|
return !empty($users[0]) && $users[0] instanceof \WP_User ? $users[0] : null;
|
|
}
|
|
|
|
public static function bind(int $user_id, string $provider, array $identity) {
|
|
$provider = sanitize_key($provider);
|
|
$provider_id = trim((string) ($identity['provider_id'] ?? ''));
|
|
if ($user_id <= 0 || !OAuthProviderCatalog::is_binding_provider($provider) || $provider_id === '') {
|
|
return new \WP_Error('oauth_binding_invalid', __('第三方账号信息无效', 'aksrt'));
|
|
}
|
|
$scope = 'identity:' . $provider . ':' . $provider_id;
|
|
$lock = OAuthTransactionStore::acquire_lock($scope, 20);
|
|
if ($lock === false) {
|
|
return new \WP_Error('oauth_binding_busy', __('该第三方账号正在绑定,请稍后重试', 'aksrt'));
|
|
}
|
|
try {
|
|
$existing = self::find($provider, $provider_id);
|
|
if ($existing && (int) $existing->ID !== $user_id) {
|
|
return new \WP_Error('oauth_binding_conflict', __('该第三方账号已被其他用户绑定', 'aksrt'));
|
|
}
|
|
update_user_meta($user_id, 'aksrt_' . $provider . '_id', $provider_id);
|
|
$bindings = get_user_meta($user_id, 'aksrt_oauth_bindings', true);
|
|
$bindings = is_array($bindings) ? array_values(array_intersect($bindings, OAuthProviderCatalog::all_binding_keys())) : [];
|
|
if (!in_array($provider, $bindings, true)) {
|
|
$bindings[] = $provider;
|
|
}
|
|
update_user_meta($user_id, 'aksrt_oauth_bindings', array_values(array_unique($bindings)));
|
|
if (!empty($identity['avatar_url'])) {
|
|
update_user_meta($user_id, 'aksrt_oauth_avatar', esc_url_raw((string) $identity['avatar_url']));
|
|
}
|
|
return true;
|
|
} finally {
|
|
OAuthTransactionStore::release_lock($scope, (string) $lock);
|
|
}
|
|
}
|
|
|
|
public static function unbind(int $user_id, string $provider) {
|
|
$provider = sanitize_key($provider);
|
|
if ($user_id <= 0 || !OAuthProviderCatalog::is_binding_provider($provider)) {
|
|
return new \WP_Error('oauth_unbind_invalid', __('第三方账号类型无效', 'aksrt'));
|
|
}
|
|
if (!self::has_recovery_after_unbind($user_id, $provider)) {
|
|
return new \WP_Error('oauth_last_login_method', __('请先设置其他登录或找回方式,再解除当前绑定', 'aksrt'));
|
|
}
|
|
$bindings = get_user_meta($user_id, 'aksrt_oauth_bindings', true);
|
|
$bindings = is_array($bindings) ? $bindings : [];
|
|
$bindings = array_values(array_diff($bindings, [$provider]));
|
|
update_user_meta($user_id, 'aksrt_oauth_bindings', $bindings);
|
|
delete_user_meta($user_id, 'aksrt_' . $provider . '_id');
|
|
delete_user_meta($user_id, 'aksrt_' . $provider . '_token');
|
|
return true;
|
|
}
|
|
|
|
public static function complete_login(\WP_User $user, bool $remember = true): void {
|
|
wp_set_current_user($user->ID);
|
|
wp_set_auth_cookie($user->ID, $remember);
|
|
do_action('wp_login', $user->user_login, $user);
|
|
}
|
|
|
|
public static function bindings(int $user_id): array {
|
|
$bindings = get_user_meta($user_id, 'aksrt_oauth_bindings', true);
|
|
return is_array($bindings) ? array_values(array_intersect($bindings, OAuthProviderCatalog::all_binding_keys())) : [];
|
|
}
|
|
|
|
private static function refresh(int $user_id, string $provider, array $identity): void {
|
|
$bindings = self::bindings($user_id);
|
|
if (!in_array($provider, $bindings, true)) {
|
|
$bindings[] = $provider;
|
|
update_user_meta($user_id, 'aksrt_oauth_bindings', array_values(array_unique($bindings)));
|
|
}
|
|
if (!empty($identity['avatar_url'])) {
|
|
update_user_meta($user_id, 'aksrt_oauth_avatar', esc_url_raw((string) $identity['avatar_url']));
|
|
}
|
|
}
|
|
|
|
private static function has_recovery_after_unbind(int $user_id, string $provider): bool {
|
|
$remaining = array_values(array_diff(self::bindings($user_id), [$provider]));
|
|
if ($remaining !== []) {
|
|
return true;
|
|
}
|
|
if (get_user_meta($user_id, 'aksrt_phone_verified', true) === '1') {
|
|
return true;
|
|
}
|
|
$user = get_user_by('id', $user_id);
|
|
return $user instanceof \WP_User && is_email($user->user_email);
|
|
}
|
|
}
|