diff --git a/packages/catalog-model/examples/acme/team-a-group.yaml b/packages/catalog-model/examples/acme/team-a-group.yaml index dacc4c6c3c..8dbf0bb839 100644 --- a/packages/catalog-model/examples/acme/team-a-group.yaml +++ b/packages/catalog-model/examples/acme/team-a-group.yaml @@ -42,3 +42,17 @@ spec: email: nigel-manning@example.com picture: https://example.com/staff/nigel.jpeg memberOf: [team-a] +--- +# This user is added as an example, to make it more easy for the "Guest" +# sign-in option to demonstrate some entities being owned. In a regular org, +# a guest user would probably not be registered like this. +apiVersion: backstage.io/v1alpha1 +kind: User +metadata: + name: guest +spec: + profile: + displayName: Guest User + email: guest@example.com + picture: https://example.com/staff/the-ceos-dog.jpeg + memberOf: [team-a] diff --git a/packages/catalog-model/examples/apis/hello-world-api.yaml b/packages/catalog-model/examples/apis/hello-world-api.yaml index 659c48adfb..0f9786329f 100644 --- a/packages/catalog-model/examples/apis/hello-world-api.yaml +++ b/packages/catalog-model/examples/apis/hello-world-api.yaml @@ -6,7 +6,7 @@ metadata: spec: type: grpc lifecycle: deprecated - owner: grpc@example.com + owner: team-c definition: | // Copyright 2015 gRPC authors. // diff --git a/packages/catalog-model/examples/apis/petstore-api.yaml b/packages/catalog-model/examples/apis/petstore-api.yaml index c8ce576cce..a314b4e255 100644 --- a/packages/catalog-model/examples/apis/petstore-api.yaml +++ b/packages/catalog-model/examples/apis/petstore-api.yaml @@ -9,7 +9,7 @@ metadata: spec: type: openapi lifecycle: experimental - owner: pets@example.com + owner: team-c definition: | openapi: "3.0.0" info: diff --git a/packages/catalog-model/examples/apis/spotify-api.yaml b/packages/catalog-model/examples/apis/spotify-api.yaml index 14deb17abe..0b8e80b86e 100644 --- a/packages/catalog-model/examples/apis/spotify-api.yaml +++ b/packages/catalog-model/examples/apis/spotify-api.yaml @@ -12,6 +12,6 @@ metadata: spec: type: openapi lifecycle: production - owner: spotify@example.com + owner: team-a definition: $text: https://github.com/APIs-guru/openapi-directory/blob/master/APIs/spotify.com/v1/swagger.yaml diff --git a/packages/catalog-model/examples/apis/streetlights-api.yaml b/packages/catalog-model/examples/apis/streetlights-api.yaml index d53b05fc2d..725811d0cc 100644 --- a/packages/catalog-model/examples/apis/streetlights-api.yaml +++ b/packages/catalog-model/examples/apis/streetlights-api.yaml @@ -8,7 +8,7 @@ metadata: spec: type: asyncapi lifecycle: production - owner: streetlights@example.com + owner: team-c definition: | asyncapi: 2.0.0 info: diff --git a/packages/catalog-model/examples/apis/swapi-graphql.yaml b/packages/catalog-model/examples/apis/swapi-graphql.yaml index bc5e8e60ac..0c1f7af5a4 100644 --- a/packages/catalog-model/examples/apis/swapi-graphql.yaml +++ b/packages/catalog-model/examples/apis/swapi-graphql.yaml @@ -6,7 +6,7 @@ metadata: spec: type: graphql lifecycle: production - owner: yoda@dagobah.space + owner: team-b definition: | schema { query: Root diff --git a/packages/catalog-model/examples/components/artist-lookup-component.yaml b/packages/catalog-model/examples/components/artist-lookup-component.yaml index 79dd3bccf6..257344be3d 100644 --- a/packages/catalog-model/examples/components/artist-lookup-component.yaml +++ b/packages/catalog-model/examples/components/artist-lookup-component.yaml @@ -9,4 +9,4 @@ metadata: spec: type: service lifecycle: experimental - owner: artists@example.com + owner: team-a diff --git a/packages/catalog-model/examples/components/petstore-component.yaml b/packages/catalog-model/examples/components/petstore-component.yaml index 7e2093ad09..e6dd56c274 100644 --- a/packages/catalog-model/examples/components/petstore-component.yaml +++ b/packages/catalog-model/examples/components/petstore-component.yaml @@ -6,7 +6,7 @@ metadata: spec: type: service lifecycle: experimental - owner: pets@example.com + owner: team-c implementsApis: - petstore - streetlights diff --git a/packages/catalog-model/examples/components/playback-lib-component.yaml b/packages/catalog-model/examples/components/playback-lib-component.yaml index c32332d4d2..f7d7670b5d 100644 --- a/packages/catalog-model/examples/components/playback-lib-component.yaml +++ b/packages/catalog-model/examples/components/playback-lib-component.yaml @@ -6,4 +6,4 @@ metadata: spec: type: library lifecycle: experimental - owner: players@example.com + owner: team-c diff --git a/packages/catalog-model/examples/components/playback-order-component.yaml b/packages/catalog-model/examples/components/playback-order-component.yaml index 3e46953928..c4f41b2b58 100644 --- a/packages/catalog-model/examples/components/playback-order-component.yaml +++ b/packages/catalog-model/examples/components/playback-order-component.yaml @@ -9,4 +9,4 @@ metadata: spec: type: service lifecycle: production - owner: guest + owner: user:guest diff --git a/packages/catalog-model/examples/components/podcast-api-component.yaml b/packages/catalog-model/examples/components/podcast-api-component.yaml index c1b1c9281c..b89ff48c48 100644 --- a/packages/catalog-model/examples/components/podcast-api-component.yaml +++ b/packages/catalog-model/examples/components/podcast-api-component.yaml @@ -8,4 +8,4 @@ metadata: spec: type: service lifecycle: experimental - owner: players@example.com + owner: team-b diff --git a/packages/catalog-model/examples/components/queue-proxy-component.yaml b/packages/catalog-model/examples/components/queue-proxy-component.yaml index c9b130db52..7f7fcbd527 100644 --- a/packages/catalog-model/examples/components/queue-proxy-component.yaml +++ b/packages/catalog-model/examples/components/queue-proxy-component.yaml @@ -9,4 +9,4 @@ metadata: spec: type: website lifecycle: production - owner: tools@example.com + owner: team-b diff --git a/packages/catalog-model/examples/components/searcher-component.yaml b/packages/catalog-model/examples/components/searcher-component.yaml index 042fcb24a9..77150c96f0 100644 --- a/packages/catalog-model/examples/components/searcher-component.yaml +++ b/packages/catalog-model/examples/components/searcher-component.yaml @@ -8,4 +8,4 @@ metadata: spec: type: service lifecycle: production - owner: guest + owner: user:guest diff --git a/packages/catalog-model/examples/components/shuffle-api-component.yaml b/packages/catalog-model/examples/components/shuffle-api-component.yaml index 1f9de46d4e..1c2da03511 100644 --- a/packages/catalog-model/examples/components/shuffle-api-component.yaml +++ b/packages/catalog-model/examples/components/shuffle-api-component.yaml @@ -8,4 +8,4 @@ metadata: spec: type: service lifecycle: production - owner: guest + owner: user:guest diff --git a/packages/catalog-model/examples/components/www-artist-component.yaml b/packages/catalog-model/examples/components/www-artist-component.yaml index 84379c93fc..c333eb8c09 100644 --- a/packages/catalog-model/examples/components/www-artist-component.yaml +++ b/packages/catalog-model/examples/components/www-artist-component.yaml @@ -6,4 +6,4 @@ metadata: spec: type: website lifecycle: production - owner: artists@example.com + owner: team-a diff --git a/plugins/catalog/src/components/useOwnUser.ts b/plugins/catalog/src/components/useOwnUser.ts index a74b60481e..9aa4bda99c 100644 --- a/plugins/catalog/src/components/useOwnUser.ts +++ b/plugins/catalog/src/components/useOwnUser.ts @@ -21,20 +21,21 @@ import { identityApiRef, useApi } from '@backstage/core'; import { catalogApiRef } from '../plugin'; /** - * Get the group memberships of the logged-in user. + * Get the catalog User entity (if any) that matches the logged-in user. */ -export function useOwnUser(): AsyncState { +export function useOwnUser(): AsyncState { const catalogApi = useApi(catalogApiRef); const identityApi = useApi(identityApiRef); - // TODO: get the full entity (or at least the full entity name) from the identityApi + // TODO: get the full entity (or at least the full entity name) from the + // identityApi return useAsync( () => catalogApi.getEntityByName({ kind: 'User', namespace: 'default', name: identityApi.getUserId(), - }) as Promise, + }) as Promise, [catalogApi, identityApi], ); }