auth-node,auth-backend: remove deprecated identity result fields

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

plugins/auth-node/api-report.md

@@ -3,7 +3,6 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { Entity } from '@backstage/catalog-model';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 
 // @public
@@ -13,10 +12,6 @@ export interface BackstageIdentityResponse extends BackstageSignInResult {
 
 // @public
 export interface BackstageSignInResult {
-  // @deprecated
-  entity?: Entity;
-  // @deprecated
-  id: string;
   token: string;
 }
 

plugins/auth-node/package.json

@@ -24,7 +24,6 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.13.1",
-    "@backstage/catalog-model": "^1.0.0",
     "@backstage/config": "^1.0.0",
     "@backstage/errors": "^1.0.0",
     "jose": "^1.27.1",

plugins/auth-node/src/IdentityClient.test.ts

@@ -135,12 +135,11 @@ describe('IdentityClient', () => {
       const token = await factory.issueToken({ claims: { sub: 'foo' } });
       const response = await client.authenticate(token);
       expect(response).toEqual({
-        id: 'foo',
         token: token,
         identity: {
-          ownershipEntityRefs: [],
           type: 'user',
           userEntityRef: 'foo',
+          ownershipEntityRefs: [],
         },
       });
     });
@@ -202,12 +201,11 @@ describe('IdentityClient', () => {
       const token = await factory.issueToken({ claims: { sub: 'foo' } });
       const response = await client.authenticate(token);
       expect(response).toEqual({
-        id: 'foo',
         token: token,
         identity: {
-          ownershipEntityRefs: [],
           type: 'user',
           userEntityRef: 'foo',
+          ownershipEntityRefs: [],
         },
       });
     });

plugins/auth-node/src/IdentityClient.ts

@@ -87,7 +87,6 @@ export class IdentityClient {
     }
 
     const user: BackstageIdentityResponse = {
-      id: decoded.sub,
       token,
       identity: {
         type: 'user',

plugins/auth-node/src/types.ts

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import { Entity } from '@backstage/catalog-model';
-
 /**
  * A representation of a successful Backstage sign-in.
  *
@@ -25,25 +23,6 @@ import { Entity } from '@backstage/catalog-model';
  * @public
  */
 export interface BackstageSignInResult {
-  /**
-   * An opaque ID that uniquely identifies the user within Backstage.
-   *
-   * This is typically the same as the user entity `metadata.name`.
-   *
-   * @deprecated Use the `identity` field instead
-   */
-  id: string;
-
-  /**
-   * The entity that the user is represented by within Backstage.
-   *
-   * This entity may or may not exist within the Catalog, and it can be used
-   * to read and store additional metadata about the user.
-   *
-   * @deprecated Use the `identity` field instead.
-   */
-  entity?: Entity;
-
   /**
    * The token used to authenticate the user within Backstage.
    */