refactor: Rename fine-grained permission functions for clarity and co…

…nsistency
mamertofabian · Jan 22, 2025 · fe7efc6 · fe7efc6
1 parent 8bc8ead
commit fe7efc6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/src/lib/components/GitHubSettings.svelte b/src/lib/components/GitHubSettings.svelte
@@ -204,7 +204,7 @@
     }
   }
 
-  async function checkFineGrainedPermissions() {
+  async function checkTokenPermissions() {
     if (!githubToken || isCheckingPermissions) return;
 
     isCheckingPermissions = true;
@@ -218,7 +218,7 @@
     try {
       const githubService = new GitHubService(githubToken);
 
-      const result = await githubService.verifyFineGrainedPermissions(
+      const result = await githubService.verifyTokenPermissions(
         repoOwner,
         ({ permission, isValid }) => {
           currentCheck = permission;
@@ -264,18 +264,16 @@
   const handleSave = async (event: Event) => {
     event.preventDefault();
 
-    if (tokenType === 'fine-grained') {
-      const THIRTY_DAYS = 30 * 24 * 60 * 60 * 1000;
-      const needsCheck =
-        previousToken !== githubToken ||
-        !lastPermissionCheck ||
-        Date.now() - lastPermissionCheck > THIRTY_DAYS;
-
-      if (needsCheck) {
-        await checkFineGrainedPermissions();
-        if (permissionError) {
-          return; // Don't proceed if permissions check failed
-        }
+    const THIRTY_DAYS = 30 * 24 * 60 * 60 * 1000;
+    const needsCheck =
+      previousToken !== githubToken ||
+      !lastPermissionCheck ||
+      Date.now() - lastPermissionCheck > THIRTY_DAYS;
+
+    if (needsCheck) {
+      await checkTokenPermissions();
+      if (permissionError) {
+        return; // Don't proceed if permissions check failed
       }
     }
 
@@ -329,14 +327,14 @@
           <p class="text-sm text-emerald-400">
             {tokenType === 'classic' ? '🔑 Classic' : '✨ Fine-grained'} token detected
           </p>
-          {#if tokenType === 'fine-grained' && isTokenValid}
+          {#if isTokenValid}
             <div class="flex items-center gap-2">
               <Button
                 type="button"
                 variant="outline"
                 size="sm"
                 class="text-xs"
-                on:click={checkFineGrainedPermissions}
+                on:click={checkTokenPermissions}
                 disabled={isCheckingPermissions}
               >
                 {#if isCheckingPermissions}

diff --git a/src/services/GitHubService.ts b/src/services/GitHubService.ts
@@ -52,11 +52,11 @@ export class GitHubService extends BaseGitHubService {
     return this.tokenValidator.validateTokenAndUser(username);
   }
 
-  async verifyFineGrainedPermissions(
+  async verifyTokenPermissions(
     username: string,
     onProgress?: ProgressCallback
   ): Promise<{ isValid: boolean; error?: string }> {
-    return this.tokenValidator.verifyFineGrainedPermissions(username, onProgress);
+    return this.tokenValidator.verifyTokenPermissions(username, onProgress);
   }
 
   async repoExists(owner: string, repo: string): Promise<boolean> {

diff --git a/src/services/GitHubTokenValidator.ts b/src/services/GitHubTokenValidator.ts
@@ -23,14 +23,10 @@ export class GitHubTokenValidator extends BaseGitHubService {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
 
-  async verifyFineGrainedPermissions(
+  async verifyTokenPermissions(
     username: string,
     onProgress?: ProgressCallback
   ): Promise<{ isValid: boolean; error?: string }> {
-    if (!this.isFineGrainedToken()) {
-      return { isValid: false, error: 'Not a fine-grained token' };
-    }
-
     try {
       // Create a temporary test repo
       const timestamp = Date.now();