Skip to content

Commit 875a68b

Browse files
ishpaul777ishpaul777
authored
adds the fixes for access rules
1 parent 7999d0d commit 875a68b

File tree

12 files changed

+23
-23
lines changed

12 files changed

+23
-23
lines changed

‎oathkeeper/access-rules/kavach-web.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"url": "http://kavach-web:3000"
3333
},
3434
"match": {
35-
"url": "http://127.0.0.1:4455/.factly/kavach/web<(/(organisation|organisation/edit|organisation(/(\\d+/settings(/(tokens|tokens/create|roles|roles(/(\\d+/users|\\d+/create|\\d+/edit))|policies|users|users/new))))|settings|password|profile|profile/invite|users|users(/new)|applications(/(create|type|\\d+/edit|\\d+/detail|\\d+/settings|\\d+/settings(/(users|tokens|tokens/create|roles|roles/create|policies|policies/create|spaces|spaces(/(create|\\d+/settings|\\d+/settings(/(tokens|roles|policies|users))))))))?))?/?>",
35+
"url": "http://127.0.0.1:4455/.factly/kavach/web<(/(organisation|organisation/edit|organisation/create|organisation(/(\\d+/settings(/(tokens|tokens/create|roles|roles/create|roles(/(\\d+/users|\\d+/create|\\d+/edit))|policies|policies/create|policies(/(\\d+/view|\\d+/edit))|users|users/new))))|settings|password|profile|profile/invite|users|users(/new)|applications(/(create|type|\\d+/edit|\\d+/detail|\\d+/settings|\\d+/settings(/(users|tokens|tokens/create|roles|roles/create|roles(/(\\d+/users|\\d+/create|\\d+/edit))|policies|policies/create|policies(/(\\d+/view|\\d+/edit))|spaces|spaces(/(create|\\d+/edit|\\d+/settings|\\d+/settings(/(tokens|tokens/create|roles|roles/create|roles(/(\\d+/users|\\d+/create|\\d+/edit))|policies|policies/create|policies(/(\\d+/view|\\d+/edit))|users))))))))?))?/?>",
3636
"methods": [
3737
"GET"
3838
]
@@ -60,4 +60,4 @@
6060
}
6161
]
6262
}
63-
]
63+
]

‎web/src/pages/application/settings/policies/components/CreateApplicationPolicy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default function CreateApplicationPolicyForm() {
3333
const { roles, loadingRoles } = useSelector((state) => {
3434
var roleIDs = state.applications.details[appID]?.roleIDs || [];
3535
return {
36-
roles: roleIDs.map((id) => state.roles.application[appID][id]),
36+
roles: roleIDs.map((id) => state.roles.application?.[appID]?.[id]),
3737
loadingRoles: state.roles.loading,
3838
};
3939
});

‎web/src/pages/application/settings/policies/components/EditApplicationPolicy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ export default function EditApplicationPolicy() {
2727
policy: {
2828
...state.policy?.application?.[appID]?.[policyID],
2929
roles: state.policy.application?.[appID]?.[policyID]?.roles?.map(
30-
(rID) => state.roles.application[appID][rID],
30+
(rID) => state.roles.application?.[appID]?.[rID],
3131
),
3232
},
3333
loading: state.policy.loading,
3434
role: state.profile.roles[state.organisations.selected],
3535
loadingRole: state.profile.loading,
3636
application: state.applications.details[appID],
3737
loadingApp: state.applications.loading,
38-
roles: roleIDs.map((id) => state.roles.application[appID][id]),
38+
roles: roleIDs.map((id) => state.roles.application?.[appID]?.[id]),
3939
loadingRoles: state.roles.loading,
4040
};
4141
},

