Skip to content
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

refactor: added additional fields in login API response #1083

Open
wants to merge 6 commits into
base: develop-dco-fixed
Choose a base branch
from
Open

refactor: added additional fields in login API response #1083

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33c4573
feat: check user existence
bhavanakarwade Nov 20, 2024
5dd0436
Merge branch 'develop-dco-fixed' of https://github.com/credebl/platfo…
bhavanakarwade Nov 25, 2024
d4adbbc
refactor: added additional fields in login response
bhavanakarwade Dec 4, 2024
4c460a2
Merge branch 'develop-dco-fixed' of https://github.com/credebl/platfo…
bhavanakarwade Dec 4, 2024
4e17817
fix: removed unnecessary code
bhavanakarwade Dec 4, 2024
001e7fb
fix: removed spaces
bhavanakarwade Dec 4, 2024
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
7 changes: 5 additions & 2 deletions apps/user/src/user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ export class UserService {
} else {

const decryptedPassword = await this.commonService.decryptPassword(password);
return await this.generateToken(email.toLowerCase(), decryptedPassword, userData);
return await this.generateToken(email.toLowerCase(), decryptedPassword, userData);
}
} catch (error) {
this.logger.error(`In Login User : ${JSON.stringify(error)}`);
Expand Down Expand Up @@ -629,10 +629,13 @@ export class UserService {
async generateToken(email: string, password: string, userData: user): Promise<ISignInUser> {

if (userData.keycloakUserId) {

try {
const tokenResponse = await this.clientRegistrationService.getUserToken(email, password, userData.clientId, userData.clientSecret);
tokenResponse.isRegisteredToSupabase = false;
tokenResponse.userId = userData?.id;
tokenResponse.email = userData?.email;
tokenResponse.firstName = userData?.firstName;
tokenResponse.lastName = userData?.lastName;
return tokenResponse;
} catch (error) {
throw new UnauthorizedException(ResponseMessages.user.error.invalidCredentials);
Expand Down