From d051bc2fdaa40e2e531fb11c60e5667a63cb7e38 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Wed, 11 Aug 2021 12:16:59 -0600
Subject: [PATCH] Minor cleanup

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 docs/auth/identity-resolver.md                        |  2 +-
 .../src/lib/catalog/CatalogIdentityClient.ts          | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/auth/identity-resolver.md b/docs/auth/identity-resolver.md
index e772832c1e..7ec6ec7117 100644
--- a/docs/auth/identity-resolver.md
+++ b/docs/auth/identity-resolver.md
@@ -139,7 +139,7 @@ export default async function createPlugin({
               logger: ctx.logger,
             });
             const token = await ctx.tokenIssuer.issueToken({
-              claims: { sub: id, fullEnt },
+              claims: { sub, ent: fullEnt },
             });
             return { sub, token };
           },
diff --git a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
index 6e8494f805..02fe9818cb 100644
--- a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
+++ b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
@@ -88,8 +88,7 @@ export class CatalogIdentityClient {
     entityRefs,
     logger,
   }: MemberClaimQuery): Promise<string[]> {
-    let resolvedEntityRefs: Array<EntityName> = [];
-    resolvedEntityRefs = entityRefs
+    const resolvedEntityRefs = entityRefs
       .map((ref: string) => {
         try {
           const parsedRef = parseEntityRef(ref.toLocaleLowerCase('en-US'), {
@@ -98,7 +97,7 @@ export class CatalogIdentityClient {
           });
           return parsedRef;
         } catch {
-          logger?.debug(`Failed to parse entityRef from ${ref}, ignoring`);
+          logger?.warn(`Failed to parse entityRef from ${ref}, ignoring`);
           return null;
         }
       })
@@ -128,9 +127,9 @@ export class CatalogIdentityClient {
           .map(r => r.target) ?? [],
     );
 
-    const newEntityRefs = [...new Set(resolvedEntityRefs.concat(memberOf))].map(
-      stringifyEntityRef,
-    );
+    const newEntityRefs = [
+      ...new Set(resolvedEntityRefs.concat(memberOf).map(stringifyEntityRef)),
+    ];
 
     logger?.debug(`Found catalog membership: ${newEntityRefs.join()}`);
     return newEntityRefs;