‎web/src/pages/application/settings/policies/components/ViewApplicationPolicy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default function ViewApplicationPolicy() {
3232
const { policy, loading } = useSelector((state) => {
3333
return {
3434
policy: {
35-
...state.policy.application[appID][policyID],
35+
...state.policy?.application?.[appID]?.[policyID],
3636
roles:
3737
state.policy.application[appID]?.[policyID]?.roles?.map((rId) => ({
3838
...state.roles.application[appID]?.[rId],

‎web/src/pages/application/settings/roles/components/RoleList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function ApplicationRoleList({ appID, role }) {
1212
roleIDs = state.applications.details[appID]?.roleIDs || [];
1313
return {
1414
roles: roleIDs?.map((id) => ({
15-
...state.roles.application[appID][id],
15+
...state.roles.application?.[appID]?.[id],
1616
})),
1717
loading: state.roles.loading,
1818
};

‎web/src/pages/application/settings/roles/users/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export default function ApplicationRoleUsers() {
1515
(state) => {
1616
var remUserIDs = [];
1717
var roleUserIDs = [];
18-
roleUserIDs = state.roles.application[appID][roleID].users || [];
19-
const appUserIDs = state.applications.details[appID].users || [];
18+
roleUserIDs = state.roles.application?.[appID]?.[roleID].users || [];
19+
const appUserIDs = state.applications.details[appID]?.users || [];
2020
remUserIDs = appUserIDs.filter((uID) => roleUserIDs.every((rUID) => !(rUID === uID)));
2121
return {
2222
roleUsers: roleUserIDs.map((id) => state.users.details[id]),

‎web/src/pages/application/settings/spaces/settings/policies/components/ViewSpacePolicy.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ export default function ViewSpacePolicy() {
3434
policy: {
3535
...state.policy.space?.[spaceID]?.[policyID],
3636
roles:
37-
state.policy.space[spaceID][policyID]?.roles?.map((rId) => ({
37+
state.policy.space[spaceID]?.[policyID]?.roles?.map((rId) => ({
3838
...state.roles.space[spaceID]?.[rId],
3939
})) || [],
40-
permissions: state.policy.space[spaceID][policyID]?.permissions || [],
40+
permissions: state.policy.space[spaceID]?.[policyID]?.permissions || [],
4141
},
4242
loading: state.policy.loading,
4343
};
4444
});
45-
45+
4646

4747
const fetchPolicy = () => {
4848
getSpacePolicyByID(appID, spaceID, policyID);

‎web/src/pages/application/settings/spaces/settings/roles/components/EditRole.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function EditSpaceRole() {
3131

3232
const { role, loading, space, loadingSpace, userRole, loadingUserRole } = useSelector((state) => {
3333
return {
34-
role: state.roles.space[spaceID][roleID],
34+
role: state.roles.space?.[spaceID]?.[roleID],
3535
loading: state.roles.loading,
3636
space: state.spaces.details[spaceID],
3737
loadingSpace: state.spaces.loading,

‎web/src/pages/application/settings/spaces/settings/roles/users/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default function SpaceRoleUsers() {
1414
(state) => {
1515
var remUserIDs = [];
1616
var roleUserIDs = [];
17-
roleUserIDs = state.roles.space[spaceID][roleID]?.users || [];
17+
roleUserIDs = state?.roles?.space?.[spaceID]?.[roleID]?.users || [];
1818
const spaceUserIDs = state.spaces.details[spaceID]?.users || [];
1919
if (spaceUserIDs?.length) {
2020
remUserIDs = spaceUserIDs.filter((uID) => roleUserIDs.every((rUID) => !(rUID === uID)));

‎web/src/pages/application/settings/spaces/settings/users/index.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ export default function SpaceUser() {
1313

1414
const { appUsers, loadingApps, spaceUsers, loadingSpace, role } = useSelector((state) => {
1515
return {
16-
appUsers: state.applications.details[appID]?.users.map((id) => state.users.details[id]) || [],
17-
loadingApps: state.applications.loading,
18-
spaceUsers: state.spaces.details[spaceID]?.users.map((id) => state.users.details[id]) || [],
19-
loadingSpace: state.spaces.loading,
20-
role: state.profile.roles[state.organisations.selected],
16+
appUsers: state?.applications?.details[appID]?.users.map((id) => state.users.details[id]) || [],
17+
loadingApps: state?.applications?.loading,
18+
spaceUsers: state?.spaces?.details[spaceID]?.users.map((id) => state.users.details[id]) || [],
19+
loadingSpace: state?.spaces?.loading,
20+
role: state?.profile?.roles[state.organisations.selected],
2121
};
2222
});
2323

‎web/src/pages/organisation/settings/policies/components/ViewOrganisationPolicy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ export default function ViewOrganisationPolicy() {
3434
const { policy, loading } = useSelector((state) => {
3535
return {
3636
policy: {
37-
...state.policy.organisation[orgID][policyID],
37+
...state.policy?.organisation?.[orgID]?.[policyID],
3838
roles:
39-
state.policy.organisation[orgID][policyID]?.roles.map((rId) => ({
39+
state.policy?.organisation?.[orgID]?.[policyID]?.roles.map((rId) => ({
4040
...state.roles.organisation[orgID]?.[rId],
4141
})) || [],
4242
},

‎web/src/pages/organisation/settings/roles/users/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export default function OrganisationRoleUsers() {
1818
(state) => {
1919
var remUserIDs = [];
2020
var roleUserIDs = [];
21-
roleUserIDs = state.roles.organisation[orgID][roleID].users || [];
22-
const orgUserIDs = state.organisations.details[orgID].users || [];
21+
roleUserIDs = state.roles.organisation?.[orgID]?.[roleID].users || [];
22+
const orgUserIDs = state.organisations.details?.[orgID]?.users || [];
2323
remUserIDs = orgUserIDs.filter((uID) => roleUserIDs.every((rUID) => !(rUID === uID)));
2424
return {
2525
roleUsers: roleUserIDs.map((id) => state.users.details[id]),

0 commit comments

Comments
 (0)