OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.
Python
wrap in auth FF
Mike Fortman0deffd70b960
diff --git a/frontend/app/api/mutations/useConnectConnectorMutation.ts b/frontend/app/api/mutations/useConnectConnectorMutation.tsindex e990a718f..e32a75f27 100644--- a/frontend/app/api/mutations/useConnectConnectorMutation.ts+++ b/frontend/app/api/mutations/useConnectConnectorMutation.ts@@ -1,5 +1,6 @@import { useMutation, useQueryClient } from "@tanstack/react-query";import { toast } from "sonner";+import { useAuth } from "@/contexts/auth-context";import { encodeBase64 } from "@/lib/utils";import type { Connector } from "../queries/useGetConnectorsQuery";@@ -15,6 +16,7 @@ interface ConnectResponse {export const useConnectConnectorMutation = () => {const queryClient = useQueryClient();+ const { isIbmAuthMode } = useAuth();return useMutation({mutationFn: async ({@@ -69,9 +71,11 @@ export const useConnectConnectorMutation = () => {localStorage.setItem("connecting_connector_type", connector.type);localStorage.setItem("auth_purpose", "data_source");- const returnUrl = `${window.location.origin}/auth/callback`;- const stateQuery = `id=${result.connection_id}&return=${returnUrl}`;- const state = encodeBase64(stateQuery);+ const state = isIbmAuthMode+ ? encodeBase64(+ `id=${result.connection_id}&return=${window.location.origin}/auth/callback`,+ )+ : result.connection_id;const authUrl =`${result.oauth_config.authorization_endpoint}?` +diff --git a/frontend/app/auth/callback/page.tsx b/frontend/app/auth/callback/page.tsxindex 9cb056b7c..6c73ae7b0 100644--- a/frontend/app/auth/callback/page.tsx+++ b/frontend/app/auth/callback/page.tsx@@ -18,7 +18,7 @@ import { decodeBase64 } from "@/lib/utils";function AuthCallbackContent() {const router = useRouter();const searchParams = useSearchParams();- const { refreshAuth } = useAuth();+ const { refreshAuth, isIbmAuthMode } = useAuth();const [status, setStatus] = useState<"processing" | "success" | "error">("processing",);@@ -87,9 +87,9 @@ function AuthCallbackContent() {let parsedConnectionId = finalConnectorId;let stateReturnUrl: string | null = null;- if (stateParam) {+ // In IBM auth mode, state is base64-encoded: id=<connection_id>&return=<broker_callback_url>+ if (isIbmAuthMode && stateParam) {try {- // The entire state is now Base64 encoded: id=<connection_id>&return=<return_url>const decodedState = decodeBase64(stateParam);console.log("OAuth callback state (decoded):", decodedState);const params = new URLSearchParams(decodedState);@@ -146,7 +146,6 @@ function AuthCallbackContent() {// App authentication - refresh auth context and redirect to home/original pageawait refreshAuth();- // Get redirect URL from state, search params, or defaultconst redirectTo =stateReturnUrl || searchParams.get("redirect") || "/chat";diff --git a/frontend/contexts/auth-context.tsx b/frontend/contexts/auth-context.tsxindex bb9a0e41e..fc6296298 100644--- a/frontend/contexts/auth-context.tsx+++ b/frontend/contexts/auth-context.tsx@@ -151,11 +151,13 @@ export function AuthProvider({ children }: AuthProviderProps) {),});- const returnUrl = `${window.location.origin}/auth/callback`;- const stateQuery = `id=${result.connection_id}&return=${returnUrl}`;- const state = encodeBase64(stateQuery);+ const state = isIbmAuthMode+ ? encodeBase64(+ `id=${result.connection_id}&return=${window.location.origin}/auth/callback`,+ )+ : result.connection_id;- console.log("OAuth state (encoded):", state, "decoded:", stateQuery);+ console.log("OAuth state (encoded):", state);const authUrl =`${result.oauth_config.authorization_endpoint}?` +