@iushev/react-rbac 1.0.26 → 1.0.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,5 +2,6 @@
2
2
  "editor.codeActionsOnSave": {
3
3
  "source.fixAll.eslint": true
4
4
  },
5
- "editor.formatOnSave": true
6
- }
5
+ "editor.formatOnSave": true,
6
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
7
+ }
@@ -3,6 +3,7 @@ import { CheckAccessOptions } from "./RbacContext";
3
3
  export declare type CheckAccessProps = CheckAccessOptions & {
4
4
  busy?: React.ComponentType;
5
5
  noAccess?: React.ComponentType;
6
+ children: React.ReactNode;
6
7
  };
7
8
  declare const CheckAccess: React.FC<CheckAccessProps>;
8
9
  export default CheckAccess;
@@ -1 +1 @@
1
- {"version":3,"file":"CheckAccess.d.ts","sourceRoot":"","sources":["../src/CheckAccess.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAInD,oBAAY,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CAChC,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAgB3C,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"CheckAccess.d.ts","sourceRoot":"","sources":["../src/CheckAccess.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAInD,oBAAY,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAgB3C,CAAC;AAEF,eAAe,WAAW,CAAC"}
@@ -21,6 +21,7 @@ export declare type RbacProviderProps = {
21
21
  isSuperuser: boolean;
22
22
  isGuest: boolean;
23
23
  ruleClasses: Map<string, RuleCtor<Rule>>;
24
+ children: React.ReactNode;
24
25
  };
25
26
  export declare const RbacProvider: React.FC<RbacProviderProps>;
26
27
  export declare const RbacConsumer: React.Consumer<RbacContextProps>;
@@ -1 +1 @@
1
- {"version":3,"file":"RbacContext.d.ts","sourceRoot":"","sources":["../src/RbacContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgE,MAAM,OAAO,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,oBAAY,kBAAkB,GAAG,MAAM,UAAU,CAAC;AAClD,oBAAY,aAAa,GAAG,MAAM,OAAO,CAAC;AAC1C,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,kBAAkB,CAAC;IACzC,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE,CAAC;AAEF,QAAA,MAAM,WAAW,iCAGf,CAAC;AAEH,oBAAY,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA6EpD,CAAC;AAEF,eAAO,MAAM,YAAY,kCAAuB,CAAC;AAEjD,eAAO,MAAM,OAAO,QAAO,gBAM1B,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"RbacContext.d.ts","sourceRoot":"","sources":["../src/RbacContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgE,MAAM,OAAO,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,oBAAY,kBAAkB,GAAG,MAAM,UAAU,CAAC;AAClD,oBAAY,aAAa,GAAG,MAAM,OAAO,CAAC;AAC1C,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,kBAAkB,CAAC;IACzC,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE,CAAC;AAEF,QAAA,MAAM,WAAW,iCAGf,CAAC;AAEH,oBAAY,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA6EpD,CAAC;AAEF,eAAO,MAAM,YAAY,kCAAuB,CAAC;AAEjD,eAAO,MAAM,OAAO,QAAO,gBAM1B,CAAC;AAEF,eAAe,WAAW,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@iushev/react-rbac",
3
- "version": "1.0.26",
3
+ "version": "1.0.27",
4
4
  "private": false,
5
5
  "author": "Ivaylo Ushev",
6
6
  "description": "",
@@ -21,23 +21,23 @@
21
21
  "http-status-codes": "^2.2.0"
22
22
  },
23
23
  "devDependencies": {
24
- "@types/react": "^16.14.5 || ^17.0.40",
25
- "@types/react-dom": "^17.0.13",
26
- "@typescript-eslint/eslint-plugin": "^5.21.0",
27
- "@typescript-eslint/parser": "^5.21.0",
28
- "eslint": "^8.14.0",
24
+ "@types/react": "^18.0.21",
25
+ "@types/react-dom": "^18.0.6",
26
+ "@typescript-eslint/eslint-plugin": "^5.39.0",
27
+ "@typescript-eslint/parser": "^5.39.0",
28
+ "eslint": "^8.24.0",
29
29
  "eslint-config-prettier": "^8.5.0",
30
- "eslint-plugin-prettier": "^4.0.0",
31
- "eslint-plugin-react": "^7.29.4",
32
- "eslint-plugin-react-hooks": "^4.5.0",
33
- "jest": "^27.5.1",
34
- "prettier": "^2.6.2",
30
+ "eslint-plugin-prettier": "^4.2.1",
31
+ "eslint-plugin-react": "^7.31.8",
32
+ "eslint-plugin-react-hooks": "^4.6.0",
33
+ "jest": "^29.1.2",
34
+ "prettier": "^2.7.1",
35
35
  "rimraf": "^3.0.2",
36
- "ts-jest": "^27.1.4",
37
- "typescript": "^4.6.3"
36
+ "ts-jest": "^29.0.3",
37
+ "typescript": "^4.8.4"
38
38
  },
39
39
  "peerDependencies": {
40
- "@iushev/rbac": "^1.0.31",
40
+ "@iushev/rbac": "^1.0.38",
41
41
  "axios": "0.27.2",
42
42
  "react": "^16.14.0 || ^17.0.2",
43
43
  "react-dom": "^16.14.0 || ^17.0.2"
@@ -7,6 +7,7 @@ import NoAccess from "./NoAccess";
7
7
  export type CheckAccessProps = CheckAccessOptions & {
8
8
  busy?: React.ComponentType;
9
9
  noAccess?: React.ComponentType;
10
+ children: React.ReactNode;
10
11
  };
11
12
 
12
13
  const CheckAccess: React.FC<CheckAccessProps> = ({
@@ -29,6 +29,7 @@ export type RbacProviderProps = {
29
29
  isSuperuser: boolean;
30
30
  isGuest: boolean;
31
31
  ruleClasses: Map<string, RuleCtor<Rule>>;
32
+ children: React.ReactNode;
32
33
  };
33
34
 
34
35
  export const RbacProvider: React.FC<RbacProviderProps> = ({
@@ -57,7 +58,7 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
57
58
  }, [rbacUrl, token]);
58
59
 
59
60
  const matchRole = useCallback(
60
- async (roles, params) => {
61
+ async (roles: string[], params: RuleParams | RuleParamsFunction) => {
61
62
  if (!roles || roles.length === 0) {
62
63
  return true;
63
64
  }
@@ -86,7 +87,7 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
86
87
  [isGuest, rbac, username]
87
88
  );
88
89
 
89
- const matchCustom = useCallback((match) => {
90
+ const matchCustom = useCallback((match?: MatchFunction) => {
90
91
  if (!match) {
91
92
  return true;
92
93
  }