generated from openmcp-project/repository-template
-
Notifications
You must be signed in to change notification settings - Fork 3
Added 'Access Denied' screen for unauthorized MCP users #376
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
Open
lucasgoral
wants to merge
21
commits into
main
Choose a base branch
from
mcp-where-user-is-not-member-showing-generic-bug
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
5fb8659
Update controlPlanes.ts
lucasgoral 0b62d18
init
lucasgoral cb189cc
Create useGetMcpUserRights.ts
lucasgoral a37efd7
fix
lucasgoral 32b7f19
refactor
lucasgoral 2c331ab
Update ManagedControlPlaneAuthorization.tsx
lucasgoral 167641a
fix
lucasgoral 712a596
fix
lucasgoral dc19d5a
fix
lucasgoral 61e524b
fixes
lucasgoral ec47667
Update createManagedControlPlane.ts
lucasgoral 7ea2c60
fix
lucasgoral 31f683d
fix
lucasgoral 298e433
fix
lucasgoral 9fef1f3
fixes
lucasgoral 0ae6a20
fix
lucasgoral eff0e91
Update ProjectsList.tsx
lucasgoral 7961d81
fix
lucasgoral c2b3815
fix
lucasgoral 2dffee6
fix
lucasgoral b4a41e4
Merge branch 'main' into mcp-where-user-is-not-member-showing-generic…
lucasgoral File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| .wrapper { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| flex-direction: column; | ||
| width: 100%; | ||
| height: 100%; | ||
| } | ||
|
|
||
| .textAlignCenter { | ||
| text-align: center; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import type { PropsWithChildren, ReactNode, CSSProperties } from 'react'; | ||
| import cx from 'clsx'; | ||
| import styles from './Center.module.css'; | ||
|
|
||
| export type CenterProps = PropsWithChildren<{ | ||
| className?: string; | ||
| style?: CSSProperties; | ||
| textAlignCenter?: boolean; | ||
| }>; | ||
|
|
||
| export const Center = ({ children, className, style, textAlignCenter = true }: CenterProps): ReactNode => { | ||
| const classes = cx(styles.wrapper, { [styles.textAlignCenter]: textAlignCenter }, className); | ||
|
|
||
| return ( | ||
| <div className={classes} style={style}> | ||
| {children} | ||
| </div> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,4 +6,4 @@ | |
| .button { | ||
| margin-inline: auto; | ||
| margin-block: 2rem; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
src/spaces/mcp/authorization/ManagedControlPlaneAuthorization.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| import { ReactNode } from 'react'; | ||
| import { useTranslation } from 'react-i18next'; | ||
|
|
||
| import IllustratedError from '../../../components/Shared/IllustratedError.tsx'; | ||
| import { BusyIndicator, Button } from '@ui5/webcomponents-react'; | ||
| import { ControlPlaneType } from '../../../lib/api/types/crate/controlPlanes.ts'; | ||
| import { generatePath, useNavigate, useParams } from 'react-router-dom'; | ||
| import { Routes } from '../../../Routes.ts'; | ||
|
|
||
| import { Center } from '../../../components/Ui/Center/Center.tsx'; | ||
| import { CRDRequestAuthCheck } from '../../../lib/api/types/crossplane/CRDList.ts'; | ||
| import { useApiResource } from '../../../lib/api/useApiResource.ts'; | ||
|
|
||
| export interface ManagedControlPlaneAuthorizationProps { | ||
| mcp: ControlPlaneType; | ||
| children: ReactNode; | ||
| } | ||
| export const ManagedControlPlaneAuthorization = ({ children }: ManagedControlPlaneAuthorizationProps) => { | ||
| const { t } = useTranslation(); | ||
| const navigate = useNavigate(); | ||
| const { projectName, workspaceName } = useParams(); | ||
| const onBack = () => { | ||
| if (workspaceName) { | ||
| navigate( | ||
| generatePath(Routes.Project, { | ||
| projectName: projectName ?? '', | ||
| }), | ||
| ); | ||
| } | ||
| }; | ||
|
Comment on lines
+22
to
+30
|
||
|
|
||
| // Check if user has access to CRDs in the MCP's cluster | ||
| const { error, isLoading } = useApiResource(CRDRequestAuthCheck); | ||
| if (isLoading) { | ||
| return ( | ||
| <Center> | ||
| <BusyIndicator active /> | ||
| </Center> | ||
| ); | ||
| } | ||
| const isUserNotAuthorized = error?.status === 403 || error?.status === 401; | ||
| if (isUserNotAuthorized) | ||
| return ( | ||
| <Center> | ||
| <IllustratedError | ||
| title={t('mcp.authorization.accessDenied.title')} | ||
| details={t('mcp.authorization.accessDenied.details')} | ||
| /> | ||
| <Button design={'Default'} icon={'navigation-left-arrow'} onClick={onBack}> | ||
| {t('mcp.authorization.backToWorkspaces')} | ||
| </Button> | ||
| </Center> | ||
| ); | ||
|
|
||
| return <>{children}</>; | ||
| }; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
mcpprop is defined in the interface but never used in the component. If it's not needed for the current implementation, it should be removed from the interface. If it will be needed in the future, consider adding a comment explaining its intended use.