clean up jwt key generation

app/models/license.rb

@@ -244,16 +244,14 @@ def generate_pkcs1_pss_signed_key!
 
   def generate_jwt_rs256_key!
     priv = OpenSSL::PKey::RSA.new account.private_key
-    begin
-      payload = JSON.parse key
-      jwt = JWT.encode payload, priv, "RS256"
-
-      self.key = jwt
-    rescue JSON::GeneratorError,
-            JSON::ParserError
-      errors.add :key, :jwt_payload_invalid, message: "key is not a valid JWT payload (must be a valid JSON encoded string)"
-    rescue JWT::InvalidPayload => e
-      errors.add :key, :jwt_payload_invalid, message: "key is not a valid JWT payload (#{e.message})"
-    end
+    payload = JSON.parse key
+    jwt = JWT.encode payload, priv, "RS256"
+
+    self.key = jwt
+  rescue JSON::GeneratorError,
+         JSON::ParserError
+    errors.add :key, :jwt_payload_invalid, message: "key is not a valid JWT payload (must be a valid JSON encoded string)"
+  rescue JWT::InvalidPayload => e
+    errors.add :key, :jwt_payload_invalid, message: "key is not a valid JWT payload (#{e.message})"
   end
 end

features/step_definitions/request_steps.rb

@@ -297,7 +297,7 @@
   end
 end
 
-Then /^the JSON response should (?:contain|be) an? "([^\"]*)" with the following "([^\"]*)":$/ do |name, attribute, body|
+Then /^the JSON response should (?:contain|be) an? "([^\"]*)" with the following "([^\"]*)":$/ do |resource, attribute, body|
   json = JSON.parse last_response.body
 
   expect(json["data"]["type"]).to eq resource.pluralize