Skip to content

Fix data migration for account linking #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 23, 2025
Merged

Fix data migration for account linking #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3acf70
refactor(auth): pass auth user to complete sign-in
fulleni Jun 23, 2025
523040a
refactor(auth): Link anon user on email sign-in
fulleni Jun 23, 2025
ecc8203
style: format
fulleni Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 127 additions & 39 deletions lib/src/services/auth_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ class AuthService {
/// Throws [OperationFailedException] for user lookup/creation or token errors.
Future<({User user, String token})> completeEmailSignIn(
String email,
String code,
// User? currentAuthUser, // Parameter for potential future linking logic
) async {
String code, {
User? currentAuthUser, // Parameter for potential future linking logic
}) async {
// 1. Validate the code for standard sign-in
final isValidCode = await _verificationCodeStorageService
.validateSignInCode(email, code);
Expand All @@ -96,53 +96,141 @@ class AuthService {
);
}

// 2. Find or create the user
// 2. Find or create the user, and migrate data if anonymous
User user;
try {
// Attempt to find user by email (assuming a query method exists)
// NOTE: HtDataRepository<User> currently lacks findByEmail.
// We'll simulate this by querying all and filtering for now.
// Replace with a proper query when available.
final query = {'email': email}; // Hypothetical query
final paginatedResponse = await _userRepository.readAllByQuery(query);

if (paginatedResponse.items.isNotEmpty) {
user = paginatedResponse.items.first;
print('Found existing user: ${user.id} for email $email');
} else {
// User not found, create a new one
print('User not found for $email, creating new user.');
user = User(
id: _uuid.v4(), // Generate new ID
if (currentAuthUser != null &&
currentAuthUser.role == UserRole.guestUser) {
// This is an anonymous user linking their account.
// Migrate their existing data to the new permanent user.
print(
'Anonymous user ${currentAuthUser.id} is linking email $email. '
'Migrating data...',
);

// Fetch existing settings and preferences for the anonymous user
UserAppSettings? existingAppSettings;
UserContentPreferences? existingUserPreferences;
try {
existingAppSettings = await _userAppSettingsRepository.read(
id: currentAuthUser.id,
userId: currentAuthUser.id,
);
existingUserPreferences = await _userContentPreferencesRepository
.read(id: currentAuthUser.id, userId: currentAuthUser.id);
print(
'Fetched existing settings and preferences for anonymous user '
'${currentAuthUser.id}.',
);
} on NotFoundException {
print(
'No existing settings/preferences found for anonymous user '
'${currentAuthUser.id}. Creating new ones.',
);
// If not found, proceed to create new ones later.
} catch (e) {
print(
'Error fetching existing settings/preferences for anonymous user '
'${currentAuthUser.id}: $e',
);
// Log and continue, new defaults will be created.
}

// Update the existing anonymous user to be permanent
user = currentAuthUser.copyWith(
email: email,
role: UserRole.standardUser, // Email verified user is standard user
role: UserRole.standardUser,
);
user = await _userRepository.create(item: user); // Save the new user
print('Created new user: ${user.id}');

// Create default UserAppSettings for the new user
final defaultAppSettings = UserAppSettings(id: user.id);
await _userAppSettingsRepository.create(
item: defaultAppSettings,
userId: user.id, // Pass user ID for scoping
user = await _userRepository.update(id: user.id, item: user);
print(
'Updated anonymous user ${user.id} to permanent with email $email.',
);
print('Created default UserAppSettings for user: ${user.id}');

// Create default UserContentPreferences for the new user
final defaultUserPreferences = UserContentPreferences(id: user.id);
await _userContentPreferencesRepository.create(
item: defaultUserPreferences,
userId: user.id, // Pass user ID for scoping
);
print('Created default UserContentPreferences for user: ${user.id}');
// Update or create UserAppSettings for the now-permanent user
if (existingAppSettings != null) {
// Update existing settings with the new user ID (though it's the same)
// and persist.
await _userAppSettingsRepository.update(
id: existingAppSettings.id,
item: existingAppSettings.copyWith(id: user.id),
userId: user.id,
);
print('Migrated UserAppSettings for user: ${user.id}');
} else {
// Create default settings if none existed for the anonymous user
final defaultAppSettings = UserAppSettings(id: user.id);
await _userAppSettingsRepository.create(
item: defaultAppSettings,
userId: user.id,
);
print('Created default UserAppSettings for user: ${user.id}');
}

// Update or create UserContentPreferences for the now-permanent user
if (existingUserPreferences != null) {
// Update existing preferences with the new user ID (though it's the same)
// and persist.
await _userContentPreferencesRepository.update(
id: existingUserPreferences.id,
item: existingUserPreferences.copyWith(id: user.id),
userId: user.id,
);
print('Migrated UserContentPreferences for user: ${user.id}');
} else {
// Create default preferences if none existed for the anonymous user
final defaultUserPreferences = UserContentPreferences(id: user.id);
await _userContentPreferencesRepository.create(
item: defaultUserPreferences,
userId: user.id,
);
print('Created default UserContentPreferences for user: ${user.id}');
}
} else {
// Standard sign-in/sign-up flow (not anonymous linking)
// Attempt to find user by email
final query = {'email': email};
final paginatedResponse = await _userRepository.readAllByQuery(query);

if (paginatedResponse.items.isNotEmpty) {
user = paginatedResponse.items.first;
print('Found existing user: ${user.id} for email $email');
} else {
// User not found, create a new one
print('User not found for $email, creating new user.');
user = User(
id: _uuid.v4(), // Generate new ID
email: email,
role: UserRole.standardUser, // Email verified user is standard user
);
user = await _userRepository.create(item: user); // Save the new user
print('Created new user: ${user.id}');

// Create default UserAppSettings for the new user
final defaultAppSettings = UserAppSettings(id: user.id);
await _userAppSettingsRepository.create(
item: defaultAppSettings,
userId: user.id, // Pass user ID for scoping
);
print('Created default UserAppSettings for user: ${user.id}');

// Create default UserContentPreferences for the new user
final defaultUserPreferences = UserContentPreferences(id: user.id);
await _userContentPreferencesRepository.create(
item: defaultUserPreferences,
userId: user.id, // Pass user ID for scoping
);
print('Created default UserContentPreferences for user: ${user.id}');
}
}
} on HtHttpException catch (e) {
print('Error finding/creating user for $email: $e');
print('Error finding/creating/migrating user for $email: $e');
throw const OperationFailedException(
'Failed to find or create user account.',
'Failed to find, create, or migrate user account.',
);
} catch (e) {
print('Unexpected error during user lookup/creation for $email: $e');
print(
'Unexpected error during user lookup/creation/migration for $email: $e',
);
throw const OperationFailedException('Failed to process user account.');
}

Expand Down
11 changes: 10 additions & 1 deletion routes/api/v1/auth/verify-code.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ Future<Response> onRequest(RequestContext context) async {
// Read the AuthService provided by middleware
final authService = context.read<AuthService>();

// Read the authenticated User from context (provided by authentication middleware)
// This user might be null (if not authenticated) or an anonymous user.
final authenticatedUser = context.read<User?>();

// Parse the request body
final dynamic body;
try {
Expand Down Expand Up @@ -63,7 +67,12 @@ Future<Response> onRequest(RequestContext context) async {

try {
// Call the AuthService to handle the verification and sign-in logic
final result = await authService.completeEmailSignIn(email, code);
// Pass the current authenticated user for potential data migration.
final result = await authService.completeEmailSignIn(
email,
code,
currentAuthUser: authenticatedUser,
);

// Create the specific payload containing user and token
final authPayload = AuthSuccessResponse(
Expand Down
Loading