matt code review changes

Author: jordanh

packages/server/graphql/public/mutations/deleteOAuthAPIProvider.ts

@@ -4,17 +4,13 @@ import getKysely from '../../../postgres/getKysely'
 import {getUserId, isUserOrgAdmin} from '../../../utils/authorization'
 import {CipherId} from '../../../utils/CipherId'
 import publish from '../../../utils/publish'
-import {GQLContext} from '../../graphql'
+import type {MutationResolvers} from '../resolverTypes'
 
-interface DeleteOAuthAPIProviderInput {
-  providerId: string
-}
-
-export default async function deleteOAuthAPIProvider(
-  _root: any,
-  {input}: {input: DeleteOAuthAPIProviderInput},
-  context: GQLContext
-) {
+const deleteOAuthAPIProvider: MutationResolvers['deleteOAuthAPIProvider'] = async (
+  _root,
+  {input},
+  context
+) => {
   const [providerId] = CipherId.fromClient(input.providerId)
   const {authToken, dataLoader, socketId} = context
   const viewerId = getUserId(authToken)
@@ -54,3 +50,5 @@ export default async function deleteOAuthAPIProvider(
 
   return {success: true, deletedProviderId: input.providerId}
 }
+
+export default deleteOAuthAPIProvider

packages/server/graphql/public/mutations/regenerateOAuthAPIProviderSecret.ts

@@ -3,52 +3,47 @@ import {generateOAuthClientSecret} from '../../../oauth2/credentials'
 import getKysely from '../../../postgres/getKysely'
 import {getUserId, isUserOrgAdmin} from '../../../utils/authorization'
 import {CipherId} from '../../../utils/CipherId'
-import {GQLContext} from '../../graphql'
-
-interface RegenerateOAuthAPIProviderSecretInput {
-  providerId: string
-}
-
-export default async function regenerateOAuthAPIProviderSecret(
-  _root: any,
-  {input}: {input: RegenerateOAuthAPIProviderSecretInput},
-  context: GQLContext
-) {
-  const [providerId] = CipherId.fromClient(input.providerId)
-  const {authToken, dataLoader} = context
-  const viewerId = getUserId(authToken)
-
-  const pg = getKysely()
-
-  const provider = await pg
-    .selectFrom('OAuthAPIProvider')
-    .select('orgId')
-    .where('id', '=', providerId)
-    .executeTakeFirst()
-
-  if (!provider) {
-    throw new GraphQLError('Provider not found')
+import type {MutationResolvers} from '../resolverTypes'
+
+const regenerateOAuthAPIProviderSecret: MutationResolvers['regenerateOAuthAPIProviderSecret'] =
+  async (_root, {input}, context) => {
+    const [providerId] = CipherId.fromClient(input.providerId)
+    const {authToken, dataLoader} = context
+    const viewerId = getUserId(authToken)
+
+    const pg = getKysely()
+
+    const provider = await pg
+      .selectFrom('OAuthAPIProvider')
+      .select('orgId')
+      .where('id', '=', providerId)
+      .executeTakeFirst()
+
+    if (!provider) {
+      throw new GraphQLError('Provider not found')
+    }
+
+    if (!(await isUserOrgAdmin(viewerId, provider.orgId, dataLoader))) {
+      throw new GraphQLError('Not organization lead', {
+        extensions: {
+          code: 'FORBIDDEN',
+          userId: viewerId
+        }
+      })
+    }
+
+    const newSecret = generateOAuthClientSecret()
+
+    const updatedProvider = await pg
+      .updateTable('OAuthAPIProvider')
+      .set({
+        clientSecret: newSecret
+      })
+      .where('id', '=', providerId)
+      .returningAll()
+      .executeTakeFirstOrThrow()
+
+    return {clientSecret: newSecret, clientId: updatedProvider.clientId, provider: updatedProvider}
   }
 
-  if (!(await isUserOrgAdmin(viewerId, provider.orgId, dataLoader))) {
-    throw new GraphQLError('Not organization lead', {
-      extensions: {
-        code: 'FORBIDDEN',
-        userId: viewerId
-      }
-    })
-  }
-
-  const newSecret = generateOAuthClientSecret()
-
-  const updatedProvider = await pg
-    .updateTable('OAuthAPIProvider')
-    .set({
-      clientSecret: newSecret
-    })
-    .where('id', '=', providerId)
-    .returningAll()
-    .executeTakeFirst()
-
-  return {clientSecret: newSecret, clientId: updatedProvider!.clientId, provider: updatedProvider}
-}
+export default regenerateOAuthAPIProviderSecret