chiu
/
google-api-ruby-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94 from programmiersportgruppe/master 

Shutdown WEBrick server used in installed app flow
This commit is contained in:
Sérgio Gomes 2014-09-17 15:56:26 +01:00
parent 6f655029c1 c428db0f3d
commit fda7086f43
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/google/api_client/auth/installed_app.rb
View File

@ -92,9 +92,10 @@ module Google
:Logger => WEBrick::Log.new(STDOUT, 0), :Logger => WEBrick::Log.new(STDOUT, 0),
:AccessLog => [] :AccessLog => []
) )
trap("INT") { server.shutdown } begin
trap("INT") { server.shutdown }
server.mount_proc '/' do |req, res| server.mount_proc '/' do |req, res|
auth.code = req.query['code'] auth.code = req.query['code']
if auth.code if auth.code
auth.fetch_access_token! auth.fetch_access_token!
@ -102,10 +103,13 @@ module Google
res.status = WEBrick::HTTPStatus::RC_ACCEPTED res.status = WEBrick::HTTPStatus::RC_ACCEPTED
res.body = RESPONSE_BODY res.body = RESPONSE_BODY
server.stop server.stop
end end
Launchy.open(auth.authorization_uri.to_s) Launchy.open(auth.authorization_uri.to_s)
server.start server.start
ensure
server.shutdown
end
if @authorization.access_token if @authorization.access_token
if storage.respond_to?(:write_credentials) if storage.respond_to?(:write_credentials)
storage.write_credentials(@authorization) storage.write_credentials(@authorization)