Merge pull request #47 from Dwolla/DEV-1054--sthapa-review-edits

Add print_location function, correct request syntax, read Key/Secret from env vars

Author: tarricsookdeo

README.md

@@ -14,6 +14,7 @@ This repository contains the source code for Dwolla's Python-based SDK, which al
     - [Responses](#responses)
       - [Success](#success)
       - [Error](#error)
+  - [Example App](#example-app)
 - [Changelog](#changelog)
 - [Community](#community)
 - [Additional Resources](#additional-resources)
@@ -200,6 +201,13 @@ _See https://developers.dwolla.com/api-reference#errors for more info._
 - `dwollav2.TooManyRequestsError`
 - `dwollav2.ConflictError`
 
+### Example App
+
+Take a look at the
+[Sample Application](https://github.com/Dwolla/dwolla-v2-python/tree/main/sample_app) for examples
+on how to use this SDK to call the Dwolla API. Before you can begin using the app, however,
+you will need to specify a `DWOLLA_APP_KEY` and `DWOLLA_APP_SECRET` environment variable.
+
 ## Changelog
 
 - **2.2.1**

sample_app/helpers.py

@@ -25,20 +25,21 @@ def display_options():
     retrieve KBA (RKBA)
     verify KBA (VKBA)
     Create beneficial owner (CBO)
-    Reterieve beneficial owner (RBO)
+    Retrieve beneficial owner (RBO)
     list beneficial owners (LBO)
     update beneficial owner (UBO)
     Remove beneficial owner (DBO)
     Retrieve beneficial ownership status (RBOS)
     Certify beneficial ownership (CBOS)
+    Quit (Q)
     '''
     print(action_menu)
 
 def get_user_input():
     return input('Enter your action: ')
 
-def handle_input(input, pk, sk):
-    client = dwollav2.Client(key = pk, secret = sk, environment = 'sandbox')
+def handle_input(input, DWOLLA_APP_KEY, DWOLLA_APP_SECRET):
+    client = dwollav2.Client(key = DWOLLA_APP_KEY, secret = DWOLLA_APP_SECRET, environment = 'sandbox')
     application_token = client.Auth.client()
     if input == 'R':
         root(application_token)
@@ -90,11 +91,16 @@ def handle_input(input, pk, sk):
         retrieve_beneficial_ownership_status(application_token)
     elif input == 'CBOS':
         certify_beneficial_ownership(application_token)
+    elif input == 'Q':
+        quit()
 
 
 def print_response(res):
     print(json.dumps(res.body, indent = 4))
 
+def print_location(res):
+    print(res.headers['Location'])
+
 # ROOT RESOURCE
 def root(token):
     res = token.get('/')
@@ -112,23 +118,15 @@ def create_account_funding_source(token):
     bankAccountType = input('Enter your bank account type: ')
     name = input('Enter your funding source nickname: ')
 
-    has_channels = input('Does your funding source have channels? (y/n): ')
-
     body = {
         'routingNumber': routingNumber,
         'accountNumber': accountNumber,
         'type': bankAccountType,
         'name': name
     }
 
-    if has_channels == 'y':
-        channels = input('Enter your channels seperated by commas: ')
-        channels = channels.split(',')
-        body['channels'] = channels
-
-
     res = token.post(f'/funding-sources', body)
-    print_response(res)
+    print_location(res)
 
 def create_account_van(token):
     name = input('Enter your account name: ')
@@ -141,7 +139,7 @@ def create_account_van(token):
     }
 
     res = token.post(f'/funding-sources', body)
-    print_response(res)
+    print_location(res)
 
 def list_account_funding_sources(token):
     id = input('Enter your account ID: ')
@@ -173,7 +171,7 @@ def create_receive_only_customer(token):
     }
 
     res = token.post(f'/customers', body)
-    print_response(res)
+    print_location(res)
 
 def create_unverified_customer(token):
     firstName = input('Enter customer first name: ')
@@ -187,7 +185,7 @@ def create_unverified_customer(token):
     }
 
     res = token.post(f'/customers', body)
-    print_response(res)
+    print_location(res)
 
 def create_verified_personal_customer(token):
     firstName = input('Enter customer first name: ')
@@ -215,7 +213,7 @@ def create_verified_personal_customer(token):
     }
 
     res = token.post(f'/customers', body)
-    print_response(res)
+    print_location(res)
 
 def retrieve_customer(token):
     id = input('Enter customer ID: ')
@@ -228,26 +226,10 @@ def list_and_search_customers(token):
 
 def update_customer(token):
     id = input('Enter customer ID: ')
-    firstName = input('Enter customer first name: ')
-    lastName = input('Enter customer last name: ')
-    email = input('Enter customer email: ')
-    address1 = input('Enter customer address 1: ')
-    city = input('Enter customer city: ')
-    state = input('Enter customer state: ')
-    postalCode = input('Enter customer postal code: ')
-    dateOfBirth = input('Enter customer date of birth: ')
-    ssn = input('Enter customer ssn: ')
+    email = input('Enter updated customer email: ')
 
     body = {
-        'firstName': firstName,
-        'lastName': lastName,
         'email': email,
-        'address1': address1,
-        'city': city,
-        'state': state,
-        'postalCode': postalCode,
-        'dateOfBirth': dateOfBirth,
-        'ssn': ssn,
     }
 
     res = token.post(f'/customers/{id}', body)
@@ -266,7 +248,7 @@ def retrieve_business_classification(token):
 def initiate_kba(token):
     id = input('Enter customer ID: ')
     res = token.post(f'/customers/{id}/kba')
-    print_response(res)
+    print_location(res)
 
 def retrieve_kba(token):
     id = input('Enter KBA session ID: ')
@@ -302,21 +284,25 @@ def create_beneficial_owner(token):
     address1 = input('Enter beneficial owner address 1: ')
     city = input('Enter beneficial owner city: ')
     state = input('Enter beneficial owner state: ')
+    country = input('Enter beneficial owner country: ')
     postalCode = input('Enter beneficial owner postal code: ')
 
     body = {
         'firstName': firstName,
         'lastName': lastName,
         'dateOfBirth': dateOfBirth,
         'ssn': ssn,
-        'address1': address1,
-        'city': city,
-        'state': state,
-        'postalCode': postalCode
+        'address': {
+            'address1': address1,
+            'city': city,
+            'stateProvinceRegion': state,
+            'country': country,
+            'postalCode': postalCode
+        }
     }
 
     res = token.post(f'/customers/{id}/beneficial-owners', body)
-    print_response(res)
+    print_location(res)
 
 def retrieve_beneficial_owner(token):
     id = input('Enter beneficial owner ID: ')
@@ -337,17 +323,21 @@ def update_beneficial_owner(token):
     address1 = input('Enter beneficial owner address 1: ')
     city = input('Enter beneficial owner city: ')
     state = input('Enter beneficial owner state: ')
+    country = input('Enter beneficial owner country: ')
     postalCode = input('Enter beneficial owner postal code: ')
 
     body = {
         'firstName': firstName,
         'lastName': lastName,
         'dateOfBirth': dateOfBirth,
         'ssn': ssn,
-        'address1': address1,
-        'city': city,
-        'state': state,
-        'postalCode': postalCode
+        'address': {
+            'address1': address1,
+            'city': city,
+            'stateProvinceRegion': state,
+            'country': country,
+            'postalCode': postalCode
+        }
     }
 
     res = token.post(f'/beneficial-owners/{id}', body)

sample_app/main.py

@@ -1,14 +1,16 @@
+import os
 from helpers import *
 
 exit = False
 
-pk = input('Enter your Dwolla public key: ')
-sk = input('Enter your Dwolla secret key: ')
+# Get DWOLLA_APP_KEY and DWOLLA_APP_KEY from environment variables
+DWOLLA_APP_KEY = os.getenv('DWOLLA_APP_KEY')
+DWOLLA_APP_SECRET = os.environ.get('DWOLLA_APP_SECRET')
 
 while not exit:
     display_options()
     input = get_user_input()
     if input == 'exit':
         exit = True
     else:
-        handle_input(input, pk, sk)
+        handle_input(input, DWOLLA_APP_KEY, DWOLLA_APP_SECRET)