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

[fix] Allow undefined url in permission check #1298

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion src/frontend/packages/auth-provider/dist/index.cjs.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/frontend/packages/auth-provider/dist/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ declare const rights: {
control: AclMode[];
};
export const useCheckPermissions: (
uri: string,
uri: string | undefined,
mode: keyof typeof rights,
redirectUrl?: string
) => Permissions | undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/packages/auth-provider/dist/index.d.ts.map
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"mappings":";;ACUA;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAicC;AC3cD,eAAsB,UAAU,GAAG,YAAY,GAAG,WAAW,GAAG,aAAa,CAAC;AAE9E,8DAA8D;AAC9D,gBAAuB,YAAY,GAAG,wBAAwB,CAAC;AAE/D,sBAAsB;IACpB,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,mBAAmB,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAC;CACrB,GAAG,CACA;IACE,2BAA2B;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,0BAA0B;IAC1B,aAAa,EAAE,MAAM,CAAC;CACvB,CACJ,CAAC;AAEF,sBAAsB,cAAc,GAAG;IACrC,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,uBAAuB,cAAc,GAAG;IACtC,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,uBAAuB,cAAc,GAAG;IACtC,gBAAgB,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAC;CACzC,CAAC;AAEF,kBAAkB,cAAc,GAAG,eAAe,GAAG,eAAe,CAAC;AAErE,mBAA0B,UAAU,EAAE,CAAC;AChBvC,QAAO,MAAM;;;;;;;CAOZ,CAAC;ACvBF,OAAA,MAAM,2BAA4B,MAAM,QAAQ,MAAM,aAAa,gBAAe,MAAM,4BAavF,CAAC;ACbF,2FAKC;;;;;;AKLD;;;;EA4FC;AE3FD;;4CAcC;;;;;;ACLD,OAAA,MAAM,yEAkBL,CAAC;AC7BF,wGAOC;ACAD,OAAA,MAAM,4BAA4B,MAAM,iBAAiB,CAAC,YAAY,CAKrE,CAAC;ACVF,yFAYC;;;;;;ACdD,sGAOC;ACID;;;;;;;;;;;4CA2CC;ACtDD,yFAAwD;;;;;;ACWxD,OAAA,MAAM,yEAkBL,CAAC;AC5BF,yFAIC;;;;;;ACLD;;;;;;;4CAqBC;;;;;;;;;;;;;;ACdD;;;;;;;;mDAuHC;;;;;;;;AC/HD,kDAIC;AELD;;;;;;;;;;GAUG;AAEH,sCAAsC;AACtC,2CADW,uBAAuB,CAUhC;AAyBK;;;;EAcN;;IAVY,+CAAqD;;;;;;;;sBAjDpD,MAAM;;;;kBACN,MAAM;;;;qBACN,MAAM;;;;iBACN,MAAM;;;;oBACN,MAAM;;;;oBACN,MAAM;;;;kBACN,MAAM;;;;2BACN,MAAM;;ACTpB;;;;+DAOC;AELD;;;;;;;;4CAGC;;;;;;;;;;;;;AOiBD;;;;;;;;;;;GAWG;AACH;IAV0B,SAAS,EAAxB,OAAO;IACQ,aAAa,EAA5B,OAAO;IACO,kBAAkB,EAAhC,MAAM;IACQ,iBAAiB,EAA/B,MAAM;IACQ,sBAAsB,EAApC,MAAM;IACQ,cAAc,EAA5B,MAAM;mDAgGhB;;;;;;;;ACzHD;;;;4CAYC;ACWD;;;;4CA0BC;;;;;;;ACnDD;;;EAcC;ACPD;;;EA6BC","sources":["packages/auth-provider/src/src/utils.js","packages/auth-provider/src/src/authProvider.js","packages/auth-provider/src/src/types.ts","packages/auth-provider/src/src/constants.ts","packages/auth-provider/src/src/hooks/useCheckPermissions.ts","packages/auth-provider/src/src/crud/create/CreateWithPermissions.js","packages/auth-provider/src/src/components/PermissionsButton/AddPermissionsForm.js","packages/auth-provider/src/src/components/PermissionsButton/AgentIcon.js","packages/auth-provider/src/src/components/PermissionsButton/AgentItem.js","packages/auth-provider/src/src/components/PermissionsButton/EditPermissionsForm.js","packages/auth-provider/src/src/hooks/useAgents.js","packages/auth-provider/src/src/components/PermissionsButton/PermissionsDialog.js","packages/auth-provider/src/src/components/PermissionsButton/PermissionsButton.js","packages/auth-provider/src/src/crud/edit/EditActionsWithPermissions.tsx","packages/auth-provider/src/src/crud/edit/DeleteButtonWithPermissions.js","packages/auth-provider/src/src/crud/edit/EditToolbarWithPermissions.tsx","packages/auth-provider/src/src/crud/edit/EditWithPermissions.js","packages/auth-provider/src/src/crud/edit/EditButtonWithPermissions.js","packages/auth-provider/src/src/crud/list/ListActionsWithPermissions.js","packages/auth-provider/src/src/crud/list/ListWithPermissions.js","packages/auth-provider/src/src/crud/show/ShowActionsWithPermissions.tsx","packages/auth-provider/src/src/crud/show/ShowWithPermissions.js","packages/auth-provider/src/src/components/AuthDialog.js","packages/auth-provider/src/src/components/SsoLoginPage.js","packages/auth-provider/src/src/hooks/useSignup.js","packages/auth-provider/src/src/hooks/useLoginCompleted.js","packages/auth-provider/src/src/passwordScorer.js","packages/auth-provider/src/src/components/LocalLoginPage/validatePasswordStrength.js","packages/auth-provider/src/src/components/LocalLoginPage/ColorGradientProgressBar.js","packages/auth-provider/src/src/components/LocalLoginPage/PasswordStrengthIndicator.js","packages/auth-provider/src/src/components/LocalLoginPage/getSearchParamsRest.js","packages/auth-provider/src/src/components/LocalLoginPage/SignupForm.js","packages/auth-provider/src/src/components/LocalLoginPage/LoginForm.js","packages/auth-provider/src/src/components/LocalLoginPage/NewPasswordForm.js","packages/auth-provider/src/src/components/LocalLoginPage/ResetPasswordForm.js","packages/auth-provider/src/src/components/LocalLoginPage/SimpleBox.js","packages/auth-provider/src/src/components/LocalLoginPage/LocalLoginPage.js","packages/auth-provider/src/src/components/ResourceWithPermissions.js","packages/auth-provider/src/src/components/UserMenu.js","packages/auth-provider/src/src/hooks/useCheckAuthenticated.js","packages/auth-provider/src/src/hooks/usePermissionsWithRefetch.js","packages/auth-provider/src/src/messages/english.js","packages/auth-provider/src/src/messages/french.js","packages/auth-provider/src/src/index.ts","packages/auth-provider/src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,"export { default as authProvider } from './authProvider';\n\n// Create\nexport { default as CreateWithPermissions } from './crud/create/CreateWithPermissions';\n\n// Edit\nexport { default as EditWithPermissions } from './crud/edit/EditWithPermissions';\nexport { default as EditActionsWithPermissions } from './crud/edit/EditActionsWithPermissions';\nexport { default as EditToolbarWithPermissions } from './crud/edit/EditToolbarWithPermissions';\nexport { default as EditButtonWithPermissions } from './crud/edit/EditButtonWithPermissions';\nexport { default as DeleteButtonWithPermissions } from './crud/edit/DeleteButtonWithPermissions';\n\n// List\nexport { default as ListWithPermissions } from './crud/list/ListWithPermissions';\nexport { default as ListActionsWithPermissions } from './crud/list/ListActionsWithPermissions';\n\n// Show\nexport { default as ShowWithPermissions } from './crud/show/ShowWithPermissions';\nexport { default as ShowActionsWithPermissions } from './crud/show/ShowActionsWithPermissions';\n\nexport { default as PermissionsButton } from './components/PermissionsButton/PermissionsButton';\nexport { default as AuthDialog } from './components/AuthDialog';\nexport { default as SsoLoginPage, default as LoginPage } from './components/SsoLoginPage';\nexport { default as LocalLoginPage } from './components/LocalLoginPage/LocalLoginPage';\nexport { default as ResourceWithPermissions } from './components/ResourceWithPermissions';\nexport { default as UserMenu } from './components/UserMenu';\n\nexport { default as useAgents } from './hooks/useAgents';\nexport { default as useCheckAuthenticated } from './hooks/useCheckAuthenticated';\nexport { default as useCheckPermissions } from './hooks/useCheckPermissions';\nexport { default as usePermissionsWithRefetch } from './hooks/usePermissionsWithRefetch';\nexport { default as useSignup } from './hooks/useSignup';\n\n// Password scoring\nexport { default as PasswordStrengthIndicator } from './components/LocalLoginPage/PasswordStrengthIndicator';\nexport { default as validatePasswordStrength } from './components/LocalLoginPage/validatePasswordStrength';\nexport {\n defaultScorer as defaultPasswordScorer,\n defaultOptions as defaultPasswordScorerOptions,\n createPasswordScorer\n} from './passwordScorer';\n\nexport { default as englishMessages } from './messages/english';\nexport { default as frenchMessages } from './messages/french';\n"],"names":[],"version":3,"file":"index.d.ts.map"}
{"mappings":";;ACUA;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAicC;AC3cD,eAAsB,UAAU,GAAG,YAAY,GAAG,WAAW,GAAG,aAAa,CAAC;AAE9E,8DAA8D;AAC9D,gBAAuB,YAAY,GAAG,wBAAwB,CAAC;AAE/D,sBAAsB;IACpB,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,mBAAmB,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAC;CACrB,GAAG,CACA;IACE,2BAA2B;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,0BAA0B;IAC1B,aAAa,EAAE,MAAM,CAAC;CACvB,CACJ,CAAC;AAEF,sBAAsB,cAAc,GAAG;IACrC,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,uBAAuB,cAAc,GAAG;IACtC,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,uBAAuB,cAAc,GAAG;IACtC,gBAAgB,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAC;CACzC,CAAC;AAEF,kBAAkB,cAAc,GAAG,eAAe,GAAG,eAAe,CAAC;AAErE,mBAA0B,UAAU,EAAE,CAAC;AChBvC,QAAO,MAAM;;;;;;;CAOZ,CAAC;ACvBF,OAAA,MAAM,2BAA4B,MAAM,GAAG,SAAS,QAAQ,MAAM,aAAa,gBAAe,MAAM,4BAanG,CAAC;ACbF,2FAKC;;;;;;AKLD;;;;EA4FC;AE3FD;;4CAcC;;;;;;ACLD,OAAA,MAAM,yEAkBL,CAAC;AC7BF,wGAOC;ACAD,OAAA,MAAM,4BAA4B,MAAM,iBAAiB,CAAC,YAAY,CAKrE,CAAC;ACVF,yFAYC;;;;;;ACdD,sGAOC;ACID;;;;;;;;;;;4CA2CC;ACtDD,yFAAwD;;;;;;ACWxD,OAAA,MAAM,yEAkBL,CAAC;AC5BF,yFAIC;;;;;;ACLD;;;;;;;4CAqBC;;;;;;;;;;;;;;ACdD;;;;;;;;mDAuHC;;;;;;;;AC/HD,kDAIC;AELD;;;;;;;;;;GAUG;AAEH,sCAAsC;AACtC,2CADW,uBAAuB,CAUhC;AAyBK;;;;EAcN;;IAVY,+CAAqD;;;;;;;;sBAjDpD,MAAM;;;;kBACN,MAAM;;;;qBACN,MAAM;;;;iBACN,MAAM;;;;oBACN,MAAM;;;;oBACN,MAAM;;;;kBACN,MAAM;;;;2BACN,MAAM;;ACTpB;;;;+DAOC;AELD;;;;;;;;4CAGC;;;;;;;;;;;;;AOiBD;;;;;;;;;;;GAWG;AACH;IAV0B,SAAS,EAAxB,OAAO;IACQ,aAAa,EAA5B,OAAO;IACO,kBAAkB,EAAhC,MAAM;IACQ,iBAAiB,EAA/B,MAAM;IACQ,sBAAsB,EAApC,MAAM;IACQ,cAAc,EAA5B,MAAM;mDAgGhB;;;;;;;;ACzHD;;;;4CAYC;ACWD;;;;4CA0BC;;;;;;;ACnDD;;;EAcC;ACPD;;;EA6BC","sources":["packages/auth-provider/src/src/utils.js","packages/auth-provider/src/src/authProvider.js","packages/auth-provider/src/src/types.ts","packages/auth-provider/src/src/constants.ts","packages/auth-provider/src/src/hooks/useCheckPermissions.ts","packages/auth-provider/src/src/crud/create/CreateWithPermissions.js","packages/auth-provider/src/src/components/PermissionsButton/AddPermissionsForm.js","packages/auth-provider/src/src/components/PermissionsButton/AgentIcon.js","packages/auth-provider/src/src/components/PermissionsButton/AgentItem.js","packages/auth-provider/src/src/components/PermissionsButton/EditPermissionsForm.js","packages/auth-provider/src/src/hooks/useAgents.js","packages/auth-provider/src/src/components/PermissionsButton/PermissionsDialog.js","packages/auth-provider/src/src/components/PermissionsButton/PermissionsButton.js","packages/auth-provider/src/src/crud/edit/EditActionsWithPermissions.tsx","packages/auth-provider/src/src/crud/edit/DeleteButtonWithPermissions.js","packages/auth-provider/src/src/crud/edit/EditToolbarWithPermissions.tsx","packages/auth-provider/src/src/crud/edit/EditWithPermissions.js","packages/auth-provider/src/src/crud/edit/EditButtonWithPermissions.js","packages/auth-provider/src/src/crud/list/ListActionsWithPermissions.js","packages/auth-provider/src/src/crud/list/ListWithPermissions.js","packages/auth-provider/src/src/crud/show/ShowActionsWithPermissions.tsx","packages/auth-provider/src/src/crud/show/ShowWithPermissions.js","packages/auth-provider/src/src/components/AuthDialog.js","packages/auth-provider/src/src/components/SsoLoginPage.js","packages/auth-provider/src/src/hooks/useSignup.js","packages/auth-provider/src/src/hooks/useLoginCompleted.js","packages/auth-provider/src/src/passwordScorer.js","packages/auth-provider/src/src/components/LocalLoginPage/validatePasswordStrength.js","packages/auth-provider/src/src/components/LocalLoginPage/ColorGradientProgressBar.js","packages/auth-provider/src/src/components/LocalLoginPage/PasswordStrengthIndicator.js","packages/auth-provider/src/src/components/LocalLoginPage/getSearchParamsRest.js","packages/auth-provider/src/src/components/LocalLoginPage/SignupForm.js","packages/auth-provider/src/src/components/LocalLoginPage/LoginForm.js","packages/auth-provider/src/src/components/LocalLoginPage/NewPasswordForm.js","packages/auth-provider/src/src/components/LocalLoginPage/ResetPasswordForm.js","packages/auth-provider/src/src/components/LocalLoginPage/SimpleBox.js","packages/auth-provider/src/src/components/LocalLoginPage/LocalLoginPage.js","packages/auth-provider/src/src/components/ResourceWithPermissions.js","packages/auth-provider/src/src/components/UserMenu.js","packages/auth-provider/src/src/hooks/useCheckAuthenticated.js","packages/auth-provider/src/src/hooks/usePermissionsWithRefetch.js","packages/auth-provider/src/src/messages/english.js","packages/auth-provider/src/src/messages/french.js","packages/auth-provider/src/src/index.ts","packages/auth-provider/src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,"export { default as authProvider } from './authProvider';\n\n// Create\nexport { default as CreateWithPermissions } from './crud/create/CreateWithPermissions';\n\n// Edit\nexport { default as EditWithPermissions } from './crud/edit/EditWithPermissions';\nexport { default as EditActionsWithPermissions } from './crud/edit/EditActionsWithPermissions';\nexport { default as EditToolbarWithPermissions } from './crud/edit/EditToolbarWithPermissions';\nexport { default as EditButtonWithPermissions } from './crud/edit/EditButtonWithPermissions';\nexport { default as DeleteButtonWithPermissions } from './crud/edit/DeleteButtonWithPermissions';\n\n// List\nexport { default as ListWithPermissions } from './crud/list/ListWithPermissions';\nexport { default as ListActionsWithPermissions } from './crud/list/ListActionsWithPermissions';\n\n// Show\nexport { default as ShowWithPermissions } from './crud/show/ShowWithPermissions';\nexport { default as ShowActionsWithPermissions } from './crud/show/ShowActionsWithPermissions';\n\nexport { default as PermissionsButton } from './components/PermissionsButton/PermissionsButton';\nexport { default as AuthDialog } from './components/AuthDialog';\nexport { default as SsoLoginPage, default as LoginPage } from './components/SsoLoginPage';\nexport { default as LocalLoginPage } from './components/LocalLoginPage/LocalLoginPage';\nexport { default as ResourceWithPermissions } from './components/ResourceWithPermissions';\nexport { default as UserMenu } from './components/UserMenu';\n\nexport { default as useAgents } from './hooks/useAgents';\nexport { default as useCheckAuthenticated } from './hooks/useCheckAuthenticated';\nexport { default as useCheckPermissions } from './hooks/useCheckPermissions';\nexport { default as usePermissionsWithRefetch } from './hooks/usePermissionsWithRefetch';\nexport { default as useSignup } from './hooks/useSignup';\n\n// Password scoring\nexport { default as PasswordStrengthIndicator } from './components/LocalLoginPage/PasswordStrengthIndicator';\nexport { default as validatePasswordStrength } from './components/LocalLoginPage/validatePasswordStrength';\nexport {\n defaultScorer as defaultPasswordScorer,\n defaultOptions as defaultPasswordScorerOptions,\n createPasswordScorer\n} from './passwordScorer';\n\nexport { default as englishMessages } from './messages/english';\nexport { default as frenchMessages } from './messages/french';\n"],"names":[],"version":3,"file":"index.d.ts.map"}
2 changes: 1 addition & 1 deletion src/frontend/packages/auth-provider/dist/index.es.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { usePermissions, useRedirect, useNotify } from 'react-admin';
import { rights, forbiddenErrors } from '../constants';
import { Permissions } from '../types';

const useCheckPermissions = (uri: string, mode: keyof typeof rights, redirectUrl: string = '/') => {
const useCheckPermissions = (uri: string | undefined, mode: keyof typeof rights, redirectUrl: string = '/') => {
const { permissions } = usePermissions<Permissions | undefined>(uri);
const notify = useNotify();
const redirect = useRedirect();
Expand Down