Only attempt to sync users who have an access token (#1283)

octobox · Nov 21, 2018 · 6fec09d · 6fec09d
1 parent 94e2b86
commit 6fec09d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/models/subject.rb b/app/models/subject.rb
@@ -159,7 +159,7 @@ def github_client
     if app_installation.present?
       Octobox.installation_client(app_installation.github_id)
     else
-      users.first&.subject_client
+      users.with_access_token.first&.subject_client
     end
   end
 
@@ -168,8 +168,8 @@ def self.extract_full_name(url)
   end
 
   def involved_user_ids
-    ids = users.not_recently_synced.pluck(:id)
-    ids += repository.users.not_recently_synced.pluck(:id) if repository.present?
+    ids = users.with_access_token.not_recently_synced.pluck(:id)
+    ids += repository.users.with_access_token.not_recently_synced.pluck(:id) if repository.present?
     ids.uniq
   end
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -27,6 +27,7 @@ class User < ApplicationRecord
   validates_with PersonalAccessTokenValidator
 
   scope :not_recently_synced, -> { where('last_synced_at < ?', 5.minutes.ago) }
+  scope :with_access_token, -> { where.not(encrypted_access_token: nil) }
 
   def admin?
     Octobox.config.github_admin_ids.include?(github_id.to_s)