fix bug

Author: ZHallen122

backend/src/github/github.service.ts

@@ -1,6 +1,6 @@
 // src/github/github.service.ts
 
-import { Injectable, Logger } from '@nestjs/common';
+import { BadRequestException, Injectable, Logger } from '@nestjs/common';
 import * as jwt from 'jsonwebtoken';
 import axios from 'axios';
 import * as fs from 'fs';
@@ -96,6 +96,11 @@ export class GitHubService {
         },
       },
     );
+
+    if (response.data.error) {
+      console.error('GitHub OAuth error:', response.data);
+      throw new BadRequestException(`GitHub OAuth error: ${response.data.error_description}`);
+    }
 
     const accessToken = response.data.access_token;
     if (!accessToken) {

backend/src/github/githubApp.service.ts

@@ -83,10 +83,10 @@ export class GitHubAppService {
       }
     });
 
-    // only for webhooks debugging 
-    this.app.webhooks.onAny(async (event) => {
-      this.logger.log(`onAny: Received event='${event.name}' action='${event.payload}'`);
-    });
+    // // only for webhooks debugging 
+    // this.app.webhooks.onAny(async (event) => {
+    //   this.logger.log(`onAny: Received event='${event.name}' action='${event.payload}'`);
+    // });
   }
 
   /**

backend/src/project/project.resolver.ts

@@ -167,6 +167,7 @@ export class ProjectsResolver {
 
   @Mutation(() => Project)
   async syncProjectToGitHub(@Args('projectId') projectId: string, @GetUserIdFromToken() userId: string,) {
+    // TODO: MAKE PUBLIC DYNAMIC
     return this.projectService.syncProjectToGitHub(userId, projectId, true /* isPublic? */);
   }
 }

backend/src/project/project.service.ts

@@ -803,11 +803,10 @@ export class ProjectService {
       throw new Error('GitHub App not installed for this user');
     }
 
-    // 3) Get the installation token
+    // 3) Get the installation and OAUTH token
     const installationToken = await this.gitHubService.getInstallationToken(
       user.githubInstallationId,
     );
-
     const userOAuthToken = user.githubAccessToken;
 
     // 4) Create the repo if the project doesn’t have it yet
@@ -816,7 +815,7 @@ export class ProjectService {
       const repoName = project.projectName
         .replace(/\s+/g, '-')
         .toLowerCase() // e.g. "my-project"
-        + '-' + project.githubOwner; // to make it unique if needed
+        + '-' + "ChangeME"; // to make it unique if needed
 
       const { owner, repo, htmlUrl } = await this.gitHubService.createUserRepo(
         repoName,

backend/src/user/user.service.ts

@@ -73,15 +73,24 @@ export class UserService {
       throw new BadRequestException('User already linked to a GitHub installation.');
     }
 
-    console.log(`Binding GitHub installation ID ${installationId} to user ${githubCode}`);
+    if (!githubCode) {
+      throw new BadRequestException('Missing GitHub OAuth code');
+    }
+
+    console.log(`Binding GitHub installation ID ${installationId} to user code ${githubCode}`);
 
     //First request to GitHub to exchange the code for an access token (Wont expire)
     const accessToken = await this.gitHubService.exchangeOAuthCodeForToken(githubCode);
 
     user.githubInstallationId = installationId;
     user.githubAccessToken = accessToken;
 
-    await this.userRepository.save(user);
+    try {
+      await this.userRepository.save(user);
+    } catch (error) {
+      console.error('Error saving user:', error);
+      throw new Error('Failed to save user with installation ID');
+    }    
 
     return true;
   }

frontend/src/components/github-callback.tsx

@@ -1,5 +1,5 @@
 'use client';
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { useAuthContext } from '@/providers/AuthProvider';
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card';
@@ -14,8 +14,12 @@ export default function GitHubCallback() {
 
   const [status, setStatus] = useState<'loading' | 'success' | 'error'>('loading');
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
+
+  const hasCalledBackend = useRef(false); // Add guard flag here
 
   useEffect(() => {
+    if (hasCalledBackend.current) return; // Prevent multiple calls
+
     // Extract installation ID from search params
     const githubCode = searchParams.get('code');
     const installationId = searchParams.get('installation_id');
@@ -43,6 +47,8 @@ export default function GitHubCallback() {
       setErrorMessage('No installation ID was provided.');
       return;
     }
+
+    hasCalledBackend.current = true;
 
     // Call the backend directly to store the installation ID
     const storeInstallation = async () => {
@@ -82,7 +88,7 @@ export default function GitHubCallback() {
 
   // Function to handle redirect back to projects
   const handleContinue = () => {
-    router.push('/projects'); // Change this to your desired redirect path
+    router.push('/'); // Change this to your desired redirect path
   };
 
   return (