Fixed automated code review warnings
This commit is contained in:
@@ -3,16 +3,14 @@ import jwt from 'jsonwebtoken';
|
|||||||
import { UnwrappedRequest } from '../utilities/guard';
|
import { UnwrappedRequest } from '../utilities/guard';
|
||||||
import { ErrorResponse, OkResponse, UnauthorizedResponse } from '../utilities/responseHelper';
|
import { ErrorResponse, OkResponse, UnauthorizedResponse } from '../utilities/responseHelper';
|
||||||
import { Claims } from '../orm/claims';
|
import { Claims } from '../orm/claims';
|
||||||
import { UnauthorizedError } from '../utilities/errors';
|
|
||||||
import { ChangePasswordRequest, LoginRequest, SecureId } from '../utilities/requestModels';
|
import { ChangePasswordRequest, LoginRequest, SecureId } from '../utilities/requestModels';
|
||||||
|
|
||||||
async function login(request: UnwrappedRequest): Promise<Response> {
|
async function login(request: UnwrappedRequest<LoginRequest>): Promise<Response> {
|
||||||
try {
|
try {
|
||||||
const requestBody = request.body as LoginRequest;
|
|
||||||
const verify: {
|
const verify: {
|
||||||
userId: SecureId;
|
userId: SecureId;
|
||||||
refreshCount: string;
|
refreshCount: string;
|
||||||
} | null = await orm.users.verifyCredentials(requestBody.username, requestBody.password);
|
} | null = await orm.users.verifyCredentials(request.body.username, request.body.password);
|
||||||
if (!verify) {
|
if (!verify) {
|
||||||
return new UnauthorizedResponse('Invalid credentials');
|
return new UnauthorizedResponse('Invalid credentials');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { BunRequest as Request } from 'bun';
|
import { BunRequest as Request } from 'bun';
|
||||||
import jwt, { TokenExpiredError } from 'jsonwebtoken';
|
import jwt, { TokenExpiredError } from 'jsonwebtoken';
|
||||||
import { ErrorResponse, UnauthorizedResponse } from './responseHelper';
|
import { ErrorResponse, UnauthorizedResponse } from './responseHelper';
|
||||||
import { UnauthorizedError } from './errors';
|
|
||||||
import { Claims } from '../orm/claims';
|
import { Claims } from '../orm/claims';
|
||||||
import HashIds from 'hashids';
|
import HashIds from 'hashids';
|
||||||
|
|
||||||
@@ -41,7 +40,7 @@ export function guard(
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UnwrappedRequest<T> {
|
export class UnwrappedRequest<T = {}> {
|
||||||
readonly body: T;
|
readonly body: T;
|
||||||
readonly request: Request;
|
readonly request: Request;
|
||||||
readonly params: { [x: string]: string };
|
readonly params: { [x: string]: string };
|
||||||
@@ -55,7 +54,7 @@ export class UnwrappedRequest<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function unwrap<T>(request: Request, claims?: Claims) {
|
export async function unwrap<T = {}>(request: Request, claims?: Claims) {
|
||||||
return new UnwrappedRequest<T>({
|
return new UnwrappedRequest<T>({
|
||||||
request,
|
request,
|
||||||
claims,
|
claims,
|
||||||
@@ -64,7 +63,7 @@ export async function unwrap<T>(request: Request, claims?: Claims) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export function unwrapMethod<T>(
|
export function unwrapMethod<T = {}>(
|
||||||
methodToUnwrap: ((r: UnwrappedRequest<T>) => Response) | ((r: UnwrappedRequest<T>) => Promise<Response>),
|
methodToUnwrap: ((r: UnwrappedRequest<T>) => Response) | ((r: UnwrappedRequest<T>) => Promise<Response>),
|
||||||
): (r: Request) => Promise<Response> {
|
): (r: Request) => Promise<Response> {
|
||||||
return async (request: Request) => {
|
return async (request: Request) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user