refactor(get-app-authentication): allow undefined as value for timeDi…

…fference parameter
octokit · Sep 24, 2024 · 5433408 · 5433408
1 parent fd67b16
commit 5433408
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/src/get-app-authentication.ts b/src/get-app-authentication.ts
@@ -7,19 +7,21 @@ export async function getAppAuthentication({
   privateKey,
   timeDifference,
 }: State & {
-  timeDifference?: number;
+  timeDifference?: number | undefined;
 }): Promise<AppAuthentication> {
   try {
-    const appAuthentication = timeDifference
-      ? await githubAppJwt({
-          id: appId,
-          privateKey,
-          now: timeDifference && Math.floor(Date.now() / 1000) + timeDifference,
-        })
-      : await githubAppJwt({
-          id: appId,
-          privateKey,
-        });
+    const authOptions = {
+      id: appId,
+      privateKey,
+    };
+
+    if (timeDifference) {
+      Object.assign(authOptions, {
+        now: Math.floor(Date.now() / 1000) + timeDifference,
+      });
+    }
+
+    const appAuthentication = await githubAppJwt(authOptions);
 
     return {
       type: "app",

diff --git a/src/get-installation-authentication.ts b/src/get-installation-authentication.ts
@@ -40,6 +40,7 @@ export async function getInstallationAuthentication(
       state.cache,
       optionsWithInstallationTokenFromState,
     );
+
     if (result) {
       const {
         token,
@@ -52,7 +53,7 @@ export async function getInstallationAuthentication(
         repositorySelection,
       } = result;
 
-      const authParams = {
+      return toTokenAuthentication({
         installationId,
         token,
         createdAt,
@@ -61,15 +62,8 @@ export async function getInstallationAuthentication(
         repositorySelection,
         repositoryIds,
         repositoryNames,
-      };
-
-      if (singleFileName) {
-        Object.assign(authParams, {
-          singleFileName,
-        });
-      }
-
-      return toTokenAuthentication(authParams);
+        singleFileName,
+      });
     }
   }
 

diff --git a/src/types.ts b/src/types.ts
@@ -162,9 +162,9 @@ export type InstallationAccessTokenData = {
   expiresAt: UTC_TIMESTAMP;
   permissions: Permissions;
   repositorySelection: REPOSITORY_SELECTION;
-  repositoryIds: number[] | undefined;
-  repositoryNames: string[] | undefined;
-  singleFileName?: string;
+  repositoryIds?: number[] | undefined;
+  repositoryNames?: string[] | undefined;
+  singleFileName?: string | undefined;
 };
 
 export type CacheData = InstallationAccessTokenData;