BradNut/boredgame
1
0
Fork 0
mirror of https://github.com/BradNut/boredgame synced 2025-09-08 17:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing types and using provider type.

Browse source
This commit is contained in:
Bradley Shellnut 2024-09-21 09:37:21 -07:00
parent 3aa1c77947
commit 03b6bdbcf3
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/server/api/common/types/oauth-user.ts → src/lib/server/api/common/types/oauth.ts
View file

@ -7,3 +7,5 @@ export type OAuthUser = {
email?: string; email?: string;
email_verified?: boolean; email_verified?: boolean;
} }
export type OAuthProviders = 'github' | 'google' | 'apple'

4
src/lib/server/api/controllers/oauth.controller.ts
View file

@ -7,7 +7,7 @@ import { OAuth2RequestError } from 'arctic'
import { getCookie, setCookie } from 'hono/cookie' import { getCookie, setCookie } from 'hono/cookie'
import { TimeSpan } from 'oslo' import { TimeSpan } from 'oslo'
import { inject, injectable } from 'tsyringe' import { inject, injectable } from 'tsyringe'
import type {OAuthUser} from "$lib/server/api/common/types/oauth-user"; import type {OAuthUser} from "$lib/server/api/common/types/oauth";
@injectable() @injectable()
export class OAuthController extends Controller { export class OAuthController extends Controller {
@ -41,7 +41,7 @@ export class OAuthController extends Controller {
const oAuthUser: OAuthUser = { const oAuthUser: OAuthUser = {
sub: `${githubUser.id}`, sub: `${githubUser.id}`,
username: githubUser.login, username: githubUser.login,
email: null email: undefined
} }
const userId = await this.oauthService.handleOAuthUser(oAuthUser, 'github') const userId = await this.oauthService.handleOAuthUser(oAuthUser, 'github')

4
src/lib/server/api/services/oauth.service.ts
View file

@ -1,7 +1,7 @@
import { inject, injectable } from 'tsyringe' import { inject, injectable } from 'tsyringe'
import { FederatedIdentityRepository } from '../repositories/federated_identity.repository' import { FederatedIdentityRepository } from '../repositories/federated_identity.repository'
import { UsersService } from './users.service' import { UsersService } from './users.service'
import type {OAuthUser} from "$lib/server/api/common/types/oauth-user"; import type {OAuthUser, OAuthProviders} from "$lib/server/api/common/types/oauth";
@injectable() @injectable()
export class OAuthService { export class OAuthService {
@ -10,7 +10,7 @@ export class OAuthService {
@inject(UsersService) private readonly usersService: UsersService, @inject(UsersService) private readonly usersService: UsersService,
) {} ) {}
async handleOAuthUser(oAuthUser: OAuthUser, oauthProvider: string) { async handleOAuthUser(oAuthUser: OAuthUser, oauthProvider: OAuthProviders) {
const federatedUser = await this.federatedIdentityRepository.findOneByFederatedUserIdAndProvider(oAuthUser.sub, oauthProvider) const federatedUser = await this.federatedIdentityRepository.findOneByFederatedUserIdAndProvider(oAuthUser.sub, oauthProvider)
if (federatedUser) { if (federatedUser) {

2
src/lib/server/api/services/users.service.ts
View file

@ -10,7 +10,7 @@ import { type UpdateUser, UsersRepository } from '../repositories/users.reposito
import { CollectionsService } from './collections.service' import { CollectionsService } from './collections.service'
import { DrizzleService } from './drizzle.service' import { DrizzleService } from './drizzle.service'
import { WishlistsService } from './wishlists.service' import { WishlistsService } from './wishlists.service'
import type {OAuthUser} from "$lib/server/api/common/types/oauth-user"; import type {OAuthUser} from "$lib/server/api/common/types/oauth";
@injectable() @injectable()
export class UsersService { export class UsersService {