fix: use correct api auth url

Author: hejkerooo

docs/env-vars.md

@@ -10,7 +10,7 @@ _Object containing the following properties:_
 | `TARGET_SOLUTION_NAMESPACES`   | If set it will only install solutions that namespaces are specified in this env. variable. Comma-separated.                                                                                           | `string`               |                                                          |
 | `RETRY_WORKER_CHECKS`          | If it's enabled it will indefinitely await for worker to pass all checks otherwise it will kill process. Useful e.g if worker account is not yet assigned to operator at the moment of configuration. | `boolean` (_nullable_) | `true`                                                   |
 | `ENABLE_HEALTH_API`            | If it's enabled it will enable health check routes.                                                                                                                                                   | `boolean` (_nullable_) | `true`                                                   |
-| `PALLET_RPC_URL`               | Read EWX Parachain URL                                                                                                                                                                                | `string` (_url_)       |                                                          |
+| `PALLET_RPC_URL`               | Read EWX Parachain URL. If provided, it will overwrite value provided from BASE_URLS.                                                                                                                 | `string` (_url_)       |                                                          |
 | **`VOTING_RPC_URL`** (\*)      | Write EWX Parachain URL                                                                                                                                                                               | `string` (_url_)       |                                                          |
 | **`VOTING_WORKER_SEED`** (\*)  | Seed of the worker (not operator)                                                                                                                                                                     | `string`               |                                                          |
 | `PORT`                         | Port number of NodeRed Server.                                                                                                                                                                        | `number` (_>0_)        | `8000`                                                   |
@@ -30,9 +30,9 @@ _Object containing the following properties:_
 | `HEARTBEAT_PATH`               | Path to the heartbeat file used for monitoring.                                                                                                                                                       | `string`               | `'heartbeat_monitor.txt'`                                |
 | `HEARTBEAT_INTERVAL`           | Interval (in ms) at which the heartbeat process updates the file.                                                                                                                                     | `number` (_>0_)        | `5000`                                                   |
 | `HEARTBEAT_PRINT_SUCCESS_LOG`  | Should print successful logs.                                                                                                                                                                         | `'true' \| 'false'`    | `'true'`                                                 |
-| `PALLET_AUTH_SERVER_LOGIN_URL` | Pallet Auth Server Url used for authentication to Workers Registry                                                                                                                                    | `string` (_url_)       |                                                          |
+| `PALLET_AUTH_SERVER_LOGIN_URL` | Pallet Auth Server Url used for authentication to Workers Registry. If provided, it will overwrite value provided from BASE_URLS.                                                                     | `string` (_url_)       |                                                          |
 | `PALLET_AUTH_SERVER_DOMAIN`    | Pallet Auth Server domain                                                                                                                                                                             | `string`               | `'default'`                                              |
-| `WORKER_REGISTRY_URL`          | Url of Workers Registry that stores information about Worker Location                                                                                                                                 | `string` (_url_)       |                                                          |
+| `WORKER_REGISTRY_URL`          | Url of Workers Registry that stores information about Worker Location. If provided, it will overwrite value provided from BASE_URLS.                                                                  | `string` (_url_)       |                                                          |
 | `BASE_URLS`                    | Base URLs of EWX resources                                                                                                                                                                            | `string` (_url_)       | `'https://marketplace-cdn.energyweb.org/base_urls.json'` |
 | `BUILD_METADATA_PATH`          | Path to build metadata file                                                                                                                                                                           | `string`               | `'./build.json'`                                         |
 

src/auth/login.ts

@@ -154,7 +154,9 @@ const obtainTokenFromAuthServer = async (
 ): Promise<string | null> => {
   const baseUrls: BaseUrlsConfig = await getBaseUrls();
 
-  const authUrl: string = `${baseUrls.authServerUrl}/api/auth/login`;
+  const authUrl: string = baseUrls.authServerUrl.includes('api/auth/login')
+    ? baseUrls.authServerUrl
+    : `${baseUrls.authServerUrl}/api/auth/login`;
 
   logger.info(
     {

src/config.ts

@@ -63,7 +63,13 @@ export const ENV_SCHEMA = z.object({
     .boolean()
     .default(true)
     .describe(`If it's enabled it will enable health check routes.`),
-  PALLET_RPC_URL: z.string().url().describe('Read EWX Parachain URL').optional(),
+  PALLET_RPC_URL: z
+    .string()
+    .url()
+    .describe(
+      'Read EWX Parachain URL. If provided, it will overwrite value provided from BASE_URLS.',
+    )
+    .optional(),
   VOTING_RPC_URL: z.string().url().describe('Write EWX Parachain URL'),
   VOTING_WORKER_SEED: z.string().describe('Seed of the worker (not operator)'),
   PORT: z.coerce.number().positive().default(8000).describe('Port number of NodeRed Server.'),
@@ -118,13 +124,17 @@ export const ENV_SCHEMA = z.object({
   PALLET_AUTH_SERVER_LOGIN_URL: z
     .string()
     .url()
-    .describe('Pallet Auth Server Url used for authentication to Workers Registry')
+    .describe(
+      'Pallet Auth Server Url used for authentication to Workers Registry. If provided, it will overwrite value provided from BASE_URLS.',
+    )
     .optional(),
   PALLET_AUTH_SERVER_DOMAIN: z.string().default('default').describe('Pallet Auth Server domain'),
   WORKER_REGISTRY_URL: z
     .string()
     .url()
-    .describe('Url of Workers Registry that stores information about Worker Location')
+    .describe(
+      'Url of Workers Registry that stores information about Worker Location. If provided, it will overwrite value provided from BASE_URLS.',
+    )
     .optional(),
   BASE_URLS: z
     .string()