Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error handling of UrlResolver and fix VC profile inaccessible #7704

Merged
merged 5 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from 3 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
4 changes: 4 additions & 0 deletions src/core/apollo/generated/apollo-helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3877,8 +3877,10 @@ export type UrlResolverQueryResultVirtualContributorFieldPolicy = {
};
export type UrlResolverQueryResultsKeySpecifier = (
| 'discussionId'
| 'errorMessage'
| 'innovationHubId'
| 'innovationPack'
| 'isError'
| 'organizationId'
| 'space'
| 'type'
Expand All @@ -3888,8 +3890,10 @@ export type UrlResolverQueryResultsKeySpecifier = (
)[];
export type UrlResolverQueryResultsFieldPolicy = {
discussionId?: FieldPolicy<any> | FieldReadFunction<any>;
errorMessage?: FieldPolicy<any> | FieldReadFunction<any>;
innovationHubId?: FieldPolicy<any> | FieldReadFunction<any>;
innovationPack?: FieldPolicy<any> | FieldReadFunction<any>;
isError?: FieldPolicy<any> | FieldReadFunction<any>;
organizationId?: FieldPolicy<any> | FieldReadFunction<any>;
space?: FieldPolicy<any> | FieldReadFunction<any>;
type?: FieldPolicy<any> | FieldReadFunction<any>;
Expand Down
2 changes: 2 additions & 0 deletions src/core/apollo/generated/apollo-hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21788,6 +21788,8 @@ export const UrlResolverDocument = gql`
}
}
innovationHubId
isError
errorMessage
}
}
`;
Expand Down
5 changes: 5 additions & 0 deletions src/core/apollo/generated/graphql-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7217,8 +7217,10 @@ export type UrlResolverQueryResultVirtualContributor = {
export type UrlResolverQueryResults = {
__typename?: 'UrlResolverQueryResults';
discussionId?: Maybe<Scalars['UUID']>;
errorMessage: Scalars['String'];
innovationHubId?: Maybe<Scalars['UUID']>;
innovationPack?: Maybe<UrlResolverQueryResultInnovationPack>;
isError: Scalars['Boolean'];
organizationId?: Maybe<Scalars['UUID']>;
space?: Maybe<UrlResolverQueryResultSpace>;
type: UrlType;
Expand All @@ -7241,6 +7243,7 @@ export enum UrlType {
InnovationHub = 'INNOVATION_HUB',
InnovationLibrary = 'INNOVATION_LIBRARY',
InnovationPacks = 'INNOVATION_PACKS',
NotAuthorized = 'NOT_AUTHORIZED',
Organization = 'ORGANIZATION',
Space = 'SPACE',
SpaceExplorer = 'SPACE_EXPLORER',
Expand Down Expand Up @@ -26419,6 +26422,8 @@ export type UrlResolverQuery = {
userId?: string | undefined;
discussionId?: string | undefined;
innovationHubId?: string | undefined;
isError: boolean;
errorMessage: string;
space?:
| {
__typename?: 'UrlResolverQueryResultSpace';
Expand Down
9 changes: 7 additions & 2 deletions src/core/routing/useRestrictedRedirect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { NavigateOptions } from 'react-router/lib/hooks';
interface RestrictedRedirectQueryResponse<Data extends {}> {
data?: Data;
error?: ApolloError;
skip?: boolean;
}

interface PrivilegesReader<Data> {
Expand All @@ -23,7 +24,7 @@ const DEFAULT_NAVIGATE_OPTIONS: NavigateOptions = {
};

const useRestrictedRedirect = <Data extends {}>(
{ data, error }: RestrictedRedirectQueryResponse<Data>,
{ data, error, skip = false }: RestrictedRedirectQueryResponse<Data>,
readPrivileges: PrivilegesReader<Data>,
{
requiredPrivilege = AuthorizationPrivilege.Read,
Expand All @@ -36,14 +37,18 @@ const useRestrictedRedirect = <Data extends {}>(
const redirectUrl = `/restricted?origin=${encodeURI(pathname)}`;

useEffect(() => {
if (skip) {
return;
}

if (error && isApolloForbiddenError(error)) {
navigate(redirectUrl, navigateOptions);
}

if (data && !readPrivileges(data)?.includes(requiredPrivilege)) {
navigate(redirectUrl, navigateOptions);
}
}, [data, error]);
}, [data, error, skip]);
};

export default useRestrictedRedirect;
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ export const VCProfilePage = ({ openKnowledgeBaseDialog, children }: VCProfilePa
skip: !data?.lookup.virtualContributor?.aiPersona?.bodyOfKnowledgeID || !isBokSpace,
});

useRestrictedRedirect({ data, error }, data => data.lookup.virtualContributor?.authorization?.myPrivileges);
useRestrictedRedirect(
{ data, error, skip: urlResolverLoading || loading },
data => data.lookup.virtualContributor?.authorization?.myPrivileges
);

if (urlResolverLoading || loading || !vcId) {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,13 @@ const VCSettingsPageLayout = ({ ...props }: PropsWithChildren<VCPageLayoutProps>

const { t } = useTranslation();

useRestrictedRedirect({ data, error }, data => data.lookup.virtualContributor?.authorization?.myPrivileges, {
requiredPrivilege: AuthorizationPrivilege.Update,
});
useRestrictedRedirect(
{ data, error, skip: urlResolverLoading || loading },
data => data.lookup.virtualContributor?.authorization?.myPrivileges,
{
requiredPrivilege: AuthorizationPrivilege.Update,
}
);

return (
<EntitySettingsLayout
Expand Down
5 changes: 5 additions & 0 deletions src/main/routing/urlResolver/UrlResolverProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useUrlResolverQuery } from '@/core/apollo/generated/apollo-hooks';
import { SpaceLevel, UrlType } from '@/core/apollo/generated/graphql-schema';
import { NotFoundError } from '@/core/notFound/NotFoundErrorBoundary';
import { PartialRecord } from '@/core/utils/PartialRecords';
import { compact } from 'lodash';
import { createContext, ReactNode, useEffect, useMemo, useState } from 'react';
Expand Down Expand Up @@ -133,6 +134,10 @@ const UrlResolverProvider = ({ children }: { children: ReactNode }) => {
skip: !queryUrl,
});

if (!urlResolverLoading && urlResolverData?.urlResolver.isError) {
throw new NotFoundError(urlResolverData?.urlResolver.errorMessage);
}

const setUrlParams = (url: string) => {
setQueryUrl(url);
};
Expand Down
2 changes: 2 additions & 0 deletions src/main/routing/urlResolver/UrlResolvers.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ query UrlResolver($url: String!) {
}
}
innovationHubId
isError
errorMessage
}
}

Expand Down