feat: pass database to whoami (#1860)

Author: artemmufazalov

src/containers/App/Content.tsx

@@ -15,6 +15,7 @@ import {authenticationApi} from '../../store/reducers/authentication/authenticat
 import {useCapabilitiesLoaded, useCapabilitiesQuery} from '../../store/reducers/capabilities/hooks';
 import {nodesListApi} from '../../store/reducers/nodesList';
 import {cn} from '../../utils/cn';
+import {useDatabaseFromQuery} from '../../utils/hooks/useDatabaseFromQuery';
 import {lazyComponent} from '../../utils/lazyComponent';
 import Authentication from '../Authentication/Authentication';
 import {getClusterPath} from '../Cluster/utils';
@@ -184,7 +185,8 @@ function DataWrapper({children}: {children: React.ReactNode}) {
 }
 
 function GetUser({children}: {children: React.ReactNode}) {
-    const {isLoading, error} = authenticationApi.useWhoamiQuery(undefined);
+    const database = useDatabaseFromQuery();
+    const {isLoading, error} = authenticationApi.useWhoamiQuery({database});
 
     return (
         <LoaderWrapper loading={isLoading} size="l">

src/services/api/viewer.ts

@@ -434,8 +434,8 @@ export class ViewerAPI extends BaseYdbAPI {
         );
     }
 
-    whoami() {
-        return this.get<TUserToken>(this.getPath('/viewer/json/whoami'), {});
+    whoami({database}: {database?: string}) {
+        return this.get<TUserToken>(this.getPath('/viewer/json/whoami'), {database});
     }
 
     autocomplete(params: {database: string; prefix?: string; limit?: number; table?: string[]}) {

src/store/reducers/authentication/authentication.ts

@@ -50,9 +50,9 @@ export const {selectIsUserAllowedToMakeChanges, selectUser} = slice.selectors;
 export const authenticationApi = api.injectEndpoints({
     endpoints: (build) => ({
         whoami: build.query({
-            queryFn: async (_, {dispatch}) => {
+            queryFn: async ({database}: {database?: string}, {dispatch}) => {
                 try {
-                    const data = await window.api.viewer.whoami();
+                    const data = await window.api.viewer.whoami({database});
                     dispatch(setUser(data));
                     return {data};
                 } catch (error) {

src/store/reducers/capabilities/hooks.ts

@@ -1,17 +1,9 @@
-import {StringParam, useQueryParam} from 'use-query-params';
-
 import type {Capability} from '../../../types/api/capabilities';
 import {useTypedSelector} from '../../../utils/hooks';
+import {useDatabaseFromQuery} from '../../../utils/hooks/useDatabaseFromQuery';
 
 import {capabilitiesApi, selectCapabilityVersion, selectDatabaseCapabilities} from './capabilities';
 
-function useDatabaseFromQuery() {
-    const [database] = useQueryParam('database', StringParam);
-
-    // Remove null from database type
-    return database ?? undefined;
-}
-
 export function useCapabilitiesQuery() {
     const database = useDatabaseFromQuery();
 

src/utils/hooks/useDatabaseFromQuery.ts

@@ -0,0 +1,8 @@
+import {StringParam, useQueryParam} from 'use-query-params';
+
+export function useDatabaseFromQuery() {
+    const [database] = useQueryParam('database', StringParam);
+
+    // Remove null from database type
+    return database ?? undefined;
+}