Merge pull request #105 from BinaryStudioAcademy/task/thjs-60-fix-path-join-helper

thjs-60: Fix path join helper

Author: v0ldemar01

server/src/libs/packages/config/config.package.js

@@ -30,7 +30,7 @@ class Config {
         }
       },
       JWT: {
-        SECRET_KEY: {
+        SECRET: {
           doc: 'Secret key for token generation',
           format: String,
           env: 'SECRET_KEY',

server/src/libs/packages/controller/controller.api.js

@@ -1,4 +1,4 @@
-import { getJoinedNormalizedPath } from '#libs/packages/path/path.js';
+import { joinPath } from '#libs/packages/path/path.js';
 
 class Controller {
   #apiPath;
@@ -15,7 +15,7 @@ class Controller {
 
   addRoute = ({ url, ...options }) => {
     this.#routes.push({
-      url: getJoinedNormalizedPath([this.#apiPath, url]),
+      url: joinPath([this.#apiPath, url]),
       ...options
     });
   };

server/src/libs/packages/path/libs/helpers/get-joined-normalized-path/get-joined-normalized-path.helper.js

@@ -1,3 +1 @@
-export { getJoinedNormalizedPath } from './get-joined-normalized-path/get-joined-normalized-path.helper.js';
 export { joinPath } from './join-path/join-path.helper.js';
-export { normalizeTrailingSlash } from './normalize-trailing-slash/normalize-trailing-slash.helper.js';

server/src/libs/packages/path/libs/helpers/helpers.js

@@ -1,5 +1,3 @@
-import path from 'node:path';
-
-const joinPath = paths => path.join(...paths);
+const joinPath = paths => paths.join('');
 
 export { joinPath };

server/src/libs/packages/path/libs/helpers/join-path/join-path.helper.js

@@ -1,5 +1 @@
-export {
-  getJoinedNormalizedPath,
-  joinPath,
-  normalizeTrailingSlash
-} from './libs/helpers/helpers.js';
+export { joinPath } from './libs/helpers/helpers.js';

server/src/libs/packages/path/libs/helpers/normalize-trailing-slash/normalize-trailing-slash.helper.js

@@ -5,7 +5,7 @@ import { ApiPath } from '#libs/enums/enums.js';
 import { config } from '#libs/packages/config/config.js';
 import { DatabaseTableName } from '#libs/packages/database/database.js';
 import { HttpCode, HttpHeader, HttpMethod } from '#libs/packages/http/http.js';
-import { getJoinedNormalizedPath } from '#libs/packages/path/path.js';
+import { joinPath } from '#libs/packages/path/path.js';
 import { AuthApiPath } from '#packages/auth/auth.js';
 import {
   UserPayloadKey,
@@ -21,24 +21,21 @@ import {
 import { getBearerAuthHeader } from '../../libs/packages/http/http.js';
 import { TEST_USERS_CREDENTIALS } from '../../packages/user/user.js';
 
-const authApiPath = getJoinedNormalizedPath([
-  config.ENV.APP.API_PATH,
-  ApiPath.AUTH
-]);
+const authApiPath = joinPath([config.ENV.APP.API_PATH, ApiPath.AUTH]);
 
-const registerEndpoint = getJoinedNormalizedPath([
+const registerEndpoint = joinPath([
   config.ENV.APP.API_PATH,
   ApiPath.AUTH,
   AuthApiPath.REGISTER
 ]);
 
-const loginEndpoint = getJoinedNormalizedPath([
+const loginEndpoint = joinPath([
   config.ENV.APP.API_PATH,
   ApiPath.AUTH,
   AuthApiPath.LOGIN
 ]);
 
-const userEndpoint = getJoinedNormalizedPath([
+const userEndpoint = joinPath([
   config.ENV.APP.API_PATH,
   ApiPath.AUTH,
   AuthApiPath.USER

server/src/libs/packages/path/path.js

@@ -4,7 +4,7 @@ import { ApiPath } from '#libs/enums/enums.js';
 import { config } from '#libs/packages/config/config.js';
 import { DatabaseTableName } from '#libs/packages/database/database.js';
 import { HttpCode, HttpHeader, HttpMethod } from '#libs/packages/http/http.js';
-import { getJoinedNormalizedPath } from '#libs/packages/path/path.js';
+import { joinPath } from '#libs/packages/path/path.js';
 import { AuthApiPath } from '#packages/auth/auth.js';
 import {
   CommentPayloadKey,
@@ -24,24 +24,21 @@ import {
   TEST_USERS_CREDENTIALS
 } from '../../packages/user/user.js';
 
-const loginEndpoint = getJoinedNormalizedPath([
+const loginEndpoint = joinPath([
   config.ENV.APP.API_PATH,
   ApiPath.AUTH,
   AuthApiPath.LOGIN
 ]);
 
-const commentApiPath = getJoinedNormalizedPath([
-  config.ENV.APP.API_PATH,
-  ApiPath.COMMENTS
-]);
+const commentApiPath = joinPath([config.ENV.APP.API_PATH, ApiPath.COMMENTS]);
 
-const commentsEndpoint = getJoinedNormalizedPath([
+const commentsEndpoint = joinPath([
   config.ENV.APP.API_PATH,
   ApiPath.COMMENTS,
   CommentsApiPath.ROOT
 ]);
 
-const commentIdEndpoint = getJoinedNormalizedPath([
+const commentIdEndpoint = joinPath([
   config.ENV.APP.API_PATH,
   ApiPath.COMMENTS,
   CommentsApiPath.$ID

server/tests/api/0-starter/auth.api.spec.js

@@ -9,7 +9,7 @@ import { ApiPath } from '#libs/enums/enums.js';
 import { config } from '#libs/packages/config/config.js';
 import { DatabaseTableName } from '#libs/packages/database/database.js';
 import { HttpCode, HttpHeader, HttpMethod } from '#libs/packages/http/http.js';
-import { getJoinedNormalizedPath } from '#libs/packages/path/path.js';
+import { joinPath } from '#libs/packages/path/path.js';
 import { AuthApiPath } from '#packages/auth/auth.js';
 import { ImagePayloadKey, ImagesApiPath } from '#packages/image/image.js';
 import { UserPayloadKey } from '#packages/user/user.js';
@@ -25,18 +25,15 @@ import {
   TEST_USERS_CREDENTIALS
 } from '../../packages/user/user.js';
 
-const loginEndpoint = getJoinedNormalizedPath([
+const loginEndpoint = joinPath([
   config.ENV.APP.API_PATH,
   ApiPath.AUTH,
   AuthApiPath.LOGIN
 ]);
 
-const imageEndpoint = getJoinedNormalizedPath([
-  config.ENV.APP.API_PATH,
-  ApiPath.IMAGES
-]);
+const imageEndpoint = joinPath([config.ENV.APP.API_PATH, ApiPath.IMAGES]);
 
-const imagesEndpoint = getJoinedNormalizedPath([
+const imagesEndpoint = joinPath([
   config.ENV.APP.API_PATH,
   ApiPath.IMAGES,
   ImagesApiPath.ROOT