[SDK-165]: Removed login button helper functions from Example projects, as these are now defunct.

Author: echarrod

examples/yoti_example_django/yoti_example/templates/index.html

@@ -11,17 +11,13 @@
     <!-- Your website content -->
 
     <!-- This span will create the Yoti button -->
-    <span
-        data-yoti-application-id="{{ app_id }}"
-        data-size="small"
-    >
+    <span data-yoti-application-id="{{app_id}}">
         Log in with Yoti
     </span>
 
-    <!-- This script snippet will also be required in your HTML body during the early pilot period -->
+    <!-- This script snippet will also be required in your HTML body -->
     <script>
-        _ybg.config.service = 'https://www.yoti.com/connect/';
-        _ybg.init();
+        _ybg.init()
     </script>
 </body>
 </html>

examples/yoti_example_django/yoti_example/views.py

@@ -1,8 +1,7 @@
 from binascii import a2b_base64
+from os.path import join, dirname
 
 from django.views.generic import TemplateView
-
-from os.path import join, dirname
 from dotenv import load_dotenv
 
 dotenv_path = join(dirname(__file__), '.env')

examples/yoti_example_flask/templates/index.html

@@ -11,17 +11,13 @@
     <!-- Your website content -->
 
     <!-- This span will create the Yoti button -->
-    <span
-        data-yoti-application-id="{{ app_id }}"
-        data-size="small"
-    >
+    <span data-yoti-application-id="{{app_id}}">
         Log in with Yoti
     </span>
 
-    <!-- This script snippet will also be required in your HTML body during the early pilot period -->
+    <!-- This script snippet will also be required in your HTML body -->
     <script>
-        _ybg.config.service = 'https://www.yoti.com/connect/';
-        _ybg.init();
+        _ybg.init()
     </script>
 </body>
 </html>

plugins/django_yoti/README.md

@@ -17,13 +17,12 @@ INSTALLED_APPS = [
 ]
 ```
 
-* Django Yoti plugin provides the following template context vars:
+* Django Yoti plugin provides the following template context var:
     - `yoti_application_id`
-    - `yoti_login_button_*`
 
 * If you're using a Django template backend that supports context processors
 like default DTL (Django Template Language) and want to use context tags
-inside your template (e.g. `{{ yoti_login_button_*}}`), then you should
+inside your template (e.g. `{{yoti_application_id}}`), then you should
 include `django_yoti`'s context processors into your templates
 configuration like this:
 ```python
@@ -106,7 +105,6 @@ YOTI = {
     ...
     'YOTI_LOGIN_VIEW': '...',
     'YOTI_REDIRECT_TO': '...',
-    'YOTI_LOGIN_BUTTON_LABEL': '...',
 }
 ```
 * **`YOTI_LOGIN_VIEW`**<br>
@@ -159,13 +157,12 @@ Your Yoti application's callback URL should point to `your_site.com/yoti/auth`.
 ## Using plugin ##
 
 1. First you need to add a login button to some of your view's templates.
-- You can do it by using one of the predefined login buttons:
+- You can do it by using the predefined login button:
+```HTML
+<span data-yoti-application-id="{{app_id}}">
+    Log in with Yoti
+</span>
 ```
-{{ yoti_login_button_sm }}
-{{ yoti_login_button_md }}
-{{ yoti_login_button_lg }}
-```
-- or with a default one `{{ yoti_login_button }}`<br>
 
 By clicking this button, user will be redirected to the Yoti Authentication page.
 

plugins/django_yoti/django_yoti/context_processors.py

@@ -1,20 +1,8 @@
-from .login_button import get_login_button_html
 from .settings import YOTI_APPLICATION_ID
 
 
 def yoti_context(request=None):
-    context = login_button_context()
-    context.update(application_context())
-    return context
-
-
-def login_button_context():
-    return {
-        'yoti_login_button': get_login_button_html,
-        'yoti_login_button_sm': get_login_button_html('small'),
-        'yoti_login_button_md': get_login_button_html('medium'),
-        'yoti_login_button_lg': get_login_button_html('large')
-    }
+    return application_context()
 
 
 def application_context():

