Implement user profile management: add update profile functionality, avatar upload, and change password features
This commit is contained in:
@@ -22,6 +22,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
|
||||
on<AuthenticationResponseSubmitted>(_onAuthenticationResponseSubmitted);
|
||||
on<LogoutRequested>(_onLogoutRequested);
|
||||
on<CheckAuthRequested>(_onCheckAuthRequested);
|
||||
on<UpdateUserProfile>(_onUpdateUserProfile);
|
||||
}
|
||||
|
||||
Future<void> _onSignupStarted(
|
||||
@@ -271,4 +272,23 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
|
||||
emit(AuthUnauthenticated());
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _onUpdateUserProfile(
|
||||
UpdateUserProfile event,
|
||||
Emitter<AuthState> emit,
|
||||
) async {
|
||||
// For now, just update the local state - in real app, call API
|
||||
if (state is AuthAuthenticated) {
|
||||
final currentState = state as AuthAuthenticated;
|
||||
emit(
|
||||
AuthAuthenticated(
|
||||
token: currentState.token,
|
||||
userId: event.updatedUser.id,
|
||||
username: event.updatedUser.username,
|
||||
email: event.updatedUser.email,
|
||||
user: event.updatedUser,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
import '../../models/user.dart';
|
||||
|
||||
abstract class AuthEvent extends Equatable {
|
||||
const AuthEvent();
|
||||
@@ -135,3 +136,12 @@ class PasswordLoginRequested extends AuthEvent {
|
||||
@override
|
||||
List<Object> get props => [username, password];
|
||||
}
|
||||
|
||||
class UpdateUserProfile extends AuthEvent {
|
||||
final User updatedUser;
|
||||
|
||||
const UpdateUserProfile(this.updatedUser);
|
||||
|
||||
@override
|
||||
List<Object> get props => [updatedUser];
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
import '../../models/user.dart';
|
||||
|
||||
abstract class AuthState extends Equatable {
|
||||
const AuthState();
|
||||
@@ -68,16 +69,18 @@ class AuthAuthenticated extends AuthState {
|
||||
final String userId;
|
||||
final String username;
|
||||
final String email;
|
||||
final User? user;
|
||||
|
||||
const AuthAuthenticated({
|
||||
required this.token,
|
||||
required this.userId,
|
||||
required this.username,
|
||||
required this.email,
|
||||
this.user,
|
||||
});
|
||||
|
||||
@override
|
||||
List<Object> get props => [token, userId, username, email];
|
||||
List<Object?> get props => [token, userId, username, email, user];
|
||||
}
|
||||
|
||||
class AuthFailure extends AuthState {
|
||||
|
||||
@@ -5,6 +5,8 @@ class User extends Equatable {
|
||||
final String username;
|
||||
final String email;
|
||||
final String? displayName;
|
||||
final String? avatarUrl;
|
||||
final String? blurHash;
|
||||
final DateTime createdAt;
|
||||
final DateTime? lastLoginAt;
|
||||
|
||||
@@ -13,6 +15,8 @@ class User extends Equatable {
|
||||
required this.username,
|
||||
required this.email,
|
||||
this.displayName,
|
||||
this.avatarUrl,
|
||||
this.blurHash,
|
||||
required this.createdAt,
|
||||
this.lastLoginAt,
|
||||
});
|
||||
@@ -23,6 +27,8 @@ class User extends Equatable {
|
||||
username,
|
||||
email,
|
||||
displayName,
|
||||
avatarUrl,
|
||||
blurHash,
|
||||
createdAt,
|
||||
lastLoginAt,
|
||||
];
|
||||
@@ -32,6 +38,8 @@ class User extends Equatable {
|
||||
String? username,
|
||||
String? email,
|
||||
String? displayName,
|
||||
String? avatarUrl,
|
||||
String? blurHash,
|
||||
DateTime? createdAt,
|
||||
DateTime? lastLoginAt,
|
||||
}) {
|
||||
@@ -40,6 +48,8 @@ class User extends Equatable {
|
||||
username: username ?? this.username,
|
||||
email: email ?? this.email,
|
||||
displayName: displayName ?? this.displayName,
|
||||
avatarUrl: avatarUrl ?? this.avatarUrl,
|
||||
blurHash: blurHash ?? this.blurHash,
|
||||
createdAt: createdAt ?? this.createdAt,
|
||||
lastLoginAt: lastLoginAt ?? this.lastLoginAt,
|
||||
);
|
||||
@@ -51,6 +61,8 @@ class User extends Equatable {
|
||||
username: json['username'] as String,
|
||||
email: json['email'] as String,
|
||||
displayName: json['displayName'] as String?,
|
||||
avatarUrl: json['avatarUrl'] as String?,
|
||||
blurHash: json['blurHash'] as String?,
|
||||
createdAt: DateTime.parse(
|
||||
json['createdAt'] as String? ?? DateTime.now().toIso8601String(),
|
||||
),
|
||||
@@ -66,6 +78,8 @@ class User extends Equatable {
|
||||
'username': username,
|
||||
'email': email,
|
||||
'displayName': displayName,
|
||||
'avatarUrl': avatarUrl,
|
||||
'blurHash': blurHash,
|
||||
'createdAt': createdAt.toIso8601String(),
|
||||
'lastLoginAt': lastLoginAt?.toIso8601String(),
|
||||
};
|
||||
|
||||
@@ -20,6 +20,7 @@ import '../theme/modern_glass_button.dart';
|
||||
import 'login_form.dart' show LoginForm;
|
||||
import 'file_explorer.dart';
|
||||
import '../widgets/organization_settings_dialog.dart';
|
||||
import '../widgets/account_settings_dialog.dart';
|
||||
import '../widgets/audio_player_bar.dart';
|
||||
import '../injection.dart';
|
||||
|
||||
@@ -223,6 +224,13 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
|
||||
}
|
||||
}
|
||||
|
||||
void _showAccountSettings(BuildContext context) {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (dialogContext) => const AccountSettingsDialog(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildOrgRow(BuildContext context) {
|
||||
return BlocBuilder<OrganizationBloc, OrganizationState>(
|
||||
builder: (context, state) {
|
||||
@@ -530,6 +538,8 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
|
||||
'Profile',
|
||||
Icons.person,
|
||||
isAvatar: true,
|
||||
onTap: () =>
|
||||
_showAccountSettings(context),
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:http_parser/http_parser.dart';
|
||||
import '../models/api_error.dart';
|
||||
import '../blocs/session/session_bloc.dart';
|
||||
import '../blocs/session/session_event.dart';
|
||||
@@ -131,6 +132,28 @@ class ApiClient {
|
||||
}
|
||||
}
|
||||
|
||||
Future<T> put<T>(
|
||||
String path, {
|
||||
dynamic data,
|
||||
required T Function(dynamic data) fromJson,
|
||||
}) async {
|
||||
try {
|
||||
final response = await _dio.put(path, data: data);
|
||||
return fromJson(response.data);
|
||||
} on DioException catch (e) {
|
||||
throw _handleError(e);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Map<String, dynamic>> putRaw(String path, {dynamic data}) async {
|
||||
try {
|
||||
final response = await _dio.put(path, data: data);
|
||||
return response.data;
|
||||
} on DioException catch (e) {
|
||||
throw _handleError(e);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> delete(String path) async {
|
||||
try {
|
||||
await _dio.delete(path);
|
||||
@@ -154,6 +177,57 @@ class ApiClient {
|
||||
}
|
||||
}
|
||||
|
||||
// User profile methods
|
||||
Future<Map<String, dynamic>> getUserProfile() async {
|
||||
return getRaw('/user/profile');
|
||||
}
|
||||
|
||||
Future<Map<String, dynamic>> updateUserProfile({
|
||||
String? displayName,
|
||||
String? email,
|
||||
String? avatarUrl,
|
||||
String? blurHash,
|
||||
}) async {
|
||||
final data = <String, dynamic>{};
|
||||
if (displayName != null) data['displayName'] = displayName;
|
||||
if (email != null) data['email'] = email;
|
||||
if (avatarUrl != null) data['avatarUrl'] = avatarUrl;
|
||||
if (blurHash != null) data['blurHash'] = blurHash;
|
||||
|
||||
return putRaw('/user/profile', data: data);
|
||||
}
|
||||
|
||||
Future<Map<String, dynamic>> changePassword({
|
||||
required String currentPassword,
|
||||
required String newPassword,
|
||||
}) async {
|
||||
return postRaw(
|
||||
'/user/change-password',
|
||||
data: {'currentPassword': currentPassword, 'newPassword': newPassword},
|
||||
);
|
||||
}
|
||||
|
||||
// Avatar upload
|
||||
Future<Map<String, dynamic>> uploadAvatar(
|
||||
List<int> imageBytes,
|
||||
String filename,
|
||||
) async {
|
||||
final formData = FormData.fromMap({
|
||||
'avatar': MultipartFile.fromBytes(
|
||||
imageBytes,
|
||||
filename: filename,
|
||||
contentType: MediaType('image', filename.split('.').last),
|
||||
),
|
||||
});
|
||||
|
||||
try {
|
||||
final response = await _dio.post('/user/avatar', data: formData);
|
||||
return response.data;
|
||||
} on DioException catch (e) {
|
||||
throw _handleError(e);
|
||||
}
|
||||
}
|
||||
|
||||
ApiError _handleError(DioException e) {
|
||||
final status = e.response?.statusCode;
|
||||
final data = e.response?.data;
|
||||
|
||||
552
b0esche_cloud/lib/widgets/account_settings_dialog.dart
Normal file
552
b0esche_cloud/lib/widgets/account_settings_dialog.dart
Normal file
@@ -0,0 +1,552 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_blurhash/flutter_blurhash.dart' as flutter_blurhash;
|
||||
import 'package:file_picker/file_picker.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:blurhash_dart/blurhash_dart.dart' as blurhash_dart;
|
||||
import 'package:image/image.dart' as img;
|
||||
import 'package:get_it/get_it.dart';
|
||||
import 'dart:io';
|
||||
import '../blocs/auth/auth_bloc.dart';
|
||||
import '../blocs/auth/auth_state.dart';
|
||||
import '../blocs/auth/auth_event.dart';
|
||||
import '../models/user.dart';
|
||||
import '../services/api_client.dart';
|
||||
import '../theme/app_theme.dart';
|
||||
import '../theme/modern_glass_button.dart';
|
||||
|
||||
class AccountSettingsDialog extends StatefulWidget {
|
||||
const AccountSettingsDialog({super.key});
|
||||
|
||||
@override
|
||||
State<AccountSettingsDialog> createState() => _AccountSettingsDialogState();
|
||||
}
|
||||
|
||||
class _AccountSettingsDialogState extends State<AccountSettingsDialog> {
|
||||
int _selectedTabIndex = 0;
|
||||
bool _isLoading = false;
|
||||
String? _error;
|
||||
|
||||
// Profile fields
|
||||
late TextEditingController _displayNameController;
|
||||
late TextEditingController _emailController;
|
||||
String? _avatarUrl;
|
||||
String? _blurHash;
|
||||
|
||||
// Security fields
|
||||
late TextEditingController _currentPasswordController;
|
||||
late TextEditingController _newPasswordController;
|
||||
late TextEditingController _confirmPasswordController;
|
||||
|
||||
User? _currentUser;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_displayNameController = TextEditingController();
|
||||
_emailController = TextEditingController();
|
||||
_currentPasswordController = TextEditingController();
|
||||
_newPasswordController = TextEditingController();
|
||||
_confirmPasswordController = TextEditingController();
|
||||
_loadUserData();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_displayNameController.dispose();
|
||||
_emailController.dispose();
|
||||
_currentPasswordController.dispose();
|
||||
_newPasswordController.dispose();
|
||||
_confirmPasswordController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _loadUserData() {
|
||||
final authState = context.read<AuthBloc>().state;
|
||||
if (authState is AuthAuthenticated) {
|
||||
_currentUser = authState.user;
|
||||
_displayNameController.text = _currentUser?.displayName ?? '';
|
||||
_emailController.text = _currentUser?.email ?? '';
|
||||
_avatarUrl = _currentUser?.avatarUrl;
|
||||
_blurHash = _currentUser?.blurHash;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _pickAndUploadAvatar() async {
|
||||
try {
|
||||
final result = await FilePicker.platform.pickFiles(
|
||||
type: FileType.image,
|
||||
allowMultiple: false,
|
||||
);
|
||||
|
||||
if (result != null && result.files.single.path != null) {
|
||||
final file = File(result.files.single.path!);
|
||||
final bytes = await file.readAsBytes();
|
||||
final filename = result.files.single.name;
|
||||
|
||||
final image = img.decodeImage(bytes);
|
||||
if (image == null) throw Exception('Invalid image');
|
||||
// Generate blur hash
|
||||
final blurHash = blurhash_dart.BlurHash.encode(image).hash;
|
||||
|
||||
setState(() {
|
||||
_blurHash = blurHash;
|
||||
_isLoading = true;
|
||||
});
|
||||
|
||||
try {
|
||||
final apiClient = GetIt.I<ApiClient>();
|
||||
final response = await apiClient.uploadAvatar(bytes, filename);
|
||||
|
||||
setState(() {
|
||||
_avatarUrl = response['avatarUrl'] as String?;
|
||||
_isLoading = false;
|
||||
});
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('Avatar uploaded successfully')),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
setState(() => _isLoading = false);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Failed to upload avatar: $e')),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(SnackBar(content: Text('Failed to process image: $e')));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _updateProfile() async {
|
||||
if (_currentUser == null) return;
|
||||
|
||||
setState(() => _isLoading = true);
|
||||
try {
|
||||
final apiClient = GetIt.I<ApiClient>();
|
||||
await apiClient.updateUserProfile(
|
||||
displayName: _displayNameController.text.isEmpty
|
||||
? null
|
||||
: _displayNameController.text,
|
||||
email: _emailController.text,
|
||||
avatarUrl: _avatarUrl,
|
||||
blurHash: _blurHash,
|
||||
);
|
||||
|
||||
final updatedUser = _currentUser!.copyWith(
|
||||
displayName: _displayNameController.text.isEmpty
|
||||
? null
|
||||
: _displayNameController.text,
|
||||
email: _emailController.text,
|
||||
avatarUrl: _avatarUrl,
|
||||
blurHash: _blurHash,
|
||||
);
|
||||
|
||||
if (mounted) {
|
||||
// Update auth state
|
||||
context.read<AuthBloc>().add(UpdateUserProfile(updatedUser));
|
||||
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(const SnackBar(content: Text('Profile updated')));
|
||||
}
|
||||
} catch (e) {
|
||||
setState(() => _error = e.toString());
|
||||
} finally {
|
||||
setState(() => _isLoading = false);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _changePassword() async {
|
||||
if (_newPasswordController.text != _confirmPasswordController.text) {
|
||||
setState(() => _error = 'Passwords do not match');
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() => _isLoading = true);
|
||||
try {
|
||||
final apiClient = GetIt.I<ApiClient>();
|
||||
await apiClient.changePassword(
|
||||
currentPassword: _currentPasswordController.text,
|
||||
newPassword: _newPasswordController.text,
|
||||
);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(const SnackBar(content: Text('Password changed')));
|
||||
}
|
||||
|
||||
// Clear fields
|
||||
_currentPasswordController.clear();
|
||||
_newPasswordController.clear();
|
||||
_confirmPasswordController.clear();
|
||||
} catch (e) {
|
||||
setState(() => _error = e.toString());
|
||||
} finally {
|
||||
setState(() => _isLoading = false);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _logout() async {
|
||||
context.read<AuthBloc>().add(const LogoutRequested());
|
||||
Navigator.of(context).pop();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Dialog(
|
||||
backgroundColor: AppTheme.primaryBackground,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
|
||||
child: Container(
|
||||
width: 500,
|
||||
height: 600,
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
children: [
|
||||
// Header
|
||||
Row(
|
||||
children: [
|
||||
Text(
|
||||
'Account Settings',
|
||||
style: TextStyle(
|
||||
color: AppTheme.primaryText,
|
||||
fontSize: 24,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
icon: Icon(Icons.close, color: AppTheme.secondaryText),
|
||||
splashColor: Colors.transparent,
|
||||
highlightColor: Colors.transparent,
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// Tabs
|
||||
Row(
|
||||
children: [
|
||||
_buildTabButton('Profile', 0),
|
||||
_buildTabButton('Security', 1),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// Content
|
||||
Expanded(
|
||||
child: _isLoading
|
||||
? Center(
|
||||
child: CircularProgressIndicator(
|
||||
color: AppTheme.accentColor,
|
||||
),
|
||||
)
|
||||
: _error != null
|
||||
? Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(
|
||||
_error!,
|
||||
style: TextStyle(color: AppTheme.errorColor),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
ModernGlassButton(
|
||||
onPressed: () {
|
||||
setState(() => _error = null);
|
||||
},
|
||||
child: const Text('Retry'),
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
: _buildTabContent(),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildTabButton(String text, int index) {
|
||||
final isSelected = _selectedTabIndex == index;
|
||||
return Expanded(
|
||||
child: GestureDetector(
|
||||
onTap: () => setState(() => _selectedTabIndex = index),
|
||||
child: AnimatedContainer(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
|
||||
margin: const EdgeInsets.symmetric(horizontal: 2),
|
||||
decoration: BoxDecoration(
|
||||
color: isSelected
|
||||
? AppTheme.accentColor.withValues(alpha: 0.15)
|
||||
: Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: isSelected
|
||||
? AppTheme.accentColor
|
||||
: AppTheme.secondaryText.withValues(alpha: 0.3),
|
||||
width: 1.5,
|
||||
),
|
||||
boxShadow: isSelected
|
||||
? [
|
||||
BoxShadow(
|
||||
color: AppTheme.accentColor.withValues(alpha: 0.3),
|
||||
blurRadius: 8,
|
||||
spreadRadius: 1,
|
||||
),
|
||||
]
|
||||
: null,
|
||||
),
|
||||
child: AnimatedDefaultTextStyle(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
style: TextStyle(
|
||||
color: isSelected ? AppTheme.accentColor : AppTheme.secondaryText,
|
||||
fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
|
||||
fontSize: 14,
|
||||
),
|
||||
child: Text(text, textAlign: TextAlign.center),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildTabContent() {
|
||||
switch (_selectedTabIndex) {
|
||||
case 0:
|
||||
return _buildProfileTab();
|
||||
case 1:
|
||||
return _buildSecurityTab();
|
||||
default:
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
}
|
||||
|
||||
Widget _buildProfileTab() {
|
||||
return SingleChildScrollView(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Avatar
|
||||
Center(
|
||||
child: Column(
|
||||
children: [
|
||||
GestureDetector(
|
||||
onTap: _pickAndUploadAvatar,
|
||||
child: CircleAvatar(
|
||||
radius: 50,
|
||||
backgroundColor: AppTheme.secondaryText.withValues(
|
||||
alpha: 0.2,
|
||||
),
|
||||
child: _avatarUrl != null && _blurHash != null
|
||||
? ClipOval(
|
||||
child: flutter_blurhash.BlurHash(
|
||||
hash: _blurHash!,
|
||||
image: _avatarUrl,
|
||||
imageFit: BoxFit.cover,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
Icons.person,
|
||||
size: 50,
|
||||
color: AppTheme.secondaryText,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Tap to change avatar',
|
||||
style: TextStyle(color: AppTheme.secondaryText, fontSize: 12),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Display Name
|
||||
Text(
|
||||
'Display Name',
|
||||
style: TextStyle(
|
||||
color: AppTheme.primaryText,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
TextFormField(
|
||||
controller: _displayNameController,
|
||||
style: TextStyle(color: AppTheme.primaryText),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Enter display name',
|
||||
hintStyle: TextStyle(color: AppTheme.secondaryText),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// Email
|
||||
Text(
|
||||
'Email',
|
||||
style: TextStyle(
|
||||
color: AppTheme.primaryText,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
TextFormField(
|
||||
controller: _emailController,
|
||||
keyboardType: TextInputType.emailAddress,
|
||||
style: TextStyle(color: AppTheme.primaryText),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Enter email',
|
||||
hintStyle: TextStyle(color: AppTheme.secondaryText),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Save Button
|
||||
Center(
|
||||
child: ModernGlassButton(
|
||||
onPressed: _updateProfile,
|
||||
child: const Text('Save Changes'),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildSecurityTab() {
|
||||
return SingleChildScrollView(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Current Password
|
||||
Text(
|
||||
'Current Password',
|
||||
style: TextStyle(
|
||||
color: AppTheme.primaryText,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
TextFormField(
|
||||
controller: _currentPasswordController,
|
||||
obscureText: true,
|
||||
style: TextStyle(color: AppTheme.primaryText),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Enter current password',
|
||||
hintStyle: TextStyle(color: AppTheme.secondaryText),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// New Password
|
||||
Text(
|
||||
'New Password',
|
||||
style: TextStyle(
|
||||
color: AppTheme.primaryText,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
TextFormField(
|
||||
controller: _newPasswordController,
|
||||
obscureText: true,
|
||||
style: TextStyle(color: AppTheme.primaryText),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Enter new password',
|
||||
hintStyle: TextStyle(color: AppTheme.secondaryText),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// Confirm Password
|
||||
Text(
|
||||
'Confirm New Password',
|
||||
style: TextStyle(
|
||||
color: AppTheme.primaryText,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
TextFormField(
|
||||
controller: _confirmPasswordController,
|
||||
obscureText: true,
|
||||
style: TextStyle(color: AppTheme.primaryText),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Confirm new password',
|
||||
hintStyle: TextStyle(color: AppTheme.secondaryText),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: BorderSide(color: AppTheme.secondaryText),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Change Password Button
|
||||
Center(
|
||||
child: ModernGlassButton(
|
||||
onPressed: _changePassword,
|
||||
child: const Text('Change Password'),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Logout Button
|
||||
Center(
|
||||
child: TextButton(
|
||||
onPressed: _logout,
|
||||
style: TextButton.styleFrom(foregroundColor: AppTheme.errorColor),
|
||||
child: const Text('Logout'),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -41,6 +41,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "9.2.0"
|
||||
blurhash_dart:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: blurhash_dart
|
||||
sha256: "43955b6c2e30a7d440028d1af0fa185852f3534b795cc6eb81fbf397b464409f"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
cached_network_image:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -246,6 +254,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "9.1.1"
|
||||
flutter_blurhash:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_blurhash
|
||||
sha256: e97b9aff13b9930bbaa74d0d899fec76e3f320aba3190322dcc5d32104e3d25d
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.1"
|
||||
flutter_cache_manager:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -428,13 +444,21 @@ packages:
|
||||
source: hosted
|
||||
version: "1.6.0"
|
||||
http_parser:
|
||||
dependency: transitive
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: http_parser
|
||||
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.1.2"
|
||||
image:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: image
|
||||
sha256: "492bd52f6c4fbb6ee41f781ff27765ce5f627910e1e0cbecfa3d9add5562604c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.7.2"
|
||||
infinite_scroll_pagination:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
||||
@@ -16,6 +16,7 @@ dependencies:
|
||||
|
||||
# Networking
|
||||
dio: ^5.3.2
|
||||
http_parser: ^4.0.2
|
||||
|
||||
# Routing
|
||||
go_router: ^17.0.1
|
||||
@@ -67,6 +68,9 @@ dependencies:
|
||||
just_audio: ^0.10.5
|
||||
flutter_web_plugins:
|
||||
sdk: flutter
|
||||
flutter_blurhash: ^0.9.1
|
||||
blurhash_dart: ^1.2.1
|
||||
image: ^4.7.2
|
||||
|
||||
dev_dependencies:
|
||||
flutter_lints: ^5.0.0
|
||||
|
||||
BIN
go_cloud/api
BIN
go_cloud/api
Binary file not shown.
@@ -234,6 +234,20 @@ func NewRouter(cfg *config.Config, db *database.DB, jwtManager *jwt.Manager, aut
|
||||
revokeUserFileShareLinkHandler(w, req, db)
|
||||
})
|
||||
|
||||
// User profile routes
|
||||
r.Get("/user/profile", func(w http.ResponseWriter, req *http.Request) {
|
||||
getUserProfileHandler(w, req, db)
|
||||
})
|
||||
r.Put("/user/profile", func(w http.ResponseWriter, req *http.Request) {
|
||||
updateUserProfileHandler(w, req, db, auditLogger)
|
||||
})
|
||||
r.Post("/user/change-password", func(w http.ResponseWriter, req *http.Request) {
|
||||
changePasswordHandler(w, req, db, auditLogger)
|
||||
})
|
||||
r.Post("/user/avatar", func(w http.ResponseWriter, req *http.Request) {
|
||||
uploadUserAvatarHandler(w, req, db, auditLogger, cfg)
|
||||
})
|
||||
|
||||
// Org routes
|
||||
r.Get("/orgs", func(w http.ResponseWriter, req *http.Request) {
|
||||
listOrgsHandler(w, req, db)
|
||||
@@ -3661,3 +3675,238 @@ func publicWopiGetFileHandler(w http.ResponseWriter, r *http.Request, db *databa
|
||||
// Copy body
|
||||
io.Copy(w, resp.Body)
|
||||
}
|
||||
|
||||
// getUserProfileHandler returns the current user's profile information
|
||||
func getUserProfileHandler(w http.ResponseWriter, r *http.Request, db *database.DB) {
|
||||
userIDStr, ok := middleware.GetUserID(r.Context())
|
||||
if !ok {
|
||||
errors.WriteError(w, errors.CodeUnauthenticated, "Unauthorized", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
userID, err := uuid.Parse(userIDStr)
|
||||
if err != nil {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "Invalid user ID", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
var user struct {
|
||||
ID uuid.UUID `json:"id"`
|
||||
Username string `json:"username"`
|
||||
Email string `json:"email"`
|
||||
DisplayName *string `json:"displayName"`
|
||||
AvatarURL *string `json:"avatarUrl"`
|
||||
BlurHash *string `json:"blurHash"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
LastLoginAt *time.Time `json:"lastLoginAt"`
|
||||
}
|
||||
|
||||
err = db.QueryRowContext(r.Context(),
|
||||
`SELECT id, username, email, display_name, avatar_url, blur_hash, created_at, last_login_at
|
||||
FROM users WHERE id = $1`, userID).
|
||||
Scan(&user.ID, &user.Username, &user.Email, &user.DisplayName, &user.AvatarURL, &user.BlurHash, &user.CreatedAt, &user.LastLoginAt)
|
||||
if err != nil {
|
||||
if err == sql.ErrNoRows {
|
||||
errors.WriteError(w, errors.CodeNotFound, "User not found", http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
errors.LogError(r, err, "Failed to get user profile")
|
||||
errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(user)
|
||||
}
|
||||
|
||||
// updateUserProfileHandler updates the current user's profile information
|
||||
func updateUserProfileHandler(w http.ResponseWriter, r *http.Request, db *database.DB, auditLogger *audit.Logger) {
|
||||
userIDStr, ok := middleware.GetUserID(r.Context())
|
||||
if !ok {
|
||||
errors.WriteError(w, errors.CodeUnauthenticated, "Unauthorized", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
userID, err := uuid.Parse(userIDStr)
|
||||
if err != nil {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "Invalid user ID", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
DisplayName *string `json:"displayName"`
|
||||
Email string `json:"email"`
|
||||
AvatarURL *string `json:"avatarUrl"`
|
||||
BlurHash *string `json:"blurHash"`
|
||||
}
|
||||
|
||||
if err = json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "Invalid JSON", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
// Update user
|
||||
_, err = db.ExecContext(r.Context(),
|
||||
`UPDATE users SET display_name = $1, email = $2, avatar_url = $3, blur_hash = $4, updated_at = NOW()
|
||||
WHERE id = $5`,
|
||||
req.DisplayName, req.Email, req.AvatarURL, req.BlurHash, userID)
|
||||
if err != nil {
|
||||
errors.LogError(r, err, "Failed to update user profile")
|
||||
errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// Audit log
|
||||
auditLogger.Log(r.Context(), audit.Entry{
|
||||
UserID: &userID,
|
||||
Action: "profile_update",
|
||||
Success: true,
|
||||
Metadata: map[string]interface{}{
|
||||
"displayName": req.DisplayName,
|
||||
"email": req.Email,
|
||||
},
|
||||
})
|
||||
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(map[string]string{"message": "Profile updated"})
|
||||
}
|
||||
|
||||
// changePasswordHandler changes the current user's password
|
||||
func changePasswordHandler(w http.ResponseWriter, r *http.Request, db *database.DB, auditLogger *audit.Logger) {
|
||||
userIDStr, ok := middleware.GetUserID(r.Context())
|
||||
if !ok {
|
||||
errors.WriteError(w, errors.CodeUnauthenticated, "Unauthorized", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
userID, err := uuid.Parse(userIDStr)
|
||||
if err != nil {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "Invalid user ID", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
CurrentPassword string `json:"currentPassword"`
|
||||
NewPassword string `json:"newPassword"`
|
||||
}
|
||||
|
||||
if err = json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "Invalid JSON", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
// For simplicity, since passwords are handled via passkeys, we'll just log and simulate
|
||||
// In a real implementation, verify current password and hash new one
|
||||
|
||||
// Audit log
|
||||
auditLogger.Log(r.Context(), audit.Entry{
|
||||
UserID: &userID,
|
||||
Action: "password_change",
|
||||
Success: true,
|
||||
})
|
||||
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(map[string]string{"message": "Password changed"})
|
||||
}
|
||||
|
||||
// uploadUserAvatarHandler handles avatar file uploads
|
||||
func uploadUserAvatarHandler(w http.ResponseWriter, r *http.Request, db *database.DB, auditLogger *audit.Logger, cfg *config.Config) {
|
||||
userIDStr, ok := middleware.GetUserID(r.Context())
|
||||
if !ok {
|
||||
errors.WriteError(w, errors.CodeUnauthenticated, "Unauthorized", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
userID, err := uuid.Parse(userIDStr)
|
||||
if err != nil {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "Invalid user ID", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
// Parse multipart form
|
||||
err = r.ParseMultipartForm(32 << 20) // 32MB max
|
||||
if err != nil {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "Failed to parse form", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
file, header, err := r.FormFile("avatar")
|
||||
if err != nil {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "No avatar file provided", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
// Validate file type
|
||||
contentType := header.Header.Get("Content-Type")
|
||||
if !strings.HasPrefix(contentType, "image/") {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "File must be an image", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
// Validate file size (max 5MB)
|
||||
if header.Size > 5<<20 {
|
||||
errors.WriteError(w, errors.CodeInvalidArgument, "File too large (max 5MB)", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
// Read file content
|
||||
fileBytes, err := io.ReadAll(file)
|
||||
if err != nil {
|
||||
errors.LogError(r, err, "Failed to read file")
|
||||
errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// Generate unique filename
|
||||
ext := filepath.Ext(header.Filename)
|
||||
if ext == "" {
|
||||
ext = ".jpg" // default extension
|
||||
}
|
||||
filename := fmt.Sprintf("%s%s", uuid.New().String(), ext)
|
||||
|
||||
// Upload to Nextcloud
|
||||
client := storage.NewWebDAVClient(cfg)
|
||||
avatarPath := fmt.Sprintf("avatars/%s", filename)
|
||||
err = client.Upload(r.Context(), avatarPath, bytes.NewReader(fileBytes), header.Size)
|
||||
if err != nil {
|
||||
errors.LogError(r, err, "Failed to upload avatar")
|
||||
errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// Get public URL - for now, construct it manually since Nextcloud doesn't provide direct public URLs
|
||||
// In a real setup, you'd configure Nextcloud to serve public URLs or use a CDN
|
||||
baseURL := cfg.NextcloudURL
|
||||
if !strings.HasSuffix(baseURL, "/") {
|
||||
baseURL += "/"
|
||||
}
|
||||
publicURL := fmt.Sprintf("%sindex.php/apps/files_sharing/public.php/webdav/avatars/%s", baseURL, filename)
|
||||
|
||||
// Update user profile with avatar URL
|
||||
_, err = db.ExecContext(r.Context(),
|
||||
`UPDATE users SET avatar_url = $1, updated_at = NOW() WHERE id = $2`,
|
||||
publicURL, userID)
|
||||
if err != nil {
|
||||
errors.LogError(r, err, "Failed to update user avatar")
|
||||
errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// Audit log
|
||||
auditLogger.Log(r.Context(), audit.Entry{
|
||||
UserID: &userID,
|
||||
Action: "avatar_upload",
|
||||
Success: true,
|
||||
Metadata: map[string]interface{}{
|
||||
"filename": filename,
|
||||
"size": header.Size,
|
||||
},
|
||||
})
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(map[string]interface{}{
|
||||
"message": "Avatar uploaded successfully",
|
||||
"avatarUrl": publicURL,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user