@backstage/plugin-catalog-react 0.6.11 → 0.6.12-next.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-react
 
+## 0.6.12-next.0
+
+### Patch Changes
+
+- 2916a83b9c: Deprecated `loadIdentityOwnerRefs`, since they can now be retrieved as `ownershipEntityRefs` from `identityApi.getBackstageIdentity()` instead.
+- 51fbedc445: Migrated usage of deprecated `IdentityApi` methods.
+- Updated dependencies
+  - @backstage/core-components@0.8.5-next.0
+  - @backstage/core-plugin-api@0.6.0-next.0
+  - @backstage/catalog-model@0.9.10-next.0
+  - @backstage/catalog-client@0.5.5-next.0
+  - @backstage/integration@0.7.2-next.0
+
 ## 0.6.11
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -21,7 +21,6 @@ var isEqual = require('lodash/isEqual');
 var coreComponents = require('@backstage/core-components');
 var core = require('@material-ui/core');
 var useObservable = require('react-use/lib/useObservable');
-var jwtDecoder = require('jwt-decode');
 var CheckBoxIcon = require('@material-ui/icons/CheckBox');
 var CheckBoxOutlineBlankIcon = require('@material-ui/icons/CheckBoxOutlineBlank');
 var ExpandMoreIcon = require('@material-ui/icons/ExpandMore');
@@ -46,7 +45,6 @@ var useMountedState__default = /*#__PURE__*/_interopDefaultLegacy(useMountedStat
 var useAsync__default = /*#__PURE__*/_interopDefaultLegacy(useAsync);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var useObservable__default = /*#__PURE__*/_interopDefaultLegacy(useObservable);
-var jwtDecoder__default = /*#__PURE__*/_interopDefaultLegacy(jwtDecoder);
 var CheckBoxIcon__default = /*#__PURE__*/_interopDefaultLegacy(CheckBoxIcon);
 var CheckBoxOutlineBlankIcon__default = /*#__PURE__*/_interopDefaultLegacy(CheckBoxOutlineBlankIcon);
 var ExpandMoreIcon__default = /*#__PURE__*/_interopDefaultLegacy(ExpandMoreIcon);
@@ -624,11 +622,13 @@ function useEntityKinds() {
 function useOwnUser() {
   const catalogApi = corePluginApi.useApi(catalogApiRef);
   const identityApi = corePluginApi.useApi(corePluginApi.identityApiRef);
-  return useAsync__default["default"](() => catalogApi.getEntityByName({
-    kind: "User",
-    namespace: "default",
-    name: identityApi.getUserId()
-  }), [catalogApi, identityApi]);
+  return useAsync__default["default"](async () => {
+    const identity = await identityApi.getBackstageIdentity();
+    return catalogApi.getEntityByName(catalogModel.parseEntityRef(identity.userEntityRef, {
+      defaultKind: "User",
+      defaultNamespace: catalogModel.ENTITY_DEFAULT_NAMESPACE
+    }));
+  }, [catalogApi, identityApi]);
 }
 
 const BATCH_SIZE = 20;
@@ -712,34 +712,9 @@ function useStarredEntity(entityOrRef) {
   };
 }
 
-function extendUserId(id) {
-  try {
-    const ref = catalogModel.parseEntityRef(id, {
-      defaultKind: "User",
-      defaultNamespace: "default"
-    });
-    return catalogModel.stringifyEntityRef(ref);
-  } catch {
-    return id;
-  }
-}
 async function loadIdentityOwnerRefs(identityApi) {
-  const id = identityApi.getUserId();
-  const token = await identityApi.getIdToken();
-  const result = [];
-  if (id) {
-    result.push(extendUserId(id));
-  }
-  if (token) {
-    try {
-      const decoded = jwtDecoder__default["default"](token);
-      if (decoded == null ? void 0 : decoded.ent) {
-        [decoded.ent].flat().filter((x) => typeof x === "string").map((x) => x.toLocaleLowerCase("en-US")).forEach((x) => result.push(x));
-      }
-    } catch {
-    }
-  }
-  return result;
+  const identity = await identityApi.getBackstageIdentity();
+  return identity.ownershipEntityRefs;
 }
 async function loadCatalogOwnerRefs(catalogApi, identityOwnerRefs) {
   const result = new Array();
@@ -761,9 +736,9 @@ function useEntityOwnership() {
   const identityApi = corePluginApi.useApi(corePluginApi.identityApiRef);
   const catalogApi = corePluginApi.useApi(catalogApiRef);
   const { loading, value: refs } = useAsync__default["default"](async () => {
-    const identityRefs = await loadIdentityOwnerRefs(identityApi);
-    const catalogRefs = await loadCatalogOwnerRefs(catalogApi, identityRefs);
-    return /* @__PURE__ */ new Set([...identityRefs, ...catalogRefs]);
+    const { ownershipEntityRefs } = await identityApi.getBackstageIdentity();
+    const catalogRefs = await loadCatalogOwnerRefs(catalogApi, ownershipEntityRefs);
+    return /* @__PURE__ */ new Set([...ownershipEntityRefs, ...catalogRefs]);
   }, []);
   const isOwnedEntity = React.useMemo(() => {
     const myOwnerRefs = new Set(refs != null ? refs : []);