Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/app/(Main UI)/layout.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/Admin/index.tsx
Original file line number Diff line number Diff line change
@@ -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 = () => {
Expand Down
4 changes: 2 additions & 2 deletions packages-answers/ui/src/AppLayout/AppLayout.Client.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/AppLayout/AppLayout.Server.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/AppLayout/NotInvitedPage.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/AppWidgetLayout.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/Apps/Apps.Client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/AssistantInfoCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/ChatWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/PermissionProvider.tsx
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/SidekickSelect/SidekickSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages-answers/ui/src/billing/UsageEventsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down
1 change: 1 addition & 0 deletions packages-answers/utils/src/auth/aaiAuth0Client.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '@auth0/nextjs-auth0/client'
1 change: 1 addition & 0 deletions packages-answers/utils/src/auth/aaiAuth0Server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '@auth0/nextjs-auth0'
2 changes: 1 addition & 1 deletion packages-answers/utils/src/auth/auth0.ts
Original file line number Diff line number Diff line change
@@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/AppProvider.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/hooks/useAuth0Setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/views/marketplaces/MarketplaceLanding.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down