vitalif
/
grive2
mirror of https://github.com/vitalif/grive2
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle error HTTP responses in OAuth2

pull/40/head
Vitaliy Filippov 2015-09-30 15:52:24 +03:00
parent 9402bff12e
commit dc8e172a27
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libgrive/src/protocol/OAuth2.cc
View File

@ -66,11 +66,19 @@ void OAuth2::Auth( const std::string& auth_code )
http::ValResponse resp ;
m_agent->Post( token_url, post, &resp, http::Header() ) ;
Val jresp = resp.Response() ;
m_access = jresp["access_token"].Str() ;
m_refresh = jresp["refresh_token"].Str() ;
long code = m_agent->Post( token_url, post, &resp, http::Header() ) ;
if ( code >= 200 && code < 300 )
{
Val jresp = resp.Response() ;
m_access = jresp["access_token"].Str() ;
m_refresh = jresp["refresh_token"].Str() ;
}
else
{
Log( "Failed to obtain auth token: HTTP %1%, body: %2%",
code, m_agent->LastError(), log::error ) ;
BOOST_THROW_EXCEPTION( AuthFailed() );
}
}
std::string OAuth2::MakeAuthURL()
@ -97,9 +105,16 @@ void OAuth2::Refresh( )
http::ValResponse resp ;
m_agent->Post( token_url, post, &resp, http::Header() ) ;
long code = m_agent->Post( token_url, post, &resp, http::Header() ) ;
m_access = resp.Response()["access_token"].Str() ;
if ( code >= 200 && code < 300 )
m_access = resp.Response()["access_token"].Str() ;
else
{
Log( "Failed to refresh auth token: HTTP %1%, body: %2%",
code, m_agent->LastError(), log::error ) ;
BOOST_THROW_EXCEPTION( AuthFailed() );
}
}
std::string OAuth2::RefreshToken( ) const

4
libgrive/src/protocol/OAuth2.hh
View File

@ -20,6 +20,7 @@
#pragma once
#include "http/Agent.hh"
#include "util/Exception.hh"
#include <string>
#include <memory>
@ -27,6 +28,9 @@ namespace gr {
class OAuth2
{
public :
struct AuthFailed : virtual Exception {} ;
public :
OAuth2(
std::auto_ptr<http::Agent>& agent,