Use assignment creators token to create repo in certain cases

Author: Eric Pickup

app/services/create_github_repo_service.rb

@@ -3,7 +3,7 @@
 # rubocop:disable ClassLength
 class CreateGitHubRepoService
   attr_reader :exercise, :stats_sender
-  delegate :assignment, :collaborator, :organization, :invite_status, to: :exercise
+  delegate :assignment, :collaborator, :organization, :invite_status, :github_organization, to: :exercise
 
   def initialize(assignment, collaborator)
     @exercise = Exercise.build(assignment, collaborator)
@@ -60,7 +60,7 @@ def create_github_repository!
       description: "#{exercise.repo_name} created by GitHub Classroom"
     }
 
-    organization.github_organization.create_repository(exercise.repo_name, options)
+    github_organization.create_repository(exercise.repo_name, options)
   rescue GitHub::Error => error
     raise Result::Error.new errors(:repository_creation_failed), error.message
   end
@@ -75,7 +75,7 @@ def create_github_repository_from_template!
 
     options = repo_from_template_options
 
-    github_repository = organization.github_organization.create_repository_from_template(
+    github_repository = github_organization.create_repository_from_template(
       assignment.starter_code_repo_id,
       exercise.repo_name,
       options
@@ -114,7 +114,7 @@ def create_assignment_repo!(github_repository)
 
   def delete_github_repository(github_repo_id)
     return true if github_repo_id.nil?
-    organization.github_organization.delete_repository(github_repo_id)
+    github_organization.delete_repository(github_repo_id)
   rescue GitHub::Error
     true
   end
@@ -227,7 +227,7 @@ def repo_from_template_options
     {
       private: assignment.private?,
       description: "#{exercise.repo_name} created by GitHub Classroom",
-      owner: organization.github_organization.login,
+      owner: exercise.organization_login,
       include_all_branches: true
     }
   end

app/services/create_github_repo_service/exercise.rb

@@ -10,14 +10,15 @@ def self.build(assignment, collaborator)
       end
     end
 
-    attr_reader :assignment, :collaborator, :organization, :invite_status
+    attr_reader :assignment, :collaborator, :organization, :invite_status, :github_organization
     delegate :status, to: :invite_status
 
     def initialize(assignment, collaborator)
       @assignment = assignment
       @collaborator = collaborator
       @organization = assignment.organization
       @invite_status = assignment.invitation.status(collaborator)
+      @github_organization = github_organization_with_access
     end
 
     def repo_name
@@ -29,7 +30,7 @@ def default_repo_name
     end
 
     def organization_login
-      @organization_login ||= organization.github_organization.login
+      @organization_login ||= @github_organization.login
     end
 
     def assignment_type
@@ -69,5 +70,27 @@ def suffixed_repo_name(suffix_count)
       suffix = "-#{suffix_count}"
       default_repo_name.truncate(100 - suffix.length, omission: "") + suffix
     end
+
+    # rubocop:disable MethodLength
+    def github_organization_with_access
+      github_organization_with_random_token = @organization.github_organization
+      return github_organization_with_random_token unless assignment.starter_code?
+
+      github_client = assignment.creator.github_client
+      starter_code_repository = GitHub::Errors.with_error_handling do
+        github_client.repository(assignment.starter_code_repo_id)
+      end
+
+      return github_organization_with_random_token unless
+          require_creators_token?(starter_code_repository, github_organization_with_random_token)
+
+      GitHubOrganization.new(github_client, starter_code_repository)
+    rescue GitHub::NotFound
+      github_organization_with_random_token
+    end
+
+    def require_creators_token?(starter_code_repository, github_org)
+      starter_code_repository.private && starter_code_repository.owner.login != github_org.login
+    end
   end
 end

spec/services/create_github_repo_service/exercise_spec.rb

@@ -6,10 +6,16 @@
   let(:exercise) { described_class.new(assignment, student) }
 
   describe ".build" do
-    let(:assignment) { double(organization: double, invitation: double(status: double)) }
+    let(:assignment) do
+      double(
+        organization: double(github_organization: double),
+        invitation: double(status: double),
+        starter_code?: false
+      )
+    end
 
     it "builds a Individual if collaborator is a user" do
-      collaborator = double("is_a?": true)
+      collaborator = double("is_a?": true, github_organization: "Yeet")
       expect(described_class.build(assignment, collaborator))
         .to be_an_instance_of(CreateGitHubRepoService::IndividualExercise)
     end
@@ -40,4 +46,69 @@
       expect(exercise.organization_login).to eq(organization.github_organization.login)
     end
   end
+
+  describe "#github_organization_with_access", :vcr do
+    let(:client) { oauth_client }
+    let(:organization) { classroom_org }
+    let(:github_organization) { organization.github_organization }
+    let(:teacher)      { classroom_teacher }
+    let(:student)      { classroom_student }
+    let(:assignment) do
+      options = {
+        title: "Learn Elm",
+        organization: organization,
+        students_are_repo_admins: true,
+        public_repo: true
+      }
+      build(:assignment, options)
+    end
+    let(:exercise) { described_class.new(assignment, student) }
+
+    before(:each) do
+      assignment.update(starter_code_repo_id: github_repository.id)
+    end
+
+    after(:each) do
+      teacher.github_client.delete_repository(github_repository.id)
+    end
+
+    context "repository is public" do
+      let(:github_repository) do
+        options = { private: false, is_template: true, auto_init: true }
+        github_organization.create_repository("#{Faker::Company.name} Public Template", options)
+      end
+
+      it "uses Organization#github_organization" do
+        exercise = described_class.new(assignment, student)
+        expect(exercise.github_organization).to eql(github_organization)
+      end
+    end
+
+    context "repository is private" do
+      context "repository belongs to classroom organization" do
+        let(:github_repository) do
+          options = { private: true, is_template: true, auto_init: true }
+          github_organization.create_repository("#{Faker::Company.name} Private Template on Org", options)
+        end
+
+        it "uses Organization#github_organization" do
+          exercise = described_class.new(assignment, student)
+          expect(exercise.github_organization).to eql(github_organization)
+        end
+      end
+
+      context "repository does not belong to classroom organization" do
+        let(:github_repository) do
+          options = { private: true, is_template: true, auto_init: true }
+          teacher.github_client.create_repository("#{Faker::Company.name} Private Template on User", options)
+        end
+
+        it "uses a new GitHubOrganization with the assignment creator's token" do
+          exercise = described_class.new(assignment, student)
+          expect(exercise.github_organization).not_to eql(github_organization)
+          expect(exercise.github_organization.access_token).to eql(assignment.creator.github_client.access_token)
+        end
+      end
+    end
+  end
 end

spec/services/create_github_repo_service_spec.rb

@@ -48,8 +48,7 @@
         options = {
           private: false,
           is_template: true,
-          auto_init: true,
-          accept: "application/vnd.github.baptiste-preview"
+          auto_init: true
         }
         github_organization.create_repository("#{Faker::Company.name} Template", options)
       end
@@ -290,8 +289,7 @@
             options = {
               private: false,
               is_template: true,
-              auto_init: true,
-              accept: "application/vnd.github.baptiste-preview"
+              auto_init: true
             }
             github_organization.create_repository("#{Faker::Company.name} Template", options)
           end
@@ -548,8 +546,7 @@
         options = {
           private: false,
           is_template: true,
-          auto_init: true,
-          accept: "application/vnd.github.baptiste-preview"
+          auto_init: true
         }
         github_organization.create_repository("#{Faker::Company.name} Template", options)
       end