Skip to content

Hotfix Local Register And Login #17

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
taljacob2 merged 1 commit into from
Jun 2, 2025
Merged

Hotfix Local Register And Login #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions nextstep-backend/src/services/users_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const deleteUserById = async (id: string): Promise<UserData | null> => {
return user ? userToUserData(user) : null;
};

export const registerUser = async (username: string, password: string, email: string, authProvider: string): Promise<UserData> => {
export const registerUser = async (username: string, password: string, email: string, authProvider: string = "local"): Promise<UserData> => {
let hashedPassword: string = '';
// If registering with a password (local registration)
if (password && authProvider === 'local') {
Expand Down Expand Up @@ -102,14 +102,14 @@ export const loginUserGoogle = async (email: string, authProvider: string, name:
return {...tokens, userId: user.id, username: user.username, imageFilename: user.imageFilename}
}

export const loginUser = async (email: string, password: string, authProvider?: string): Promise<{ accessToken: string, refreshToken: string, userId: string, username: string, imageFilename?: string } | null> => {
export const loginUser = async (email: string, password: string, authProvider: string = "local"): Promise<{ accessToken: string, refreshToken: string, userId: string, username: string, imageFilename?: string } | null> => {
const user = await getIUserByEmail(email);
if (!user) {
return null;
}
// Local login (with password)
if (authProvider === 'local') {
if ((await bcrypt.compare(password, user.password))) {
if (!(await bcrypt.compare(password, user.password))) {
return null;
}
}
Expand Down
Loading