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.

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

remove serenity-http-client #289

Merged
merged 1 commit into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 1 addition & 18 deletions back/src/adapters/primary/helpers/handleHttpJsonResponseError.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Request, Response } from "express";
import { HttpClientError, HttpServerError } from "shared";
import { HttpError } from "./httpErrors";
import { unhandledError } from "./unhandledError";

Expand All @@ -19,26 +18,10 @@ export const handleHttpJsonResponseError = (
return res.json({ errors: toValidJSONObjectOrString(error) });
}

if (error instanceof HttpClientError || error instanceof HttpServerError) {
res.status(error.httpStatusCode);

return res.json(toJSONObject(error));
}

throw Error("Should never reach there");
};

const isManagedError = (error: unknown): boolean =>
error instanceof HttpError ||
error instanceof HttpClientError ||
error instanceof HttpServerError;

const toJSONObject = (error: HttpClientError | HttpServerError) => ({
_message: error.message,
_name: error.name,
stack: error.stack,
cause: error.cause?.message,
});
const isManagedError = (error: unknown): boolean => error instanceof HttpError;

const toValidJSONObjectOrString = (
error: HttpError,
Expand Down
19 changes: 13 additions & 6 deletions back/src/adapters/secondary/PeConnectGateway/peConnectApi.error.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
import { AxiosError } from "axios";
import {
ConnectionRefusedError,
HTTP_STATUS,
ManagedRedirectError,
RawRedirectError,
} from "shared";
import { HTTP_STATUS, ManagedRedirectError, RawRedirectError } from "shared";
import { UnhandledError } from "../../primary/helpers/unhandledError";
import { PeConnectExternalTargets } from "./peConnectApi.targets";

type PeConnectTargetsKind = keyof PeConnectExternalTargets;

class ConnectionRefusedError extends Error {
constructor(
public override readonly message: string = "Could not connect to server",
public override readonly cause?: Error,
) {
super();
// Error.captureStackTrace(this, this.constructor);
this.name = this.constructor.name;
this.message = message;
}
}

// ! In a map the highest priority is given to the lasted entry
export const peConnectErrorStrategy = (
error: AxiosError,
Expand Down
4 changes: 1 addition & 3 deletions shared/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export { absoluteUrlSchema, toAbsoluteUrl } from "./AbsoluteUrl";
export * from "./AbsoluteUrl";
export * from "./address/address.dto";
export * from "./address/address.response";
export * from "./address/address.schema";
Expand Down Expand Up @@ -42,7 +42,6 @@ export * from "./geoPosition/geoPosition.schema";
export * from "./headers";
export * from "./http/httpStatus";
export { HttpClientError as LegacyHttpClientError } from "./httpClient/errors/4xxClientError.error";
export { HttpServerError as LegacyHttpServerError } from "./httpClient/errors/5xxServerError.error";
export * from "./httpClient/ports/axios.port";
export * from "./immersionAssessment/ImmersionAssessmentDto";
export * from "./immersionAssessment/immersionAssessmentSchema";
Expand Down Expand Up @@ -78,7 +77,6 @@ export * from "./searchImmersion/SearchImmersionQueryParams.dto";
export * from "./searchImmersion/SearchImmersionQueryParams.schema";
export * from "./searchImmersion/SearchImmersionResult.dto";
export * from "./searchImmersion/SearchImmersionResult.schema";
export * from "./serenity-http-client";
export * from "./ShareLinkByEmailDto";
export * from "./siret/siret";
export * from "./siret/siret.schema";
Expand Down
3 changes: 0 additions & 3 deletions shared/src/serenity-http-client/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion shared/src/serenity-http-client/index.ts

This file was deleted.

132 changes: 0 additions & 132 deletions shared/src/serenity-http-client/src/adapters/axios.adapter.ts

This file was deleted.

72 changes: 0 additions & 72 deletions shared/src/serenity-http-client/src/adapters/axios.config.ts

This file was deleted.

This file was deleted.

Loading