create long term access

Author: ZHallen122

backend/src/chat/chat.module.ts

@@ -11,13 +11,15 @@ import { UserService } from 'src/user/user.service';
 import { PubSub } from 'graphql-subscriptions';
 import { JwtCacheModule } from 'src/jwt-cache/jwt-cache.module';
 import { UploadModule } from 'src/upload/upload.module';
+import { GitHubModule } from 'src/github/github.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([Chat, User]),
     AuthModule,
     JwtCacheModule,
     UploadModule,
+    GitHubModule,
   ],
   controllers: [ChatController],
   providers: [

backend/src/github/github.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { AuthModule } from '../auth/auth.module';
 import { ProjectGuard } from '../guard/project.guard';
@@ -14,18 +14,19 @@ import { ProjectPackages } from 'src/project/project-packages.model';
 import { GitHuController } from './github.controller';
 import { ProjectService } from 'src/project/project.service';
 import { ConfigModule, ConfigService } from '@nestjs/config';
-import { UserService } from 'src/user/user.service';
+import { UserModule } from 'src/user/user.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([Project, Chat, User, ProjectPackages]),
     AuthModule,
     AppConfigModule,
     UploadModule,
-    ConfigModule
+    ConfigModule,
+    forwardRef(() => UserModule),
   ],
   controllers: [GitHuController],
-  providers: [ProjectService, ProjectGuard, GitHubAppService, GitHubService, ConfigService, ChatService, UserService],
+  providers: [ProjectService, ProjectGuard, GitHubAppService, GitHubService, ConfigService, ChatService],
   exports: [GitHubService],
 })
 export class GitHubModule {}

backend/src/github/githubApp.service.ts

@@ -67,7 +67,7 @@ export class GitHubAppService {
       await this.userRepo.update(
         { githubInstallationId: installationId }, 
         { githubInstallationId: null,
-          githubCode: null
+          githubAccessToken: null
         }
       );
 

backend/src/project/project.service.ts

@@ -808,8 +808,7 @@ export class ProjectService {
       user.githubInstallationId,
     );
 
-    const githubCode = user.githubCode;
-    const userOAuthToken = await this.gitHubService.exchangeOAuthCodeForToken(githubCode);
+    const userOAuthToken = user.githubAccessToken;
 
     // 4) Create the repo if the project doesn’t have it yet
     if (!project.githubRepoName || !project.githubOwner) {

backend/src/user/user.model.ts

@@ -84,7 +84,7 @@ export class User extends SystemBaseModel {
 
   @Field({ nullable: true })
   @Column({ nullable: true })
-  githubCode?: string;
+  githubAccessToken?: string;
 
   /**
    * This field is maintained for API compatibility but is no longer actively used.

backend/src/user/user.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { UserResolver } from './user.resolver';
 import { UserService } from './user.service';
 import { DateScalar } from 'src/common/scalar/date.scalar';
@@ -8,6 +8,7 @@ import { JwtModule } from '@nestjs/jwt';
 import { AuthModule } from 'src/auth/auth.module';
 import { MailModule } from 'src/mail/mail.module';
 import { UploadModule } from 'src/upload/upload.module';
+import { GitHubModule } from 'src/github/github.module';
 
 @Module({
   imports: [
@@ -16,6 +17,7 @@ import { UploadModule } from 'src/upload/upload.module';
     AuthModule,
     MailModule,
     UploadModule,
+    forwardRef(() => GitHubModule),
   ],
   providers: [UserResolver, UserService, DateScalar],
   exports: [UserService],

backend/src/user/user.service.ts

@@ -5,13 +5,15 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { FileUpload } from 'graphql-upload-minimal';
 import { UploadService } from '../upload/upload.service';
 import { validateAndBufferFile } from 'src/common/security/file_check';
+import { GitHubService } from 'src/github/github.service';
 
 @Injectable()
 export class UserService {
   constructor(
     @InjectRepository(User)
     private userRepository: Repository<User>,
     private readonly uploadService: UploadService,
+    private readonly gitHubService: GitHubService,
   ) {}
 
   // Method to get all chats of a user
@@ -72,8 +74,12 @@ export class UserService {
     }
 
     console.log(`Binding GitHub installation ID ${installationId} to user ${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.githubCode = githubCode;
+    user.githubAccessToken = accessToken;
 
     await this.userRepository.save(user);
 

frontend/src/graphql/schema.gql

@@ -246,7 +246,7 @@ type User {
   chats: [Chat!]!
   createdAt: Date!
   email: String!
-  githubCode: String
+  githubAccessToken: String
   githubInstallationId: String
   id: ID!
   isActive: Boolean!