Merge pull request #54 from RonasIT/PRD-2382-web-search-option

PRD-2382: Add web search option to chat

Author: veliseev93

libs/mobile/auth/features/google-sign-in-form/src/lib/component.tsx

@@ -5,7 +5,6 @@ import { ReactElement, useState } from 'react';
 import { AppButton } from '@open-webui-react-native/mobile/shared/ui/ui-kit';
 import { authApi } from '@open-webui-react-native/shared/data-access/api';
 import { appStorageService } from '@open-webui-react-native/shared/data-access/storage';
-import { appEnv } from '@open-webui-react-native/shared/utils/app-env';
 import { ronasApiUrl } from '@open-webui-react-native/shared/utils/config';
 import { ToastService } from '@open-webui-react-native/shared/utils/toast-service';
 
@@ -35,7 +34,7 @@ export function GoogleSignInForm({ onSuccess }: GoogleSignInFormProps): ReactEle
 
       if (email) {
         appStorageService.apiUrl.set(ronasApiUrl);
-        signInWithGoogle({ email, isProduction: appEnv.current === 'production' });
+        signInWithGoogle({ email });
       } else if (signInResponse.type !== 'cancelled') {
         ToastService.showError();
       }

libs/mobile/chat/features/form-chat-input/src/lib/component.tsx

@@ -185,6 +185,14 @@ export function FormChatInput<T extends FieldValues>({
                       isSelected={options.includes(ChatGenerationOption.IMAGE_GENERATION)}
                     />
                   )}
+                  {config?.features.enableWebSearch && (
+                    <SelectOptionIcon
+                      disabled={isLoading}
+                      iconName='web'
+                      onPress={() => onGenerationOptionPress(ChatGenerationOption.WEB_SEARCH)}
+                      isSelected={options.includes(ChatGenerationOption.WEB_SEARCH)}
+                    />
+                  )}
                 </View>
                 <IconButton
                   disabled={isLoading}

libs/mobile/shared/features/use-logout/src/hook.ts

@@ -9,11 +9,15 @@ export const useLogout = (): { logout: () => Promise<void>; isLoading: boolean }
   const { mutateAsync: signOut, isPending } = authApi.useSignOut();
 
   const logout = async (): Promise<void> => {
-    await signOut();
+    try {
+      await signOut();
+    } catch {
+      // Session may already be gone; still wipe client state and redirect.
+    }
     authState$.logout();
     queryClient.removeQueries();
     cookieService.clearAll();
-    queryPersister.removeClient();
+    await queryPersister.removeClient();
   };
 
   return { logout, isLoading: isPending };

libs/mobile/shared/ui/ui-kit/src/assets/icons/index.ts

@@ -51,6 +51,7 @@ import trashCan from './trash-can.svg';
 import unarchive from './unarchive.svg';
 import unpin from './unpin.svg';
 import uploadFile from './upload-file.svg';
+import web from './web.svg';
 
 export const Icons = {
   logoDark,
@@ -106,4 +107,5 @@ export const Icons = {
   keyboard,
   lessText,
   moreText,
+  web,
 };

libs/mobile/shared/ui/ui-kit/src/assets/icons/web.svg

@@ -1 +1,2 @@
 export * from './error-catcher-interceptor';
+export * from './profile-not-found-interceptor';

libs/shared/data-access/api-client/src/interceptors/index.ts

@@ -0,0 +1,13 @@
+import { AxiosError, HttpStatusCode } from 'axios';
+import { authState$ } from '@open-webui-react-native/shared/data-access/auth';
+import { isGetProfileRequest } from '../utils/is-get-profile-request';
+
+export const profileNotFoundInterceptor =
+  () =>
+  (error: AxiosError): Promise<never> => {
+    if (error.response?.status === HttpStatusCode.NotFound && isGetProfileRequest(error.config)) {
+      authState$.isUnauthorized.set(true);
+    }
+
+    return Promise.reject(error);
+  };

libs/shared/data-access/api-client/src/interceptors/profile-not-found-interceptor.ts

@@ -5,7 +5,7 @@ import { appStorageService } from '@open-webui-react-native/shared/data-access/s
 import { getApiUrl } from '@open-webui-react-native/shared/utils/config';
 import { ToastService } from '@open-webui-react-native/shared/utils/toast-service';
 import { apiConfig } from './config';
-import { errorCatcherInterceptor } from './interceptors';
+import { errorCatcherInterceptor, profileNotFoundInterceptor } from './interceptors';
 
 const apiServiceCache = new Map<string, ApiService>();
 
@@ -29,6 +29,7 @@ const setupInterceptors = (service: ApiService): void => {
           },
         }),
       ],
+      [null, profileNotFoundInterceptor()],
       [
         null,
         errorCatcherInterceptor({

libs/shared/data-access/api-client/src/service.ts

@@ -0,0 +1,13 @@
+import { InternalAxiosRequestConfig } from 'axios';
+
+//NOTE: GET current user — same resource as `authService.getProfile()` (`…/v1/auths/`).
+export const isGetProfileRequest = (config?: InternalAxiosRequestConfig): boolean => {
+  if (!config || config.method?.toLowerCase() !== 'get') {
+    return false;
+  }
+  const joined = `${config.baseURL ?? ''}${config.url ?? ''}`.split('?')[0];
+  const path = joined.replace(/^https?:\/\/[^/]+/i, '');
+  const tail = path.replace(/\/+$/, '');
+
+  return /(^|\/)v1\/auths$/.test(tail);
+};

libs/shared/data-access/api-client/src/utils/is-get-profile-request.ts

@@ -4,9 +4,6 @@ export class GoogleSignInRequest {
   @Expose()
   public email: string;
 
-  @Expose({ name: 'is_production' })
-  public isProduction?: boolean;
-
   constructor(request: Partial<GoogleSignInRequest>) {
     Object.assign(this, request);
   }