fix
This commit is contained in:
root
parent
ae8664db48
commit
4002bdc2cf
|
|
@ -73,180 +73,45 @@ def login_user(
|
|||
@auth_app.command("verify")
|
||||
def verify_token(
|
||||
token: str = typer.Argument(..., help="JWT token"),
|
||||
verbose: bool = typer.Option(False, "--verbose", "-v", help="详细输出")
|
||||
):
|
||||
"""验证JWT token"""
|
||||
|
||||
response = create_response_handler(str(uuid4()))
|
||||
try:
|
||||
console.print(f"🔍 [bold blue]验证Token[/bold blue]")
|
||||
|
||||
# 验证token
|
||||
result = auth_api.verify_token({
|
||||
"token": token
|
||||
})
|
||||
|
||||
if result["success"]:
|
||||
console.print(f"\n✅ [bold green]Token有效![/bold green]")
|
||||
user = result['data']['user']
|
||||
console.print(f"用户: {user['display_name']} ({user['username']})")
|
||||
console.print(f"邮箱: {user['email']}")
|
||||
|
||||
if verbose:
|
||||
# 显示token详细信息
|
||||
token_info = jwt_auth.get_token_info(token)
|
||||
|
||||
info_text = f"""
|
||||
👤 用户信息:
|
||||
ID: {user['user_id']}
|
||||
用户名: {user['username']}
|
||||
邮箱: {user['email']}
|
||||
显示名称: {user['display_name']}
|
||||
|
||||
🔑 Token信息:
|
||||
有效性: {'有效' if token_info['valid'] else '无效'}
|
||||
签发时间: {token_info.get('issued_at', 'Unknown')}
|
||||
过期时间: {token_info.get('expires_at', 'Unknown')}
|
||||
剩余时间: {token_info.get('time_remaining', 'Unknown')}
|
||||
"""
|
||||
|
||||
panel = Panel(info_text.strip(), title="Token详情", border_style="green")
|
||||
console.print(panel)
|
||||
else:
|
||||
console.print(f"[red]❌ Token无效: {result['message']}[/red]")
|
||||
|
||||
if verbose:
|
||||
# 显示token信息（即使无效）
|
||||
token_info = jwt_auth.get_token_info(token)
|
||||
if token_info.get('error'):
|
||||
console.print(f"错误: {token_info['error']}")
|
||||
else:
|
||||
console.print(f"Token状态: {'过期' if token_info.get('is_expired') else '无效'}")
|
||||
|
||||
raise typer.Exit(1)
|
||||
|
||||
response.success(result)
|
||||
except Exception as e:
|
||||
console.print(f"[red]❌ Token验证失败: {str(e)}[/red]")
|
||||
response.error(-32603, f"❌ 注册失败: {str(e)}")
|
||||
raise typer.Exit(1)
|
||||
|
||||
|
||||
@auth_app.command("list")
|
||||
def list_users(
|
||||
include_inactive: bool = typer.Option(False, "--include-inactive", "-i", help="包含非活跃用户"),
|
||||
limit: int = typer.Option(20, "--limit", "-l", help="显示数量限制"),
|
||||
verbose: bool = typer.Option(False, "--verbose", "-v", help="详细输出")
|
||||
):
|
||||
"""列出所有用户"""
|
||||
|
||||
response = create_response_handler(str(uuid4()))
|
||||
try:
|
||||
console.print(f"👥 [bold blue]用户列表[/bold blue]")
|
||||
|
||||
# 获取用户列表
|
||||
users = user_storage.get_all_users(include_inactive)
|
||||
|
||||
if not users:
|
||||
console.print("📭 没有用户")
|
||||
return
|
||||
|
||||
# 限制显示数量
|
||||
total_count = len(users)
|
||||
if len(users) > limit:
|
||||
users = users[:limit]
|
||||
console.print(f"📊 显示前 {limit} 个用户（共 {total_count} 个）")
|
||||
else:
|
||||
console.print(f"📊 共 {total_count} 个用户")
|
||||
|
||||
# 创建表格
|
||||
table = Table(title="用户列表")
|
||||
table.add_column("ID", style="cyan", width=8)
|
||||
table.add_column("用户名", style="green")
|
||||
table.add_column("邮箱", style="yellow")
|
||||
table.add_column("显示名称", style="magenta")
|
||||
table.add_column("状态", style="blue")
|
||||
table.add_column("创建时间", style="dim")
|
||||
|
||||
if verbose:
|
||||
table.add_column("最后登录", style="dim")
|
||||
|
||||
for user in users:
|
||||
# 状态
|
||||
status = "✅ 活跃" if user.is_active else "❌ 禁用"
|
||||
|
||||
# 格式化创建时间
|
||||
created_at = user.created_at
|
||||
if 'T' in created_at:
|
||||
created_at = created_at.split('T')[0] + ' ' + created_at.split('T')[1][:8]
|
||||
|
||||
row = [
|
||||
user.id[:8],
|
||||
user.username,
|
||||
user.email,
|
||||
user.display_name,
|
||||
status,
|
||||
created_at
|
||||
]
|
||||
|
||||
if verbose:
|
||||
last_login = user.last_login or "从未登录"
|
||||
if last_login != "从未登录" and 'T' in last_login:
|
||||
last_login = last_login.split('T')[0] + ' ' + last_login.split('T')[1][:8]
|
||||
row.append(last_login)
|
||||
|
||||
table.add_row(*row)
|
||||
|
||||
console.print(table)
|
||||
|
||||
response.success(users)
|
||||
except Exception as e:
|
||||
console.print(f"[red]❌ 获取用户列表失败: {str(e)}[/red]")
|
||||
response.error(-32603, f"❌ 注册失败: {str(e)}")
|
||||
raise typer.Exit(1)
|
||||
|
||||
|
||||
@auth_app.command("stats")
|
||||
def show_stats():
|
||||
"""显示用户统计信息"""
|
||||
|
||||
response = create_response_handler(str(uuid4()))
|
||||
try:
|
||||
console.print(f"📊 [bold blue]用户统计信息[/bold blue]")
|
||||
|
||||
# 获取统计信息
|
||||
stats = user_storage.get_user_count()
|
||||
|
||||
# 创建统计面板
|
||||
stats_content = f"""
|
||||
📈 [bold green]用户统计[/bold green]
|
||||
总用户数: {stats['total']}
|
||||
活跃用户: {stats['active']}
|
||||
禁用用户: {stats['inactive']}
|
||||
"""
|
||||
|
||||
stats_panel = Panel(stats_content.strip(), title="用户统计", border_style="green")
|
||||
console.print(stats_panel)
|
||||
|
||||
# 显示最近注册的用户
|
||||
recent_users = user_storage.get_all_users()[:5]
|
||||
|
||||
if recent_users:
|
||||
console.print(f"\n🕒 [bold green]最近注册的用户[/bold green]")
|
||||
|
||||
recent_table = Table()
|
||||
recent_table.add_column("用户名", style="green")
|
||||
recent_table.add_column("邮箱", style="yellow")
|
||||
recent_table.add_column("注册时间", style="dim")
|
||||
|
||||
for user in recent_users:
|
||||
created_at = user.created_at
|
||||
if 'T' in created_at:
|
||||
created_at = created_at.split('T')[0] + ' ' + created_at.split('T')[1][:8]
|
||||
|
||||
recent_table.add_row(
|
||||
user.username,
|
||||
user.email,
|
||||
created_at
|
||||
)
|
||||
|
||||
console.print(recent_table)
|
||||
|
||||
response.success(stats)
|
||||
except Exception as e:
|
||||
console.print(f"[red]❌ 获取统计信息失败: {str(e)}[/red]")
|
||||
response.error(-32603, f"❌ 注册失败: {str(e)}")
|
||||
raise typer.Exit(1)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -134,11 +134,12 @@ class PythonCliAuth {
|
|||
display_name: credentials.displayName,
|
||||
}
|
||||
});
|
||||
// 第一层：检查命令行是否执行成功
|
||||
if (!response.success) {
|
||||
throw new Error(response.error || response.message || 'Registration failed');
|
||||
throw new Error(response.error || response.message || 'Command execution failed');
|
||||
}
|
||||
const data = response.data;
|
||||
// 解析输出中的用户信息和token
|
||||
// 第二层：检查认证逻辑是否成功
|
||||
if (data && data.success) {
|
||||
const authData = data;
|
||||
if (authData.success && authData.data?.user && authData.data?.token) {
|
||||
|
|
@ -162,7 +163,8 @@ class PythonCliAuth {
|
|||
}
|
||||
}
|
||||
|
||||
throw new Error(data?.message || 'Registration failed');
|
||||
// 认证逻辑失败
|
||||
throw new Error(data?.message || 'Authentication failed');
|
||||
} catch (error) {
|
||||
console.error('Registration failed:', error);
|
||||
throw error;
|
||||
|
|
|
|||
Loading…
Reference in New Issue