Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to invoke CoinbaseAccount with a known good oauth access token #10

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add ability to invoke CoinbaseAccount with a known good oauth access token #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70d2be7
Add ability to invoke CoinbaseAccount with a known good oauth access …
skruger Mar 1, 2014
1866e29
Update error message.
skruger Mar 4, 2014
cc40034
Improve error messages and fix transaction id reference.
skruger Mar 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions coinbase/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ class CoinbaseAccount(object):

def __init__(self,
oauth2_credentials=None,
api_key=None):
api_key=None,
oauth_access_token=None):
"""

:param oauth2_credentials: JSON representation of Coinbase oauth2 credentials
Expand Down Expand Up @@ -97,7 +98,7 @@ def __init__(self,
self.global_request_params = {}

elif api_key:
if type(api_key) is str:
if isinstance(api_key, basestring):

#Set our API Key
self.api_key = api_key
Expand All @@ -106,8 +107,14 @@ def __init__(self,
self.global_request_params = {'api_key':api_key}
else:
print "Your api_key must be a string"
elif oauth_access_token:
if isinstance(oauth_access_token, basestring):
self.oauth_access_token = oauth_access_token
self.global_request_params = {'access_token': oauth_access_token}
else:
print "Oauth access token must be a string"
else:
print "You must pass either an api_key or oauth_credentials"
print "You must pass either an api_key, oauth_credentials, or oauth_access_token."

def _check_oauth_expired(self):
"""
Expand Down Expand Up @@ -308,7 +315,7 @@ def request(self, from_email, amount, notes='', currency='BTC'):

return CoinbaseTransaction(response_parsed['transaction'])

def send(self, to_address, amount, notes='', currency='BTC'):
def send(self, to_address, amount, notes='', currency='BTC', transaction_params=dict()):
"""
Send BitCoin from this account to either an email address or a BTC address
:param to_address: Email or BTC address to where coin should be sent
Expand Down Expand Up @@ -338,11 +345,11 @@ def send(self, to_address, amount, notes='', currency='BTC'):
}
}

request_data['transaction'].update(transaction_params)
response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
response_parsed = response.json()

if response_parsed['success'] == False:
raise RuntimeError('Transaction Failed')
raise RuntimeError('Transaction Failed: %s' % response_parsed.get('errors', 'no errors returned'))

return CoinbaseTransaction(response_parsed['transaction'])

Expand Down
4 changes: 2 additions & 2 deletions coinbase/models/transfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def __init__(self, transfer):
self.fees_bank = CoinbaseAmount(fees_bank_cents, fees_bank_currency_iso)

self.payout_date = transfer['payout_date']
self.transaction_id = transfer.get('transaction_id','')
self.transaction_id = transfer.get('id','')
self.status = transfer['status']

btc_amount = transfer['btc']['amount']
Expand Down Expand Up @@ -49,4 +49,4 @@ def complete(self):

def resend(self):
pass
#TODO: Resend the transfer email if possible
#TODO: Resend the transfer email if possible