Merge pull request #288 from github/422

fix(github_org): handle 422 in a nicer way

Author: nobe4

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    entitlements-github-plugin (1.2.1)
+    entitlements-github-plugin (1.2.2)
       contracts (~> 0.17.0)
       faraday (~> 2.0)
       faraday-retry (~> 2.0)

lib/entitlements/backend/github_org/service.rb

@@ -54,6 +54,9 @@ def add_user_to_organization(user, role)
 
             Entitlements.logger.warn "User #{user} not found in GitHub instance #{identifier}, ignoring."
             return false
+          rescue Octokit::UnprocessableEntity => e
+            Entitlements.logger.warn "Unprocessable entity when adding #{user} to organization #{org} with role #{role}: #{e.message}. This likely means the user blocked the invite, so we're ignoring them, but someone should check it."
+            return false
           end
 
           # Happy path

lib/version.rb

@@ -2,6 +2,6 @@
 
 module Entitlements
   module Version
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

spec/unit/entitlements/backend/github_org/service_spec.rb

@@ -201,6 +201,28 @@
           expect(result).to eq(false)
         end
       end
+
+      context "when the API returns an unprocessable entity error" do
+        it "warns and returns false" do
+          expect(logger).to receive(:debug).with("github.fake add_user_to_organization(user=bob, org=kittensinc, role=admin)")
+          expect(logger).to receive(:debug).with("Setting up GitHub API connection to https://github.fake/api/v3/")
+          expect(logger).to receive(:warn).with(/Unprocessable entity when adding bob to organization kittensinc with role admin.*likely means the user blocked the invite/)
+
+          stub_request(:put, "https://github.fake/api/v3/orgs/kittensinc/memberships/bob").to_return(
+            status: 422,
+            headers: {
+              "Content-type" => "application/json"
+            },
+            body: JSON.generate({
+              "message"           => "Unprocessable Entity",
+              "documentation_url" => "https://docs.github.com/rest"
+            })
+          )
+
+          result = subject.send(:add_user_to_organization, "bob", "admin")
+          expect(result).to eq(false)
+        end
+      end
     end
   end