fix: authInfo destructure (#7) (opensearch-project#296)

* fix: authInfo destructure * fix: unit test error --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
SuZhou-Joe · Mar 15, 2024 · f7009e6 · f7009e6
1 parent 0cef35d
commit f7009e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/plugins/workspace/server/utils.test.ts b/src/plugins/workspace/server/utils.test.ts
@@ -27,8 +27,10 @@ describe('workspace utils', () => {
     mockAuth.get.mockReturnValueOnce({
       status: AuthStatus.unknown,
       state: {
-        user_name: 'bar',
-        backend_roles: ['foo'],
+        authInfo: {
+          user_name: 'bar',
+          backend_roles: ['foo'],
+        },
       },
     });
     const result = getPrincipalsFromRequest(mockRequest, mockAuth);
@@ -40,8 +42,10 @@ describe('workspace utils', () => {
     mockAuth.get.mockReturnValueOnce({
       status: AuthStatus.authenticated,
       state: {
-        user_name: 'bar',
-        backend_roles: ['foo'],
+        authInfo: {
+          user_name: 'bar',
+          backend_roles: ['foo'],
+        },
       },
     });
     const result = getPrincipalsFromRequest(mockRequest, mockAuth);

diff --git a/src/plugins/workspace/server/utils.ts b/src/plugins/workspace/server/utils.ts
@@ -34,12 +34,12 @@ export const getPrincipalsFromRequest = (
   }
 
   if (authInfoResp?.status === AuthStatus.authenticated) {
-    const authInfo = authInfoResp?.state as AuthInfo | null;
-    if (authInfo?.backend_roles) {
-      payload[PrincipalType.Groups] = authInfo.backend_roles;
+    const authInfo = authInfoResp?.state as { authInfo: AuthInfo } | null;
+    if (authInfo?.authInfo?.backend_roles) {
+      payload[PrincipalType.Groups] = authInfo.authInfo.backend_roles;
     }
-    if (authInfo?.user_name) {
-      payload[PrincipalType.Users] = [authInfo.user_name];
+    if (authInfo?.authInfo?.user_name) {
+      payload[PrincipalType.Users] = [authInfo.authInfo.user_name];
     }
     return payload;
   }