Changeset 34 for trunk

Timestamp:

03/24/08 23:13:54 (4 years ago)

Author:

tim

Message:

Add support for getPaymentInstruction

Location:

trunk/fpys

Files:

• client.py (modified) (3 diffs)
• tests/client_test.py (modified) (1 diff)
• tests/wsgi_responder.py (modified) (1 diff)

trunk/fpys/client.py

@@ -1 @@
-import base64, hmac, sha
+import base64
+import hmac
+import sha
 import urllib, urllib2
 import logging
 import time
+from datetime import datetime, tzinfo
 
 try:
@@ -19 +22 @@
         return 1
     return 0
+
+class Token(object):
+    def __init__(self, document=None):
+        if document is not None:
+            document = ET.ElementTree(document)
+        self.document = document
+
+        for name in ['TokenId', 'FriendlyName', 'Status', 
+                     'DateInstalled', 'CallerInstalled',
+                     'CallerReference', 'TokenType',
+                     'OldTokenId']:
+            if document.find(name) is not None:
+                attr_name = name[0].lower() + name[1:]
+                setattr(self, attr_name, document.find(name).text)
+
+        if hasattr(self, 'dateInstalled'):
+            # TODO this is a little less than ideal
+            # we truncate the milliseconds and time zone info
+            di = self.dateInstalled
+            di = di[0:di.find(".")]
+            self.dateInstalled = datetime.strptime(di,
+                                                   "%Y-%m-%dT%H:%M:%S")
 
 class FPSResponse(object):
@@ -51 +76 @@
 
 
-        for name in ['CallerTokenId', 'SenderTokenId', 'RecipientTokenId', 'TokenId']:
+        for name in ['CallerTokenId', 'SenderTokenId', 'RecipientTokenId', 'TokenId',
+                     'PaymentInstruction', 'AccountId', 'TokenFriendlyName']:
             if document.find(name) is not None:
                 attr_name = name[0].lower() + name[1:]
                 setattr(self, attr_name, document.find(name).text)
+
+        if document.find("Token"):
+            self.token = Token(document.find("Token"))
 
         if document.find("AccountBalance"):

trunk/fpys/tests/client_test.py

@@ -106 +106 @@
     assert response.errors[0]['errorCode'] == "InvalidParams"
 
+def test_getPaymentInstruction():
+    """Retrive an existing payment instruciton"""
+    response = fps_client.getPaymentInstruction("ZS4X8G44GEIVGVSEN2DI5NDO6Q2WX3JQ9125FNR8IBLF5CFH8ZMT3RLNBJUJH9MN")
+    assert response.success == True
+    assert response.token is not None
+    assert response.token.status == 'Active'
+    assert response.token.tokenType == 'Unrestricted'
+    assert response.paymentInstruction.startswith("MyRole =")
+
 def test_getTokenUsageInvalid():
     """Retrieve token usage for a SingleUse token"""

trunk/fpys/tests/wsgi_responder.py

@@ -43 +43 @@
         return [response]
 
+    def GetPaymentInstruction(self, environ):
+        response = """<ns0:GetPaymentInstructionResponse xmlns:ns0="http://fps.amazonaws.com/doc/2007-01-08/"><Token><TokenId>ZS4X8G44GEIVGVSEN2DI5NDO6Q2WX3JQ9125FNR8IBLF5CFH8ZMT3RLNBJUJH9MN</TokenId><FriendlyName>fpes.achievewith.us_caller4685bc1eef1311dc952e00142241a3a2</FriendlyName><Status>Active</Status><DateInstalled>2008-03-10T19:31:48.000-07:00</DateInstalled><CallerInstalled>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</CallerInstalled><CallerReference>fpes.achievewith.us_caller4685bc1eef1311dc952e00142241a3a2</CallerReference><TokenType>Unrestricted</TokenType><OldTokenId>ZS4X8G44GEIVGVSEN2DI5NDO6Q2WX3JQ9125FNR8IBLF5CFH8ZMT3RLNBJUJH9MN</OldTokenId></Token><PaymentInstruction>MyRole == \'Caller\';</PaymentInstruction><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><TokenFriendlyName>fpes.achievewith.us_caller4685bc1eef1311dc952e00142241a3a2</TokenFriendlyName><Status>Success</Status><RequestId>29a86313-d869-4c94-b5b6-570e95254f10:0</RequestId></ns0:GetPaymentInstructionResponse>"""
+        return [response]
+
     def InstallPaymentInstruction(self, environ):
         if environ['fps.params']['PaymentInstruction'][0].find("Invalid") != -1: