fix: ACS dynamic url and password input visible in sign up (#8131)

Co-authored-by: Pablo Lara <larabjj@gmail.com>
Co-authored-by: Adrián Jesús Peña Rodríguez <adrianjpr@gmail.com>

.env

@@ -6,6 +6,7 @@
 PROWLER_UI_VERSION="stable"
 AUTH_URL=http://localhost:3000
 API_BASE_URL=http://prowler-api:8080/api/v1
+NEXT_PUBLIC_API_BASE_URL=${API_BASE_URL}
 NEXT_PUBLIC_API_DOCS_URL=http://prowler-api:8080/api/v1/docs
 AUTH_TRUST_HOST=true
 UI_PORT=3000

.github/workflows/ui-build-lint-push-containers.yml

@@ -30,6 +30,7 @@ env:
   # Container Registries
   PROWLERCLOUD_DOCKERHUB_REPOSITORY: prowlercloud
   PROWLERCLOUD_DOCKERHUB_IMAGE: prowler-ui
+  NEXT_PUBLIC_API_BASE_URL: http://prowler-api:8080/api/v1
 
 jobs:
   repository-check:
@@ -86,6 +87,7 @@ jobs:
           context: ${{ env.WORKING_DIRECTORY }}
           build-args: |
             NEXT_PUBLIC_PROWLER_RELEASE_VERSION=${{ env.SHORT_SHA }}
+            NEXT_PUBLIC_API_BASE_URL=${{ env.NEXT_PUBLIC_API_BASE_URL }}
           # Set push: false for testing
           push: true
           tags: |
@@ -101,6 +103,7 @@ jobs:
           context: ${{ env.WORKING_DIRECTORY }}
           build-args: |
             NEXT_PUBLIC_PROWLER_RELEASE_VERSION=v${{ env.RELEASE_TAG }}
+            NEXT_PUBLIC_API_BASE_URL=${{ env.NEXT_PUBLIC_API_BASE_URL }}
           push: true
           tags: |
             ${{ env.PROWLERCLOUD_DOCKERHUB_REPOSITORY }}/${{ env.PROWLERCLOUD_DOCKERHUB_IMAGE }}:${{ env.RELEASE_TAG }}

docs/tutorials/prowler-app-sso.md

@@ -199,7 +199,7 @@ AUTH_URL="<WEB_UI_URL>"
 - Ensure the `AUTH_URL` points to the correct web UI deployment (development, staging, or production)
 - The callback endpoint `/api/auth/callback/saml` must be accessible and properly configured to handle SAML authentication responses
 - Both environment variables are required for proper SAML SSO functionality
-- Verify that the `API_BASE_URL` environment variable is properly configured to reference the correct API server base URL corresponding to your target deployment environment. This ensures proper routing of SAML callback requests to the appropriate backend services.
+- Verify that the `NEXT_PUBLIC_API_BASE_URL` environment variable is properly configured to reference the correct API server base URL corresponding to your target deployment environment. This ensures proper routing of SAML callback requests to the appropriate backend services.
 
 ## 8. Start SAML Login Flow
 

ui/CHANGELOG.md

@@ -32,6 +32,7 @@ All notable changes to the **Prowler UI** are documented in this file.
 - Make user and password fields optional but mutually required for M365 cloud provider [(#8044)](https://github.com/prowler-cloud/prowler/pull/8044)
 - Improve filter behaviour and relationships between filters in findings page [(#8046)](https://github.com/prowler-cloud/prowler/pull/8046)
 - Set filters panel to be always open by default [(#8085)](https://github.com/prowler-cloud/prowler/pull/8085)
+- Duplicate API base URL as an env var to make it accessible in client components [(#8131)](https://github.com/prowler-cloud/prowler/pull/8131)
 
 ### 🐞 Fixed
 

ui/Dockerfile

@@ -30,6 +30,8 @@ ARG NEXT_PUBLIC_PROWLER_RELEASE_VERSION
 ENV NEXT_PUBLIC_PROWLER_RELEASE_VERSION=${NEXT_PUBLIC_PROWLER_RELEASE_VERSION}
 ARG NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID
 ENV NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID=${NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID}
+ARG NEXT_PUBLIC_API_BASE_URL
+ENV NEXT_PUBLIC_API_BASE_URL=${NEXT_PUBLIC_API_BASE_URL}
 
 RUN \
   if [ -f package-lock.json ]; then npm run build; \

ui/components/auth/oss/auth-form.tsx

@@ -218,7 +218,7 @@ export const AuthForm = ({
                 isInvalid={!!form.formState.errors.email}
                 showFormMessage={type !== "sign-in"}
               />
-              {!isSamlMode && type === "sign-in" && (
+              {!isSamlMode && (
                 <CustomInput
                   control={form.control}
                   name="password"

ui/components/integrations/forms/saml-config-form.tsx

@@ -9,6 +9,7 @@ import { useToast } from "@/components/ui";
 import { CustomButton, CustomServerInput } from "@/components/ui/custom";
 import { SnippetChip } from "@/components/ui/entities";
 import { FormButtons } from "@/components/ui/form";
+import { apiBaseUrl } from "@/lib";
 
 export const SamlConfigForm = ({
   setIsOpen,
@@ -120,8 +121,8 @@ export const SamlConfigForm = ({
   };
 
   const acsUrl = emailDomain
-    ? `https://app.prowler.pro/saml/sp/consume/${emailDomain}`
-    : "https://app.prowler.pro/saml/sp/consume/your-domain.com";
+    ? `${apiBaseUrl}/saml/sp/consume/${emailDomain}`
+    : `${apiBaseUrl}/saml/sp/consume/your-domain.com`;
 
   return (
     <form ref={formRef} action={formAction} className="flex flex-col space-y-6">

ui/lib/helper.ts

@@ -5,7 +5,7 @@ import { useToast } from "@/components/ui";
 import { AuthSocialProvider, MetaDataProps, PermissionInfo } from "@/types";
 
 export const baseUrl = process.env.AUTH_URL || "http://localhost:3000";
-export const apiBaseUrl = process.env.API_BASE_URL;
+export const apiBaseUrl = process.env.NEXT_PUBLIC_API_BASE_URL;
 
 /**
  * Extracts a form value from a FormData object