[SDK-160]: Fix Flash example and add minor tweaks

zarembas · zarembas · commit af4e4664e4b9 · 2017-11-05T23:20:33.000Z
diff --git a/.gitignore b/.gitignore
@@ -94,5 +94,8 @@ ENV/
 *.un~
 .history/
 .vscode
+
+# examples files
 examples/yoti_example_django/yoti_example/static/YotiSelfie.jpg
 examples/yoti_example_django/db.sqlite3
+examples/yoti_example_flask/static/YotiSelfie.jpg
diff --git a/README.md b/README.md
@@ -139,7 +139,7 @@ nationality = user_profile.get('nationality')
 
 Both example applications utilise the env variables described in [Configuration](#configuration), make sure they are accessible.
 
-* Installing dependencies: `pip install -e .[examples]`
+* Installing dependencies: `pip install -e .[examples]` (If you're using `zsh` you need to escape the square brackets: `pip install -e .\[examples\]`)
 
 ### Flask:
 
diff --git a/examples/yoti_example_django/yoti_example/templates/profile.html b/examples/yoti_example_django/yoti_example/templates/profile.html
@@ -2,25 +2,25 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>PROFILE</title>
+    <title>Yoti Profile</title>
 </head>
 <body>
     <h3><a href="/">Home</a></h3>
     <table>
         {% if user_id %}
             <tr>
-                <td>USER ID:</td>
+                <td>User ID:</td>
                 <td>{{user_id}}</td>
             </tr>
         {% endif %}
 
         {% if selfie %}
             <tr>
-                <td>SELFIE in base64 format:</td>
+                <td>Selfie in base64 format:</td>
                 <td><img width="200" alt="base64photo" src="{{selfie}}" /></td>
             </tr>
             <tr>
-                <td>SELFIE from saved image:</td>
+                <td>Selfie from saved image:</td>
                 <td><img width="200" alt="saved image" src="/static/YotiSelfie.jpg" /></td>
             </tr>
         {% endif %}
@@ -48,7 +48,7 @@ <h3><a href="/">Home</a></h3>
 
         {% if date_of_birth %}
             <tr>
-                <td>DATE OF BIRTH:</td>
+                <td>Date of Birth:</td>
                 <td>{{date_of_birth}}</td>
             </tr>
         {% endif %}
diff --git a/examples/yoti_example_django/yoti_example/views.py b/examples/yoti_example_django/yoti_example/views.py
@@ -26,7 +26,7 @@ def get(self, request, *args, **kwargs):
         client = Client(YOTI_CLIENT_SDK_ID, YOTI_FULL_KEY_FILE_PATH)
         activity_details = client.get_activity_details(request.GET['token'])
         context = activity_details.user_profile
-        self.save_image(activity_details.user_profile.get('selfie'))
+        self.save_image(context.get('selfie'))
         return self.render_to_response(context)
 
     @staticmethod
diff --git a/examples/yoti_example_flask/.env.example b/examples/yoti_example_flask/.env.example
@@ -0,0 +1,3 @@
+YOTI_APPLICATION_ID=
+YOTI_CLIENT_SDK_ID=
+YOTI_KEY_FILE_PATH=
diff --git a/examples/yoti_example_flask/app.py b/examples/yoti_example_flask/app.py
@@ -1,7 +1,13 @@
+import os
+from os.path import join, dirname
+from binascii import a2b_base64
+from dotenv import load_dotenv
 from flask import Flask, render_template, request
-
 from yoti_python_sdk import Client
 
+dotenv_path = join(dirname(__file__), '.env')
+load_dotenv(dotenv_path)
+
 from settings import (
     YOTI_APPLICATION_ID,
     YOTI_CLIENT_SDK_ID,
@@ -10,6 +16,13 @@
 
 app = Flask(__name__)
 
+def save_image(base64_uri):
+    base64_data_stripped = base64_uri[base64_uri.find(",")+1:]
+    binary_data = a2b_base64(base64_data_stripped)
+    upload_path = os.path.join(app.root_path, 'static', 'YotiSelfie.jpg')
+    fd = open(upload_path, 'wb')
+    fd.write(binary_data)
+    fd.close()
 
 @app.route('/')
 def index():
@@ -21,9 +34,9 @@ def auth():
     client = Client(YOTI_CLIENT_SDK_ID, YOTI_FULL_KEY_FILE_PATH)
     activity_details = client.get_activity_details(request.args['token'])
     user_profile = activity_details.user_profile
+    save_image(user_profile.get('selfie'))
     return render_template('profile.html',
                            **user_profile)
 
-
 if __name__ == '__main__':
     app.run(debug=True)
diff --git a/examples/yoti_example_flask/static/.keep b/examples/yoti_example_flask/static/.keep
diff --git a/examples/yoti_example_flask/templates/profile.html b/examples/yoti_example_flask/templates/profile.html
@@ -2,56 +2,81 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>PROFILE</title>
+    <title>Yoti Profile</title>
 </head>
 <body>
     <h3><a href="/">Home</a></h3>
     <table>
         {% if user_id %}
             <tr>
-                <td>USER ID:</td>
+                <td>User ID:</td>
                 <td>{{user_id}}</td>
             </tr>
         {% endif %}
 
         {% if selfie %}
             <tr>
-                <td>SELFIE:</td>
-                <td><img width="200" alt="photo" src="{{selfie}}" /></td>
+                <td>Selfie in base64 format:</td>
+                <td><img width="200" alt="base64photo" src="{{selfie}}" /></td>
+            </tr>
+            <tr>
+                <td>Selfie from saved image:</td>
+                <td><img width="200" alt="saved image" src="/static/YotiSelfie.jpg" /></td>
+            </tr>
+        {% endif %}
+
+        {% if given_names %}
+            <tr>
+                <td>Given Names:</td>
+                <td>{{given_names}}</td>
+            </tr>
+        {% endif %}
+
+        {% if family_name %}
+            <tr>
+                <td>Family Name:</td>
+                <td>{{family_name}}</td>
+            </tr>
+        {% endif %}
+
+        {% if phone_number %}
+            <tr>
+                <td>Phone Number:</td>
+                <td>{{phone_number}}</td>
             </tr>
         {% endif %}
 
-        {% if phone %}
+        {% if date_of_birth %}
             <tr>
-                <td>PHONE:</td>
-                <td>{{phone}}</td>
+                <td>Date of Birth:</td>
+                <td>{{date_of_birth}}</td>
             </tr>
         {% endif %}
 
-        {% if names %}
+        {% if postal_address %}
             <tr>
-                <td>NAMES:</td>
-                <td>{{names}}</td>
+                <td>Postal Address:</td>
+                <td>{{postal_address}}</td>
             </tr>
         {% endif %}
 
-        {% if birthdate %}
+        {% if email_address %}
             <tr>
-                <td>DATE OF BIRTH</td>
-                <td>{{birthdate}}</td>
+                <td>Email Address:</td>
+                <td>{{email_address}}</td>
             </tr>
         {% endif %}
 
         {% if nationality %}
             <tr>
-                <td>NATIONALITY</td>
+                <td>NATIONALITY:</td>
                 <td>{{nationality}}</td>
             </tr>
         {% endif %}
 
         {% if gender %}
             <tr>
-                <td>GENDER</td>
+                <td>GENDER:</td>
                 <td>{{gender}}</td>
             </tr>
         {% endif %}
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
     install_requires=['cryptography>=1.4', 'protobuf>=3.0.0',
                       'requests>=2.0.0', 'future>=0.11.0'],
     extras_require={
-        'examples': ['Django>=1.9', 'Flask>=0.10'],
+        'examples': ['Django>=1.9', 'Flask>=0.10', 'python-dotenv>=0.7.1'],
     },
     classifiers=[
         'Development Status :: 5 - Production/Stable',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+YOTI_APPLICATION_ID=`
	`2`	`+YOTI_CLIENT_SDK_ID=`
	`3`	`+YOTI_KEY_FILE_PATH=`