Merge branch 'master' into PRWLR-7512-create-custom-link-component

# Conflicts:
#	ui/CHANGELOG.md

ui/CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to the **Prowler UI** are documented in this file.
 
 ### 🚀 Added
 
+- SAML login integration [(#8203)](https://github.com/prowler-cloud/prowler/pull/8203)
 - Introduced new `CustomLink` component for handling all navigation and link-related behavior [(#8195)] (https://github.com/prowler-cloud/prowler/pull/8195)
 
 ### 🔄 Changed
@@ -35,7 +36,6 @@ All notable changes to the **Prowler UI** are documented in this file.
 - Improve `Scan ID` filter by adding more context and enhancing the UI/UX [(#8046)](https://github.com/prowler-cloud/prowler/pull/8046)
 - Lighthouse chat interface [(#7878)](https://github.com/prowler-cloud/prowler/pull/7878)
 - Google Tag Manager integration [(#8058)](https://github.com/prowler-cloud/prowler/pull/8058)
-<!-- - SAML login integration [(#8094)](https://github.com/prowler-cloud/prowler/pull/8094) -->
 
 ### 🔄 Changed
 

ui/app/(prowler)/profile/page.tsx

@@ -1,10 +1,10 @@
 import React, { Suspense } from "react";
 
-// import { getSamlConfig } from "@/actions/integrations/saml";
+import { getSamlConfig } from "@/actions/integrations/saml";
 import { getAllTenants } from "@/actions/users/tenants";
 import { getUserInfo } from "@/actions/users/users";
 import { getUserMemberships } from "@/actions/users/users";
-// import { SamlIntegrationCard } from "@/components/integrations/saml-integration-card";
+import { SamlIntegrationCard } from "@/components/integrations/saml-integration-card";
 import { ContentLayout } from "@/components/ui";
 import { UserBasicInfoCard } from "@/components/users/profile";
 import { MembershipsCard } from "@/components/users/profile/memberships-card";
@@ -24,7 +24,7 @@ export default async function Profile() {
 }
 
 const SSRDataUser = async () => {
-  // const samlConfig = await getSamlConfig();
+  const samlConfig = await getSamlConfig();
   const userProfile = await getUserInfo();
   if (!userProfile?.data) {
     return null;
@@ -84,10 +84,9 @@ const SSRDataUser = async () => {
           />
         </div>
       </div>
-      {/* TODO after v5.8: Add SAML SSO back in */}
-      {/* <div className="w-full pr-0 lg:w-2/3 xl:w-1/2 xl:pr-3">
+      <div className="w-full pr-0 lg:w-2/3 xl:w-1/2 xl:pr-3">
         <SamlIntegrationCard samlConfig={samlConfig?.data?.[0]} />
-      </div> */}
+      </div>
     </div>
   );
 };

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

@@ -401,8 +401,7 @@ export const AuthForm = ({
                     </Tooltip>
                   </>
                 )}
-                {/* TODO after v5.8: Add SAML SSO back in */}
-                {/* <Button
+                <Button
                   startContent={
                     !isSamlMode && (
                       <Icon
@@ -419,7 +418,7 @@ export const AuthForm = ({
                   }}
                 >
                   {isSamlMode ? "Back" : "Continue with SAML SSO"}
-                </Button> */}
+                </Button>
               </div>
             </>
           )}