plugins/django_yoti/django_yoti/login_button.py

@@ -20,14 +20,11 @@ def _get_parameter(name, required=True):
 
 YOTI_REDIRECT_TO = GLOBAL_YOTI_SETTINGS.get('YOTI_REDIRECT_TO', 'yoti_profile')
 YOTI_LOGIN_VIEW = GLOBAL_YOTI_SETTINGS.get('YOTI_LOGIN_VIEW', 'yoti_login')
-YOTI_LOGIN_BUTTON_LABEL = GLOBAL_YOTI_SETTINGS.get('YOTI_LOGIN_BUTTON_LABEL',
-                                                   'Log in with Yoti')
 
 __all__ = [
     'YOTI_APPLICATION_ID',
     'YOTI_CLIENT_SDK_ID',
     'YOTI_KEY_FILE_PATH',
     'YOTI_REDIRECT_TO',
     'YOTI_LOGIN_VIEW',
-    'YOTI_LOGIN_BUTTON_LABEL',
 ]

plugins/django_yoti/django_yoti/settings.py

@@ -11,12 +11,13 @@
     <!-- Your website content -->
 
     <!-- This span will create the Yoti button -->
-    <div>Button: {{ yoti_login_button }}</div>
+    <span data-yoti-application-id="{{app_id}}">
+        Log in with Yoti
+    </span>
 
-    <!-- This script snippet will also be required in your HTML body during the early pilot period -->
+    <!-- This script snippet will also be required in your HTML body -->
     <script>
-        _ybg.config.service = 'https://www.yoti.com/connect/';
-        _ybg.init();
+        _ybg.init()
     </script>
 </body>
 </html>

plugins/django_yoti/django_yoti/templates/login_button.html

@@ -1,7 +1,6 @@
 from django.test import TestCase
 
 from ..context_processors import yoti_context
-from ..login_button import get_login_button_html
 
 
 class TestContextProcessors(TestCase):
@@ -11,37 +10,13 @@ def setUp(self):
             'YOTI_APPLICATION_ID': '01234567-8901-2345-6789-012345678901',
             'YOTI_CLIENT_SDK_ID': '01234567-8901-2345-6789-012345678901',
             'YOTI_KEY_FILE_PATH': '/home/user/.ssh/yoti_key.pem',
-            'YOTI_LOGIN_BUTTON_LABEL': 'Test label'
         }
 
     def test_yoti_context(self):
-        keys = ('yoti_application_id',
-                'yoti_login_button', 'yoti_login_button_sm',
-                'yoti_login_button_md', 'yoti_login_button_lg')
-        self.assertEqual(set(self.context.keys()), set(keys))
+        application_id_key = 'yoti_application_id'
+        self.assert_(application_id_key in self.context.keys())
 
     def test_application_id(self):
         app_id = self.context.get('yoti_application_id')
         expected_app_id = self.defaults.get('YOTI_APPLICATION_ID')
         self.assertEqual(app_id, expected_app_id)
-
-    def test_predefined_login_buttons(self):
-        context = self.context
-        self.assertIn('data-size="small"', context.get('yoti_login_button_sm'))
-        self.assertIn('data-size="medium"', context.get('yoti_login_button_md'))
-        self.assertIn('data-size="large"', context.get('yoti_login_button_lg'))
-
-    def test_login_button_func(self):
-        app_id = self.defaults.get('YOTI_APPLICATION_ID')
-        button_label = self.defaults.get('YOTI_LOGIN_BUTTON_LABEL')
-        login_button_func = self.context.get('yoti_login_button')
-        self.assertTrue(hasattr(login_button_func, '__call__'))
-        button_html = login_button_func(text=button_label)
-        expected = '<span data-yoti-application-id="{0}" >' \
-                   '{1}</span>'.format(app_id, button_label)
-        self.assertEqual(button_html, expected)
-
-    def test_context_login_button_func_with_different_sizes(self):
-        for size in ('small', 'medium', 'large'):
-            button_html = get_login_button_html(size)
-            self.assertIn('data-size="{0}"'.format(size), button_html)