From 5245a512c930d5f2fecfa1dae26091ee8cbfa74a Mon Sep 17 00:00:00 2001 From: Max Techera Date: Thu, 19 Feb 2026 18:40:50 -0300 Subject: [PATCH] fix: unify Auth0 imports via AAI wrappers --- apps/web/app/(Main UI)/layout.tsx | 2 +- packages-answers/ui/src/Admin/index.tsx | 2 +- packages-answers/ui/src/AppLayout/AppLayout.Client.tsx | 4 ++-- packages-answers/ui/src/AppLayout/AppLayout.Server.tsx | 2 +- packages-answers/ui/src/AppLayout/NotInvitedPage.tsx | 2 +- packages-answers/ui/src/AppWidgetLayout.tsx | 2 +- packages-answers/ui/src/Apps/Apps.Client.tsx | 2 +- packages-answers/ui/src/AssistantInfoCard.tsx | 2 +- packages-answers/ui/src/ChatWidget.tsx | 2 +- .../ui/src/CsvTransfomer/CsvTransformer.Client.tsx | 2 +- packages-answers/ui/src/ImageCreator/ImageCreator.Client.tsx | 2 +- packages-answers/ui/src/PermissionProvider.tsx | 2 +- .../ui/src/SidekickSelect/SidekickCategoryList.tsx | 2 +- packages-answers/ui/src/SidekickSelect/SidekickSelect.tsx | 2 +- .../src/SidekickSelect/components/SidekickDialogContent.tsx | 2 +- .../ui/src/SidekickSelect/components/SidekickRenderUtils.tsx | 2 +- packages-answers/ui/src/VideoCreator/VideoCreator.Client.tsx | 2 +- packages-answers/ui/src/billing/UsageEventsTable.tsx | 2 +- packages-answers/ui/src/hooks/useRedirectToDefaultChatflow.js | 2 +- packages-answers/utils/src/auth/aaiAuth0Client.ts | 1 + packages-answers/utils/src/auth/aaiAuth0Server.ts | 1 + packages-answers/utils/src/auth/auth0.ts | 2 +- packages/ui/src/AppProvider.jsx | 2 +- packages/ui/src/hooks/useAuth0Setup.js | 2 +- packages/ui/src/views/marketplaces/MarketplaceLanding.jsx | 2 +- 25 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 packages-answers/utils/src/auth/aaiAuth0Client.ts create mode 100644 packages-answers/utils/src/auth/aaiAuth0Server.ts diff --git a/apps/web/app/(Main UI)/layout.tsx b/apps/web/app/(Main UI)/layout.tsx index 31772178cae..81645b6e798 100644 --- a/apps/web/app/(Main UI)/layout.tsx +++ b/apps/web/app/(Main UI)/layout.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { Session } from '@auth0/nextjs-auth0' +import type { Session } from '@utils/auth/aaiAuth0Server' import AppLayout from '@ui/AppLayout' import getCachedSession from '@ui/getCachedSession' diff --git a/packages-answers/ui/src/Admin/index.tsx b/packages-answers/ui/src/Admin/index.tsx index f378be0d67e..d0d74a19ef5 100644 --- a/packages-answers/ui/src/Admin/index.tsx +++ b/packages-answers/ui/src/Admin/index.tsx @@ -1,7 +1,7 @@ import { Link } from 'react-router-dom' // material-ui import { Container, Stack, Typography, Card, CardContent, CardActions, Button, Box } from '@mui/material' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import { usePermissions } from '../PermissionProvider' const AdminDashboard = () => { diff --git a/packages-answers/ui/src/AppLayout/AppLayout.Client.tsx b/packages-answers/ui/src/AppLayout/AppLayout.Client.tsx index 214e3f78915..83c558616cf 100644 --- a/packages-answers/ui/src/AppLayout/AppLayout.Client.tsx +++ b/packages-answers/ui/src/AppLayout/AppLayout.Client.tsx @@ -1,5 +1,5 @@ 'use client' -import { Session } from '@auth0/nextjs-auth0' +import type { Session } from '@utils/auth/aaiAuth0Server' import React, { useEffect } from 'react' import CssBaseline from '@mui/material/CssBaseline' @@ -8,7 +8,7 @@ import { UnifiedThemeProvider } from '../theme' import GlobalStyles from '../GlobalStyles' import { AppSettings } from 'types' -import { UserProvider } from '@auth0/nextjs-auth0/client' +import { UserProvider } from '@utils/auth/aaiAuth0Client' import { Auth0Setup } from '@/hooks/useAuth0Setup' // @ts-ignore import { ErrorProvider } from '@/store/context/ErrorContext' diff --git a/packages-answers/ui/src/AppLayout/AppLayout.Server.tsx b/packages-answers/ui/src/AppLayout/AppLayout.Server.tsx index 5c39074fd6d..c05c9355ada 100644 --- a/packages-answers/ui/src/AppLayout/AppLayout.Server.tsx +++ b/packages-answers/ui/src/AppLayout/AppLayout.Server.tsx @@ -1,4 +1,4 @@ -import { Session } from '@auth0/nextjs-auth0' +import type { Session } from '@utils/auth/aaiAuth0Server' import AppLayoutClient from './AppLayout.Client' import { AppSettings } from 'types' import { Suspense } from 'react' diff --git a/packages-answers/ui/src/AppLayout/NotInvitedPage.tsx b/packages-answers/ui/src/AppLayout/NotInvitedPage.tsx index f251888c626..f3ce61e1382 100644 --- a/packages-answers/ui/src/AppLayout/NotInvitedPage.tsx +++ b/packages-answers/ui/src/AppLayout/NotInvitedPage.tsx @@ -1,6 +1,6 @@ 'use client' import { signOut } from 'next-auth/react' -import { Session } from '@auth0/nextjs-auth0' +import type { Session } from '@utils/auth/aaiAuth0Server' import Box from '@mui/material/Box' import Button from '@mui/material/Button' diff --git a/packages-answers/ui/src/AppWidgetLayout.tsx b/packages-answers/ui/src/AppWidgetLayout.tsx index 7c340bd3715..764a0fc999d 100644 --- a/packages-answers/ui/src/AppWidgetLayout.tsx +++ b/packages-answers/ui/src/AppWidgetLayout.tsx @@ -1,5 +1,5 @@ 'use client' -import { Session } from '@auth0/nextjs-auth0' +import type { Session } from '@utils/auth/aaiAuth0Server' import CssBaseline from '@mui/material/CssBaseline' import ThemeProvider from '@mui/material/styles/ThemeProvider' diff --git a/packages-answers/ui/src/Apps/Apps.Client.tsx b/packages-answers/ui/src/Apps/Apps.Client.tsx index 589b1bde7e1..72c119a9130 100644 --- a/packages-answers/ui/src/Apps/Apps.Client.tsx +++ b/packages-answers/ui/src/Apps/Apps.Client.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react' import NextLink from 'next/link' import Image from 'next/image' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import Container from '@mui/material/Container' import Typography from '@mui/material/Typography' import Card from '@mui/material/Card' diff --git a/packages-answers/ui/src/AssistantInfoCard.tsx b/packages-answers/ui/src/AssistantInfoCard.tsx index 869840161e3..d6a1b46bd47 100644 --- a/packages-answers/ui/src/AssistantInfoCard.tsx +++ b/packages-answers/ui/src/AssistantInfoCard.tsx @@ -13,7 +13,7 @@ import { useSelector } from 'react-redux' import { useTheme } from '@mui/material/styles' import { baseURL } from '@/store/constant' import { useNavigate, useNavigationState } from 'react-router-dom' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import { useRouter } from 'next/navigation' import { useSidekickDetails } from './SidekickSelect/hooks/useSidekickDetails' import ConnectedToolsIndicator from '@/ui-component/credentials/ConnectedToolsIndicator' diff --git a/packages-answers/ui/src/ChatWidget.tsx b/packages-answers/ui/src/ChatWidget.tsx index 56a28f58c7d..ce3ca219508 100644 --- a/packages-answers/ui/src/ChatWidget.tsx +++ b/packages-answers/ui/src/ChatWidget.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react' import ChatDetailWidget from './ChatDetailWidget' import { signIn } from 'next-auth/react' -import { Session } from '@auth0/nextjs-auth0' +import type { Session } from '@utils/auth/aaiAuth0Server' import { useRouter } from 'next/navigation' interface ChatWidgetProps { diff --git a/packages-answers/ui/src/CsvTransfomer/CsvTransformer.Client.tsx b/packages-answers/ui/src/CsvTransfomer/CsvTransformer.Client.tsx index 351d124c78d..99ebdf2d237 100644 --- a/packages-answers/ui/src/CsvTransfomer/CsvTransformer.Client.tsx +++ b/packages-answers/ui/src/CsvTransfomer/CsvTransformer.Client.tsx @@ -2,7 +2,7 @@ import { useState, useEffect, useCallback } from 'react' import Link from 'next/link' import { useSearchParams, useRouter } from 'next/navigation' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' // Type declaration for the chatflows API module declare module '@/api/chatflows' { interface ChatflowsApi { diff --git a/packages-answers/ui/src/ImageCreator/ImageCreator.Client.tsx b/packages-answers/ui/src/ImageCreator/ImageCreator.Client.tsx index d68e864b0e1..318331451d5 100644 --- a/packages-answers/ui/src/ImageCreator/ImageCreator.Client.tsx +++ b/packages-answers/ui/src/ImageCreator/ImageCreator.Client.tsx @@ -1,6 +1,6 @@ 'use client' import { useState, useEffect } from 'react' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import { Stack, TextField, diff --git a/packages-answers/ui/src/PermissionProvider.tsx b/packages-answers/ui/src/PermissionProvider.tsx index 380b0fecfea..dc8ae2b728d 100644 --- a/packages-answers/ui/src/PermissionProvider.tsx +++ b/packages-answers/ui/src/PermissionProvider.tsx @@ -1,7 +1,7 @@ 'use client' import React from 'react' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import { createPermissionManager, PermissionManager } from 'utils/src/auth/permissions' import { User } from 'types' diff --git a/packages-answers/ui/src/SidekickSelect/SidekickCategoryList.tsx b/packages-answers/ui/src/SidekickSelect/SidekickCategoryList.tsx index afe841a0699..215bc6bd972 100644 --- a/packages-answers/ui/src/SidekickSelect/SidekickCategoryList.tsx +++ b/packages-answers/ui/src/SidekickSelect/SidekickCategoryList.tsx @@ -1,7 +1,7 @@ 'use client' import React from 'react' import { Box, Typography, Button } from '@mui/material' -import { UserProfile } from '@auth0/nextjs-auth0/client' +import { UserProfile } from '@utils/auth/aaiAuth0Client' import { Sidekick } from './SidekickSelect.types' import { CategorySectionn } from './SidekickCategorySection' diff --git a/packages-answers/ui/src/SidekickSelect/SidekickSelect.tsx b/packages-answers/ui/src/SidekickSelect/SidekickSelect.tsx index e1f766a07b0..cc7f3de9200 100644 --- a/packages-answers/ui/src/SidekickSelect/SidekickSelect.tsx +++ b/packages-answers/ui/src/SidekickSelect/SidekickSelect.tsx @@ -23,7 +23,7 @@ import { StarBorder as StarBorderIcon, ArrowForward as ArrowForwardIcon } from '@mui/icons-material' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import { useAnswers } from '../AnswersContext' import { useNavigate } from 'react-router-dom' import dynamic from 'next/dynamic' diff --git a/packages-answers/ui/src/SidekickSelect/components/SidekickDialogContent.tsx b/packages-answers/ui/src/SidekickSelect/components/SidekickDialogContent.tsx index eef4c6f1291..9907584ffab 100644 --- a/packages-answers/ui/src/SidekickSelect/components/SidekickDialogContent.tsx +++ b/packages-answers/ui/src/SidekickSelect/components/SidekickDialogContent.tsx @@ -1,6 +1,6 @@ 'use client' import React, { useMemo } from 'react' -import { UserProfile } from '@auth0/nextjs-auth0/client' +import { UserProfile } from '@utils/auth/aaiAuth0Client' import { Sidekick } from '../SidekickSelect.types' import { NavigateFunction } from 'react-router-dom' import SidekickSearchPanel from '../SidekickSearchPanel' diff --git a/packages-answers/ui/src/SidekickSelect/components/SidekickRenderUtils.tsx b/packages-answers/ui/src/SidekickSelect/components/SidekickRenderUtils.tsx index 85f2884c7d4..79c6dd86cdb 100644 --- a/packages-answers/ui/src/SidekickSelect/components/SidekickRenderUtils.tsx +++ b/packages-answers/ui/src/SidekickSelect/components/SidekickRenderUtils.tsx @@ -3,7 +3,7 @@ import React from 'react' import { Box } from '@mui/material' import { ChevronRight as ChevronRightIcon } from '@mui/icons-material' import { Sidekick } from '../SidekickSelect.types' -import { UserProfile } from '@auth0/nextjs-auth0/client' +import { UserProfile } from '@utils/auth/aaiAuth0Client' import { SkeletonItem, CategorySectionContainer, diff --git a/packages-answers/ui/src/VideoCreator/VideoCreator.Client.tsx b/packages-answers/ui/src/VideoCreator/VideoCreator.Client.tsx index e1d86f82ca8..5adc5503a63 100644 --- a/packages-answers/ui/src/VideoCreator/VideoCreator.Client.tsx +++ b/packages-answers/ui/src/VideoCreator/VideoCreator.Client.tsx @@ -1,7 +1,7 @@ 'use client' import { useEffect, useMemo, useRef, useState } from 'react' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import { Box, Button, diff --git a/packages-answers/ui/src/billing/UsageEventsTable.tsx b/packages-answers/ui/src/billing/UsageEventsTable.tsx index cd9e9eb5c53..abeb1bd62f7 100644 --- a/packages-answers/ui/src/billing/UsageEventsTable.tsx +++ b/packages-answers/ui/src/billing/UsageEventsTable.tsx @@ -18,7 +18,7 @@ import { import { useTheme, alpha } from '@mui/material/styles' import { useUsageEvents } from './hooks/useUsageEvents' import { format } from 'date-fns' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import OpenInNewIcon from '@mui/icons-material/OpenInNew' // Skeleton row component for loading state diff --git a/packages-answers/ui/src/hooks/useRedirectToDefaultChatflow.js b/packages-answers/ui/src/hooks/useRedirectToDefaultChatflow.js index 499e47d2ff8..2a83ba1c2cf 100644 --- a/packages-answers/ui/src/hooks/useRedirectToDefaultChatflow.js +++ b/packages-answers/ui/src/hooks/useRedirectToDefaultChatflow.js @@ -2,7 +2,7 @@ import { useEffect, useRef } from 'react' import { useRouter } from 'next/navigation' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import clientApi from '@/api/auth' const useRedirectToDefaultChatflow = () => { diff --git a/packages-answers/utils/src/auth/aaiAuth0Client.ts b/packages-answers/utils/src/auth/aaiAuth0Client.ts new file mode 100644 index 00000000000..9e46321dfbd --- /dev/null +++ b/packages-answers/utils/src/auth/aaiAuth0Client.ts @@ -0,0 +1 @@ +export * from '@auth0/nextjs-auth0/client' diff --git a/packages-answers/utils/src/auth/aaiAuth0Server.ts b/packages-answers/utils/src/auth/aaiAuth0Server.ts new file mode 100644 index 00000000000..2efdbbdc50e --- /dev/null +++ b/packages-answers/utils/src/auth/aaiAuth0Server.ts @@ -0,0 +1 @@ +export * from '@auth0/nextjs-auth0' diff --git a/packages-answers/utils/src/auth/auth0.ts b/packages-answers/utils/src/auth/auth0.ts index c6c221366e7..da49d8d4fb3 100644 --- a/packages-answers/utils/src/auth/auth0.ts +++ b/packages-answers/utils/src/auth/auth0.ts @@ -1,5 +1,5 @@ // utils/auth0.js -import { initAuth0 } from '@auth0/nextjs-auth0' +import { initAuth0 } from './aaiAuth0Server' // Debug logging helper with safety const debugLog = (message: string, data?: any) => { diff --git a/packages/ui/src/AppProvider.jsx b/packages/ui/src/AppProvider.jsx index 7d5dd5578cc..a6fdc64af6f 100644 --- a/packages/ui/src/AppProvider.jsx +++ b/packages/ui/src/AppProvider.jsx @@ -2,7 +2,7 @@ import React from 'react' import PropTypes from 'prop-types' import { store } from '@/store' -import { UserProvider } from '@auth0/nextjs-auth0/client' +import { UserProvider } from '@utils/auth/aaiAuth0Client' // style + assets import '@/assets/scss/style.scss' diff --git a/packages/ui/src/hooks/useAuth0Setup.js b/packages/ui/src/hooks/useAuth0Setup.js index 7fbfebcb9bb..446730cfb90 100644 --- a/packages/ui/src/hooks/useAuth0Setup.js +++ b/packages/ui/src/hooks/useAuth0Setup.js @@ -9,7 +9,7 @@ * Type definitions: packages-answers/ui/src/types/user.ts */ import { useState, useEffect } from 'react' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import PropTypes from 'prop-types' import { setBaseURL } from '../store/constant' diff --git a/packages/ui/src/views/marketplaces/MarketplaceLanding.jsx b/packages/ui/src/views/marketplaces/MarketplaceLanding.jsx index 9fa16739965..a907e0e9859 100644 --- a/packages/ui/src/views/marketplaces/MarketplaceLanding.jsx +++ b/packages/ui/src/views/marketplaces/MarketplaceLanding.jsx @@ -28,7 +28,7 @@ import { StyledButton } from '@/ui-component/button/StyledButton' import ErrorBoundary from '@/ErrorBoundary' import { baseURL } from '@/store/constant' import { Snackbar } from '@mui/material' -import { useUser } from '@auth0/nextjs-auth0/client' +import { useUser } from '@utils/auth/aaiAuth0Client' import { useNavigationState } from 'react-router-dom' import { Star as StarIcon, StarBorder as StarBorderIcon, Edit as EditIcon } from '@mui/icons-material' import { styled, alpha } from '@mui/material/styles'