Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<form [formGroup]="form()" (ngSubmit)="onSubmit()" class="space-y-6">
<!-- User Information Section -->
<div class="flex flex-col gap-3">
<!-- Username -->
<!-- Username or Email -->
<div>
<label for="username" class="block text-sm font-medium text-gray-700 mb-1"> Username <span class="text-red-500">*</span> </label>
<label for="username" class="block text-sm font-medium text-gray-700 mb-1"> Username or Email <span class="text-red-500">*</span> </label>
<lfx-input-text
size="small"
[form]="form()"
control="username"
id="username"
placeholder="Enter username"
placeholder="Enter username or email address"
styleClass="w-full"
data-testid="settings-user-form-username"></lfx-input-text>
@if (form().get('username')?.errors?.['required'] && form().get('username')?.touched) {
<p class="mt-1 text-xs text-red-600">Username is required</p>
<p class="mt-1 text-xs text-red-600">Username or email is required</p>
}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,27 @@ export class UserFormComponent {
},
error: (error: any) => {
console.error('Error saving user:', error);
this.messageService.add({
severity: 'error',
summary: 'Error',
detail: `Failed to ${this.isEditing() ? 'update' : 'add'} user. Please try again.`,
});

// Check if it's a 404 error for email not found
if (error.status === 404 && error.error?.code === 'NOT_FOUND') {
const usernameValue = formValue.username;
const isEmail = usernameValue.includes('@');

this.messageService.add({
severity: 'error',
summary: 'User Not Found',
detail: isEmail
? `No user found with email address "${usernameValue}". Please verify the email address and try again.`
: error.error?.message || 'User not found',
});
} else {
this.messageService.add({
severity: 'error',
summary: 'Error',
detail: error.error?.message || `Failed to ${this.isEditing() ? 'update' : 'add'} user. Please try again.`,
});
}

this.submitting.set(false);
},
});
Expand Down
31 changes: 29 additions & 2 deletions apps/lfx-one/src/server/controllers/project.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,39 @@ export class ProjectController {
return;
}

const result = await this.projectService.updateProjectPermissions(req, uid, 'add', userData.username, userData.role);
// Detect if input is email or username
const isEmail = userData.username.includes('@');
let username = userData.username;

if (isEmail) {
req.log.info(
{
email: userData.username,
operation: 'add_user_project_permissions',
},
'Email detected, resolving to username via NATS'
);

// Resolve email to username via NATS
username = await this.projectService.resolveEmailToUsername(req, userData.username);

req.log.info(
{
email: userData.username,
username,
operation: 'add_user_project_permissions',
},
'Successfully resolved email to username'
);
}

const result = await this.projectService.updateProjectPermissions(req, uid, 'add', username, userData.role);

Logger.success(req, 'add_user_project_permissions', startTime, {
uid,
username: userData.username,
username,
role: userData.role,
resolved_from_email: isEmail,
});

res.status(201).json(result);
Expand Down
79 changes: 78 additions & 1 deletion apps/lfx-one/src/server/services/project.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import { NATS_CONFIG } from '@lfx-one/shared/constants';
import { NatsSubjects } from '@lfx-one/shared/enums';
import { Project, ProjectSettings, ProjectSlugToIdResponse, QueryServiceResponse } from '@lfx-one/shared/interfaces';
import { EmailToUsernameErrorResponse, Project, ProjectSettings, ProjectSlugToIdResponse, QueryServiceResponse } from '@lfx-one/shared/interfaces';
import { Request } from 'express';

import { ResourceNotFoundError } from '../errors';
Expand Down Expand Up @@ -207,6 +207,83 @@ export class ProjectService {
return result;
}

/**
* Resolve email address to username using NATS request-reply pattern
* @param req - Express request object for logging
* @param email - Email address to lookup
* @returns Username associated with the email
* @throws ResourceNotFoundError if user not found
*/
public async resolveEmailToUsername(req: Request, email: string): Promise<string> {
const codec = this.natsService.getCodec();

// Normalize email input
const normalizedEmail = email.trim().toLowerCase();

try {
req.log.info({ email: normalizedEmail }, 'Resolving email to username via NATS');

const response = await this.natsService.request(NatsSubjects.EMAIL_TO_USERNAME, codec.encode(normalizedEmail), { timeout: NATS_CONFIG.REQUEST_TIMEOUT });

const responseText = codec.decode(response.data);

// Try to parse as JSON error response
try {
const errorResponse: EmailToUsernameErrorResponse = JSON.parse(responseText);

if (errorResponse.success === false) {
req.log.info({ email: normalizedEmail, error: errorResponse.error }, 'User email not found via NATS');

throw new ResourceNotFoundError('User', normalizedEmail, {
operation: 'resolve_email_to_username',
service: 'project_service',
path: '/nats/email-to-username',
});
}
} catch (parseError) {
// Not JSON or JSON parse failed - treat responseText as username
if (parseError instanceof ResourceNotFoundError) {
throw parseError;
}
}

// Response is plain text username
const username = responseText.trim();

if (!username || username === '') {
req.log.info({ email: normalizedEmail }, 'Empty username returned from NATS');

throw new ResourceNotFoundError('User', normalizedEmail, {
operation: 'resolve_email_to_username',
service: 'project_service',
path: '/nats/email-to-username',
});
}

req.log.info({ email: normalizedEmail, username }, 'Successfully resolved email to username');

return username;
} catch (error) {
// Re-throw ResourceNotFoundError as-is
if (error instanceof ResourceNotFoundError) {
throw error;
}

req.log.error({ error: error instanceof Error ? error.message : error, email: normalizedEmail }, 'Failed to resolve email to username via NATS');

// If it's a timeout or no responder error, treat as not found
if (error instanceof Error && (error.message.includes('timeout') || error.message.includes('503'))) {
throw new ResourceNotFoundError('User', normalizedEmail, {
operation: 'resolve_email_to_username',
service: 'project_service',
path: '/nats/email-to-username',
});
}

throw error;
}
}

/**
* Get project ID by slug using NATS request-reply pattern
* @private
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/enums/nats.enum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
export enum NatsSubjects {
PROJECT_SLUG_TO_UID = 'lfx.projects-api.slug_to_uid',
USER_METADATA_UPDATE = 'lfx.auth-service.user_metadata.update',
EMAIL_TO_USERNAME = 'lfx.auth-service.email_to_username',
}
11 changes: 11 additions & 0 deletions packages/shared/src/interfaces/auth.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,14 @@ export interface AuthConfig {
/** Default route type for unmatched routes */
defaultType: RouteType;
}

/**
* Error response from email to username NATS lookup
* @description Response structure when user email is not found
*/
export interface EmailToUsernameErrorResponse {
/** Success flag - always false for error responses */
success: false;
/** Error message describing the failure */
error: string;
}