@blocklet/discuss-kit-ux 1.6.182 → 1.6.183

package/dist/components/authz/access-control.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
-import type { User } from '../../types';
+import type { SessionContextUser } from '../hooks/session';
 interface AccessControlProps {
     authenticated?: boolean;
     permissions?: string | string[];
     roles?: string | string[];
-    check?: (user: User) => boolean;
+    check?: (user: SessionContextUser) => boolean;
     children: React.ReactElement;
 }
 export default function AccessControl({ authenticated, permissions, roles, check, children, }: AccessControlProps): import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | null;

package/dist/components/authz/context.d.ts

@@ -1,14 +1,12 @@
 type HasPermission = (perms: string | string[]) => boolean;
-type HasRole = (roles: string | string[]) => boolean;
 interface AuthzProviderProps {
-    fetchPermissions: () => Promise<string[]>;
 }
 interface AuthzContextValue {
     permissions: string[];
     hasPermission: HasPermission;
-    hasRole: HasRole;
     isAdmin: boolean;
+    hasAnyPassport: (passports: string | string[]) => boolean;
 }
 export declare const useAuthzContext: () => AuthzContextValue;
-export declare const AuthzProvider: ({ fetchPermissions, ...rest }: AuthzProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const AuthzProvider: ({ ...rest }: AuthzProviderProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/hooks/session.d.ts

@@ -1 +1,19 @@
-export declare const useSessionContext: () => any;
+export interface SessionContextUser {
+    did: string;
+    fullName: string;
+    avatar: string;
+    passports: {
+        id: string;
+        name: string;
+        title: string;
+    }[];
+    permissions: string[];
+    role: string;
+}
+export declare const useSessionContext: () => {
+    isAdmin: boolean;
+    hasAnyPassport: (passports: string | string[]) => boolean;
+    session: {
+        user: SessionContextUser;
+    };
+};

package/dist/{editor-fQ1zjzhm.mjs → editor-LUBMEeS4.mjs}

@@ -4,7 +4,7 @@ import { OnContentChangePlugin } from "@blocklet/editor/lib/ext/OnContentChangeP
 import { CtrlsShortcutPlugin } from "@blocklet/editor/lib/ext/ShortcutPlugin";
 import { SafeAreaPlugin } from "@blocklet/editor/lib/ext/SafeAreaPlugin";
 import { lazy } from "react";
-import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-QDqykalr.mjs";
+import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-LsAi57M8.mjs";
 import "@blocklet/labels";
 import "@mui/material/styles";
 import "@mui/material/Box";

package/dist/{index-QDqykalr.mjs → index-LsAi57M8.mjs}

@@ -917,10 +917,18 @@ function Badge({
 }
 const useSessionContext = () => {
   var _a2, _b2;
-  const ctx = useContext(SessionContext);
+  const ctx = useContext(SessionContext) || {};
+  const loginRole = (_b2 = (_a2 = ctx == null ? void 0 : ctx.session) == null ? void 0 : _a2.user) == null ? void 0 : _b2.role;
   return {
-    ...ctx || {},
-    isAdmin: ["admin", "owner"].includes((_b2 = (_a2 = ctx == null ? void 0 : ctx.session) == null ? void 0 : _a2.user) == null ? void 0 : _b2.role)
+    ...ctx,
+    isAdmin: ["admin", "owner"].includes(loginRole),
+    hasAnyPassport: (passports) => {
+      if (!passports || passports.length === 0) {
+        return true;
+      }
+      const passportsArr = Array.isArray(passports) ? passports : [passports];
+      return passportsArr.includes(loginRole);
+    }
   };
 };
 const isEqual = (a, b) => {
@@ -3340,27 +3348,18 @@ function BlogPermaLink({ slug, onChange, ...rest }) {
 const AuthzContext = createContext({
   permissions: [],
   hasPermission: () => false,
-  hasRole: () => false,
-  isAdmin: false
+  isAdmin: false,
+  hasAnyPassport: () => false
 });
 const useAuthzContext = () => useContext(AuthzContext);
-const AuthzProvider = ({ fetchPermissions, ...rest }) => {
-  var _a2, _b2, _c;
-  const { session } = useSessionContext();
-  const [permissions, setPermissions] = useState([]);
-  const permissionSet = useMemo(() => new Set(permissions), [permissions]);
-  useEffect(() => {
+const AuthzProvider = ({ ...rest }) => {
+  var _a2;
+  const { session, isAdmin, hasAnyPassport } = useSessionContext();
+  const permissions = useMemo(() => {
     var _a3;
-    const initPermissions = async () => {
-      const perms = await fetchPermissions();
-      if (perms == null ? void 0 : perms.length) {
-        setPermissions(perms);
-      }
-    };
-    if ((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.role) {
-      initPermissions();
-    }
-  }, [(_a2 = session == null ? void 0 : session.user) == null ? void 0 : _a2.role]);
+    return ((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.permissions) || [];
+  }, [(_a2 = session == null ? void 0 : session.user) == null ? void 0 : _a2.permissions]);
+  const permissionSet = useMemo(() => new Set(permissions), [permissions]);
   const hasPermission = useCallback(
     (perms) => {
       if (!perms || perms.length === 0) {
@@ -3371,21 +3370,9 @@ const AuthzProvider = ({ fetchPermissions, ...rest }) => {
     },
     [permissionSet]
   );
-  const hasRole = useCallback(
-    (roles) => {
-      var _a3;
-      if (!roles || roles.length === 0) {
-        return true;
-      }
-      const rolesArr = Array.isArray(roles) ? roles : [roles];
-      return rolesArr.includes((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.role);
-    },
-    [(_b2 = session == null ? void 0 : session.user) == null ? void 0 : _b2.role]
-  );
-  const isAdmin = ["admin", "owner"].includes((_c = session == null ? void 0 : session.user) == null ? void 0 : _c.role);
   const value = useMemo(
-    () => ({ permissions, hasPermission, hasRole, isAdmin }),
-    [hasPermission, hasRole, permissions, isAdmin]
+    () => ({ permissions, hasPermission, isAdmin, hasAnyPassport }),
+    [hasPermission, permissions, isAdmin, hasAnyPassport]
   );
   return /* @__PURE__ */ jsx(AuthzContext.Provider, { ...rest, value });
 };
@@ -3397,11 +3384,11 @@ function AccessControl({
   children
 }) {
   const { session } = useSessionContext();
-  const { hasPermission, hasRole } = useAuthzContext();
+  const { hasPermission, hasAnyPassport } = useAuthzContext();
   if (authenticated && !(session == null ? void 0 : session.user)) {
     return null;
   }
-  const permitted = hasPermission(permissions || "") && hasRole(roles || "") && (!check || check(session.user));
+  const permitted = hasPermission(permissions || "") && hasAnyPassport(roles || "") && (!check || check(session.user));
   if (permitted) {
     return children;
   }
@@ -4810,7 +4797,7 @@ function Pagination({
     }
   );
 }
-const Editor = lazy(() => import("./editor-fQ1zjzhm.mjs"));
+const Editor = lazy(() => import("./editor-LUBMEeS4.mjs"));
 function LazyEditor(props) {
   const fallback = /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Skeleton, {}),

package/dist/index.es.js

@@ -1,5 +1,5 @@
 export * from "@blocklet/labels";
-import { O, j, T, A, h, a9, B, z, H, F, J, al, m, W, U, X, Z, q, C, v, w, y, a1, a2, ad, a4, L, N, D, ac, ab, E, G, b, f, aa, M, P, ak, o, n, a8, R, S, a5, am, k, _, a0, ae, ah, ag, ai, an, K, ao, l, p, r, e, t, a6, Q, c, Y, x, a3, a7, u, aj, ap, $, af, d } from "./index-QDqykalr.mjs";
+import { O, j, T, A, h, a9, B, z, H, F, J, al, m, W, U, X, Z, q, C, v, w, y, a1, a2, ad, a4, L, N, D, ac, ab, E, G, b, f, aa, M, P, ak, o, n, a8, R, S, a5, am, k, _, a0, ae, ah, ag, ai, an, K, ao, l, p, r, e, t, a6, Q, c, Y, x, a3, a7, u, aj, ap, $, af, d } from "./index-LsAi57M8.mjs";
 import "react/jsx-runtime";
 import "react";
 import "@mui/material/Box";

package/dist/index.umd.js

@@ -850,10 +850,18 @@ var __publicField = (obj, key, value) => {
   }
   const useSessionContext = () => {
     var _a2, _b2;
-    const ctx = react.useContext(Session.SessionContext);
+    const ctx = react.useContext(Session.SessionContext) || {};
+    const loginRole = (_b2 = (_a2 = ctx == null ? void 0 : ctx.session) == null ? void 0 : _a2.user) == null ? void 0 : _b2.role;
     return {
-      ...ctx || {},
-      isAdmin: ["admin", "owner"].includes((_b2 = (_a2 = ctx == null ? void 0 : ctx.session) == null ? void 0 : _a2.user) == null ? void 0 : _b2.role)
+      ...ctx,
+      isAdmin: ["admin", "owner"].includes(loginRole),
+      hasAnyPassport: (passports) => {
+        if (!passports || passports.length === 0) {
+          return true;
+        }
+        const passportsArr = Array.isArray(passports) ? passports : [passports];
+        return passportsArr.includes(loginRole);
+      }
     };
   };
   const isEqual = (a, b) => {
@@ -3273,27 +3281,18 @@ var __publicField = (obj, key, value) => {
   const AuthzContext = react.createContext({
     permissions: [],
     hasPermission: () => false,
-    hasRole: () => false,
-    isAdmin: false
+    isAdmin: false,
+    hasAnyPassport: () => false
   });
   const useAuthzContext = () => react.useContext(AuthzContext);
-  const AuthzProvider = ({ fetchPermissions, ...rest }) => {
-    var _a2, _b2, _c;
-    const { session } = useSessionContext();
-    const [permissions, setPermissions] = react.useState([]);
-    const permissionSet = react.useMemo(() => new Set(permissions), [permissions]);
-    react.useEffect(() => {
+  const AuthzProvider = ({ ...rest }) => {
+    var _a2;
+    const { session, isAdmin, hasAnyPassport } = useSessionContext();
+    const permissions = react.useMemo(() => {
       var _a3;
-      const initPermissions = async () => {
-        const perms = await fetchPermissions();
-        if (perms == null ? void 0 : perms.length) {
-          setPermissions(perms);
-        }
-      };
-      if ((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.role) {
-        initPermissions();
-      }
-    }, [(_a2 = session == null ? void 0 : session.user) == null ? void 0 : _a2.role]);
+      return ((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.permissions) || [];
+    }, [(_a2 = session == null ? void 0 : session.user) == null ? void 0 : _a2.permissions]);
+    const permissionSet = react.useMemo(() => new Set(permissions), [permissions]);
     const hasPermission = react.useCallback(
       (perms) => {
         if (!perms || perms.length === 0) {
@@ -3304,21 +3303,9 @@ var __publicField = (obj, key, value) => {
       },
       [permissionSet]
     );
-    const hasRole = react.useCallback(
-      (roles) => {
-        var _a3;
-        if (!roles || roles.length === 0) {
-          return true;
-        }
-        const rolesArr = Array.isArray(roles) ? roles : [roles];
-        return rolesArr.includes((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.role);
-      },
-      [(_b2 = session == null ? void 0 : session.user) == null ? void 0 : _b2.role]
-    );
-    const isAdmin = ["admin", "owner"].includes((_c = session == null ? void 0 : session.user) == null ? void 0 : _c.role);
     const value = react.useMemo(
-      () => ({ permissions, hasPermission, hasRole, isAdmin }),
-      [hasPermission, hasRole, permissions, isAdmin]
+      () => ({ permissions, hasPermission, isAdmin, hasAnyPassport }),
+      [hasPermission, permissions, isAdmin, hasAnyPassport]
     );
     return /* @__PURE__ */ jsxRuntime.jsx(AuthzContext.Provider, { ...rest, value });
   };
@@ -3330,11 +3317,11 @@ var __publicField = (obj, key, value) => {
     children
   }) {
     const { session } = useSessionContext();
-    const { hasPermission, hasRole } = useAuthzContext();
+    const { hasPermission, hasAnyPassport } = useAuthzContext();
     if (authenticated && !(session == null ? void 0 : session.user)) {
       return null;
     }
-    const permitted = hasPermission(permissions || "") && hasRole(roles || "") && (!check || check(session.user));
+    const permitted = hasPermission(permissions || "") && hasAnyPassport(roles || "") && (!check || check(session.user));
     if (permitted) {
       return children;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit-ux",
-  "version": "1.6.182",
+  "version": "1.6.183",
   "files": [
     "dist"
   ],
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@arcblock/ws": "^1.18.113",
-    "@blocklet/editor": "1.6.182",
-    "@blocklet/labels": "1.6.182",
+    "@blocklet/editor": "1.6.183",
+    "@blocklet/labels": "1.6.183",
     "@blocklet/uploader": "^0.0.75",
     "@emotion/css": "^11.10.5",
     "@emotion/react": "^11.10.5",
@@ -94,5 +94,5 @@
   "resolutions": {
     "react": "^18.2.0"
   },
-  "gitHead": "77622b088302b4a4251b9f3479c1d1b8c1fee9ce"
+  "gitHead": "59597449f4d3d4373b598fcf9e80bdc7eb9c098c"
 }