refact: modify service file structure

web/src/__tests__/FetchSecret.spec.tsx

@@ -1,9 +1,9 @@
 import FetchSecret from "pages/FetchSecret";
 import { renderWithRouterMatch, waitFor } from "utils/test-utils";
 import { SecretMock } from "__mocks__/SecretMock";
-import getSecret from "../services/ShowSecret";
+import { getSecret } from "../services";
 
-jest.mock("../services/ShowSecret");
+jest.mock("../services");
 
 const mockedGetSecret = getSecret as jest.MockedFunction<typeof getSecret>;
 

web/src/components/CreateSecretModal.tsx

@@ -5,7 +5,7 @@ import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
 import React, { useState } from "react";
 import CopyToClipboard from "react-copy-to-clipboard";
-import deleteSecret from "services/deleteSecret";
+import { deleteSecret } from "services";
 import LinkIcon from "@material-ui/icons/Link";
 import { ModalType } from "utils/enums/modal";
 import Button from "./Button";

web/src/components/ShowSecret.tsx

@@ -6,7 +6,7 @@ import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
 import { dataURLtoFile, selectOnFocus } from "utils/utils";
 import { Link, useHistory } from "react-router-dom";
-import deleteSecret from "services/deleteSecret";
+import { deleteSecret } from "services";
 import clsx from "clsx";
 import Button from "./Button";
 import ShowFile from "./ShowFile";

web/src/pages/CreateSecret.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { Grid, Snackbar } from "@material-ui/core";
-import createSecret from "services/createSecret";
+import { createSecret } from "services";
 import { Secret } from "utils/interfaces/Secret";
 import { FormikValues } from "formik";
 import { AxiosError, AxiosResponse } from "axios";

web/src/pages/FetchSecret.tsx

@@ -3,7 +3,7 @@ import SecretNotFound from "components/SecretNotFound";
 import { FormikHelpers, FormikValues } from "formik";
 import React from "react";
 import { useParams } from "react-router-dom";
-import getSecret from "services/ShowSecret";
+import { getSecret } from "services";
 import { Secret } from "utils/interfaces/Secret";
 import SecretPassword from "../components/SecretPassword";
 import dayjs from "dayjs";

web/src/services/index.ts

@@ -0,0 +1,2 @@
+export * from "./secret";
+export * from "./status";

web/src/services/secret.ts

@@ -0,0 +1,37 @@
+import { AxiosPromise, AxiosRequestConfig, AxiosResponse } from "axios";
+import client from "config";
+import { Secret } from "utils/interfaces/Secret";
+import { stringToBase64 } from "utils/utils";
+
+function createSecret(data: Secret, config: AxiosRequestConfig = {}): AxiosPromise {
+	return client.post("/secrets", data, config);
+}
+
+function deleteSecret(token: string, password?: string | null, config: AxiosRequestConfig = {}): AxiosPromise {
+	if (password) {
+		return client.delete(`/secrets/${token}`, {
+			headers: {
+				Authorization: `Bearer ${password}`,
+				"Access-Control-Request-Headers": "Authorization"
+			}
+		});
+	}
+	return client.delete(`/secrets/${token}`, config);
+}
+function getSecret(token: string, password?: string, config: AxiosRequestConfig = {}): AxiosPromise {
+	const encodedPassword = password ? stringToBase64(password) : "";
+	if (password) {
+		return client
+			.get(`/secrets/${token}`, {
+				headers: { Authorization: `Bearer ${encodedPassword}`, "Access-Control-Request-Headers": "Authorization" }
+			})
+			.then((response: AxiosResponse) => {
+				window.sessionStorage.setItem("__KEY__", encodedPassword);
+				return response;
+			});
+	}
+
+	return client.get(`/secrets/${token}`, config);
+}
+
+export { getSecret, deleteSecret, createSecret };