From 971ac26033b77e4dfd0a6d427df56f27bd0697f3 Mon Sep 17 00:00:00 2001
From: Tuan Dang <tony@infisical.com>
Date: Tue, 7 Mar 2023 15:23:10 +0700
Subject: [PATCH] Fix lint errors

---
 backend/src/middleware/requireAuth.ts                     | 2 +-
 frontend/src/hooks/api/serviceTokens/types.ts             | 2 +-
 .../Settings/ProjectSettingsPage/ProjectSettingsPage.tsx  | 7 +++++--
 .../ServiceTokenSection/ServiceTokenSection.tsx           | 8 +-------
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/backend/src/middleware/requireAuth.ts b/backend/src/middleware/requireAuth.ts
index 89c181e41..f4921398a 100644
--- a/backend/src/middleware/requireAuth.ts
+++ b/backend/src/middleware/requireAuth.ts
@@ -42,7 +42,7 @@ const requireAuth = ({
 		});
 
 		// attach auth payloads
-		let serviceTokenData;
+		let serviceTokenData: any;
 		switch (authTokenType) {
 			case 'serviceToken':
 				serviceTokenData = await getAuthSTDPayload({
diff --git a/frontend/src/hooks/api/serviceTokens/types.ts b/frontend/src/hooks/api/serviceTokens/types.ts
index ce20f1b8b..83bad9db6 100644
--- a/frontend/src/hooks/api/serviceTokens/types.ts
+++ b/frontend/src/hooks/api/serviceTokens/types.ts
@@ -19,7 +19,7 @@ export type CreateServiceTokenDTO = {
   iv: string;
   tag: string;
   randomBytes: string;
-  permissions: ('read' | 'write')[];
+  permissions: string[];
 };
 
 export type CreateServiceTokenRes = {
diff --git a/frontend/src/views/Settings/ProjectSettingsPage/ProjectSettingsPage.tsx b/frontend/src/views/Settings/ProjectSettingsPage/ProjectSettingsPage.tsx
index 7b97f6feb..af812c6aa 100644
--- a/frontend/src/views/Settings/ProjectSettingsPage/ProjectSettingsPage.tsx
+++ b/frontend/src/views/Settings/ProjectSettingsPage/ProjectSettingsPage.tsx
@@ -219,7 +219,7 @@ export const ProjectSettingsPage = () => {
         plaintext: key,
         key: randomBytes
       });
-
+      
       const res = await createServiceToken.mutateAsync({
         encryptedKey: ciphertext,
         iv,
@@ -229,8 +229,11 @@ export const ProjectSettingsPage = () => {
         name,
         workspaceId: workspaceID,
         randomBytes,
-        permissions
+        permissions: Object.entries(permissions)
+        .filter(([, permissionsValue]) => permissionsValue)
+        .map(([permissionsKey]) => permissionsKey)
       });
+      
       createNotification({
         text: 'Successfully created a service token',
         type: 'success'
diff --git a/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenSection.tsx b/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenSection.tsx
index 498cd7d5d..38528020e 100644
--- a/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenSection.tsx
+++ b/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenSection.tsx
@@ -105,13 +105,7 @@ export const ServiceTokenSection = ({
   const hasServiceToken = Boolean(newToken);
 
   const onFormSubmit = async (data: CreateServiceToken) => {
-    // transform permissions object into array
-    const dataWithPermissionsArray = data;
-    dataWithPermissionsArray.permissions = Object.entries(data.permissions)
-      .filter(([, value]) => value)
-      .map(([key]) => key);
-
-    const token = await onCreateToken(dataWithPermissionsArray);
+    const token = await onCreateToken(data);
     setToken(token);
   };