Release (patch) - ExtForeignKey in Controls Dialogue, Credentials Gen…

…eration Issue Fix (#191)

* Use extForeignKey for value in controls dialog

* removed assertion that fails when user is not found in portal but holds permissions or scopes to the portal

* Created a new query to fetch list of users with usernames and retained assert check in lookupUserByUsername

Co-authored-by: Joshua Jones <[email protected]>
Co-authored-by: ikethecoder <[email protected]>

src/lists/extensions/Namespace.ts

@@ -8,10 +8,9 @@ import {
 } from '../../services/uma2';
 import {
   lookupProductEnvironmentServicesBySlug,
-  lookupUserByUsername,
+  lookupUsersByUsernames,
 } from '../../services/keystone';
 import {
-  getSuitableOwnerToken,
   getEnvironmentContext,
   getResourceSets,
   getNamespaceResourceSets,
@@ -28,7 +27,6 @@ import { Logger } from '../../logger';
 const logger = Logger('ext.Namespace');
 
 import { strict as assert } from 'assert';
-import { User } from '@/services/keystone/types';
 
 const typeUserContact = `
   type UserContact {
@@ -219,22 +217,11 @@ module.exports = {
                 });
                 permissions = updatedPermissions;
               }
-              const listOfUsers: Array<any> = [];
-              for (const perm of permissions) {
-                if (perm.granted) {
-                  const user = await lookupUserByUsername(
-                    noauthContext,
-                    perm.requesterName
-                  );
-                  listOfUsers.push({
-                    id: user[0].id,
-                    name: user[0].name,
-                    username: user[0].username,
-                    email: user[0].email,
-                  });
-                }
-              }
-              return listOfUsers;
+              const usernameList = permissions
+                .filter((p) => p.granted)
+                .map((p) => p.requesterName);
+
+              return await lookupUsersByUsernames(noauthContext, usernameList);
             },
             access: EnforcementPoint,
           },

src/nextapp/components/controls/rate-limiting.tsx

@@ -124,8 +124,8 @@ const RateLimiting: React.FC<RateLimitingProps> = ({
       title="Rate Limiting"
     >
       <ControlTypeSelect
-        serviceId={data?.service?.id}
-        routeId={data?.route?.id}
+        serviceId={data?.service?.extForeignKey}
+        routeId={data?.route?.extForeignKey}
       />
       <HStack spacing={4} mb={4}>
         <FormControl id="second">

src/nextapp/pages/manager/consumers/[id].tsx

@@ -171,10 +171,12 @@ const query = gql`
         service {
           id
           name
+          extForeignKey
         }
         route {
           id
           name
+          extForeignKey
         }
       }
       tags

src/services/keystone/index.ts

@@ -44,6 +44,7 @@ export {
   updateUserLegalAccept,
   LegalAgreed,
   lookupUserByUsername,
+  lookupUsersByUsernames,
   lookupUser,
   lookupUsersByNamespace,
 } from './user';

src/services/keystone/user.ts

@@ -87,6 +87,25 @@ export async function lookupUserByUsername(
   return result.data.allUsers;
 }
 
+export async function lookupUsersByUsernames(
+  context: any,
+  usernameList: string[]
+): Promise<[User]> {
+  const result = await context.executeGraphQL({
+    query: `query GetUsersWithUsernames($usernames: [String!]!) {
+                    allUsers(where: {username_in: $usernames}) {
+                        id
+                        name
+                        username
+                        email
+                    }
+                }`,
+    variables: { usernames: usernameList },
+  });
+  logger.debug('Query [lookupUsersByUsernames] result %j', result);
+  return result.data.allUsers;
+}
+
 export async function lookupUser(context: any, id: string): Promise<[User]> {
   const result = await context.executeGraphQL({
     query: `query FetchUser($id: ID!) {

src/test/mock-server/server.js

@@ -316,6 +316,7 @@ const server = mockServer(schemaWithMocks, {
     name: casual.route,
     namespace: casual.namespace,
     kongRouteId: casual.uuid,
+    extForeignKey: casual.uuid,
     methods: JSON.stringify([
       casual.random_element(['GET', 'POST', 'PUT', 'DELETE']),
     ]),