resolve merge

Author: Max Woolf

README.md

@@ -67,7 +67,8 @@ POST /certificate_request
 	"zone": "CLOUDFLARE DOMAIN ZONE",
 	"heroku_app_name": "NAME OF HEROKU APP",
 	"cloudflare_api_key": "API KEY OF CLOUDFLARE ACCOUNT",
-	"cloudflare_email": "CLOUDFLARE EMAIL ADDRESS"
+	"cloudflare_email": "CLOUDFLARE EMAIL ADDRESS",
+	"heroku_oauth_token": "HEROKU OAUTH TOKEN"
 }
 ```
 

app.rb

@@ -23,7 +23,11 @@
     status 200
     token = SecureRandom.hex
     $redis.setex("status_#{token}", 3600, "queued")
+<<<<<<< 4b0003d9160961f0c8ed3a19b1026d60e3f29373
     CloudflareChallengeWorker.perform_async(@request_payload["zone"], @request_payload["domains"], token, @request_payload["heroku_app_name"], false, { email: @request_payload['cloudflare_email'], api_key: @request_payload['cloudflare_api_key'] }, heroku: { oauth_key: @request_payload['heroku_api_key']})
+=======
+    CloudflareChallengeWorker.perform_async(@request_payload["zone"], @request_payload["domains"], token, @request_payload["heroku_app_name"], false, { email: @request_payload['cloudflare_email'], api_key: @request_payload['cloudflare_api_key'] }, heroku: { oauth_key: @request_payload['heroku_oauth_token']})
+>>>>>>> resolve merge
     { status: 'queued', uuid: token, url: "#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}/certificate_request/#{token}?auth_token=#{ENV['AUTH_TOKEN']}" }.to_json
   else
     status 422

lib/certificate_generator.rb

@@ -9,8 +9,8 @@ def initialize(options = {})
 
     Logger.log('Creating challenge records', generator: self)
     @challenge.create_challenge_records
-    Logger.log('Sleeping for 60 seconds', generator: self)
-    sleep(60) unless ENV['ENVIRONMENT'] == 'test'
+    Logger.log('Sleeping for 120 seconds', generator: self)
+    sleep(120) unless ENV['ENVIRONMENT'] == 'test'
     @challenge.verify
 
     @csr = Acme::Client::CertificateRequest.new(names: @challenge.domains)