thibaud-lclr/api-client
1
0
Fork 0
Code Packages Activity Actions

chore: added types to createProviderAccount ,ethod in auth.service file

Browse source
This commit is contained in:
Balu Babu 2023-01-19 04:55:51 +05:30
parent 813db4a985
commit 82dee95cd0
6 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/hoppscotch-backend/src/auth/auth.service.ts
View file

@ -224,7 +224,10 @@ export class AuthService {
statusCode: HttpStatus.NOT_FOUND,
});
// Check to see if entry for magic-link is present in the Account table for this user
/**
* * Check to see if entry for Magic-Link is present in the Account table for user
* * If user was created with another provider findUserByEmail may return true
*/
const profile = {
provider: 'email',
id: user.value.email,

6
packages/hoppscotch-backend/src/auth/strategies/github.strategy.ts
View file

@ -20,7 +20,6 @@ export class GithubStrategy extends PassportStrategy(Strategy) {
}
async validate(accessToken, refreshToken, profile, done) {
console.dir(profile);
const user = await this.usersService.findUserByEmail(
profile.emails[0].value,
);
@ -34,7 +33,10 @@ export class GithubStrategy extends PassportStrategy(Strategy) {
return createdUser;
}
// Check to see if entry for github is present in the Account table for this user
/**
* * Check to see if entry for Github is present in the Account table for user
* * If user was created with another provider findUserByEmail may return true
*/
const providerAccountExists =
await this.authService.checkIfProviderAccountExists(user.value, profile);

5
packages/hoppscotch-backend/src/auth/strategies/google.strategy.ts
View file

@ -33,7 +33,10 @@ export class GoogleStrategy extends PassportStrategy(Strategy) {
return createdUser;
}
// Check to see if entry for google is present in the Account table for this user
/**
* * Check to see if entry for Google is present in the Account table for user
* * If user was created with another provider findUserByEmail may return true
*/
const providerAccountExists =
await this.authService.checkIfProviderAccountExists(user.value, profile);

17
packages/hoppscotch-backend/src/auth/strategies/jwt.strategy.ts
View file

@ -40,27 +40,10 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
if (!payload) throw new ForbiddenException(INVALID_ACCESS_TOKEN);
const user = await this.usersService.findUserById(payload.sub);
if (O.isNone(user)) {
throw new UnauthorizedException(USER_NOT_FOUND);
}
const profile = {
provider: 'email',
id: user.value.email,
};
const providerAccountExists =
await this.authService.checkIfProviderAccountExists(user.value, profile);
if (!providerAccountExists)
await this.usersService.createProviderAccount(
user.value,
null,
null,
profile,
);
return user.value;
}
}

5
packages/hoppscotch-backend/src/auth/strategies/microsoft.strategy.ts
View file

@ -33,7 +33,10 @@ export class MicrosoftStrategy extends PassportStrategy(Strategy) {
return createdUser;
}
// Check to see if entry for microsoft is present in the Account table for this user
/**
* * Check to see if entry for Microsoft is present in the Account table for user
* * If user was created with another provider findUserByEmail may return true
*/
const providerAccountExists =
await this.authService.checkIfProviderAccountExists(user.value, profile);

9
packages/hoppscotch-backend/src/user/user.service.ts
View file

@ -1,7 +1,7 @@
import { Injectable } from '@nestjs/common';
import { PrismaService } from 'src/prisma/prisma.service';
import * as O from 'fp-ts/Option';
import { AuthUser, SSOProviderProfile } from 'src/types/AuthUser';
import { AuthUser } from 'src/types/AuthUser';
@Injectable()
export class UserService {
@ -69,7 +69,12 @@ export class UserService {
return createdUser;
}
async createProviderAccount(user, accessToken, refreshToken, profile) {
async createProviderAccount(
user: AuthUser,
accessToken: string,
refreshToken: string,
profile,
) {
const createdProvider = await this.prisma.account.create({
data: {
provider: profile.provider,