Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Check for user agent of wger's Android version and hide persona

Roland Geider4d8852bbc20e
diff --git a/wger/manager/templates/mobile/user/login.html b/wger/manager/templates/mobile/user/login.html
index d17b61292..a744688ca 100644
--- a/wger/manager/templates/mobile/user/login.html
+++ b/wger/manager/templates/mobile/user/login.html
@@ -32,7 +32,7 @@
</table>
</form>
-{% if not is_amazon %}
+{% if not hide_persona %}
<div style="text-align:center;">
<h3>— {% trans "or" %} —</h3>
<div style="padding-top:1em;"></div>
diff --git a/wger/manager/templates/user/login.html b/wger/manager/templates/user/login.html
index 636bd9672..5c12d1155 100644
--- a/wger/manager/templates/user/login.html
+++ b/wger/manager/templates/user/login.html
@@ -34,7 +34,7 @@
</table>
</form>
-{% if not is_amazon %}
+{% if not hide_persona %}
<div style="text-align:center;">
<h3>— {% trans "or" %} —</h3>
<div style="padding-top:1em;"></div>
diff --git a/wger/manager/views/user.py b/wger/manager/views/user.py
index 083e7ce97..aa5f41b8d 100644
--- a/wger/manager/views/user.py
+++ b/wger/manager/views/user.py
@@ -40,7 +40,7 @@ from wger.manager.forms import UserPreferencesForm
from wger.manager.forms import UserEmailForm
from wger.manager.forms import RegistrationForm
from wger.utils.constants import USER_TAB
-from wger.utils.user_agents import check_request_amazon
+from wger.utils.user_agents import check_request_amazon, check_request_android
logger = logging.getLogger('wger.custom')
@@ -50,7 +50,7 @@ def login(request):
Small wrapper around the django login view
'''
- context = {'is_amazon': check_request_amazon(request),
+ context = {'hide_persona': check_request_amazon(request) or check_request_android(request),
'active_tab': USER_TAB}
return django_loginview(request,
template_name='user/login.html',
diff --git a/wger/utils/tests/test_user_agents.py b/wger/utils/tests/test_user_agents.py
index 0445d0725..4e5aef6be 100644
--- a/wger/utils/tests/test_user_agents.py
+++ b/wger/utils/tests/test_user_agents.py
@@ -20,7 +20,7 @@ from wger.utils import user_agents
class AmazonUserAgentTestCase(WorkoutManagerTestCase):
'''
- Tests the amazon WebApp testcase
+ Tests the amazon WebApp user agent detector
'''
def test_user_agent_3rd_generation(self):
@@ -86,3 +86,54 @@ class AmazonUserAgentTestCase(WorkoutManagerTestCase):
agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like "\
"Gecko) Chrome/32.0.1664.3 Safari/537.36"
self.assertFalse(user_agents.is_amazon_webview(agent))
+
+
+class AndroidUserAgentTestCase(WorkoutManagerTestCase):
+ '''
+ Tests the android WebApp user agent detector
+
+ https://developers.google.com/chrome/mobile/docs/webview/overview
+ '''
+
+ def test_user_agent_old_ua(self):
+ '''
+ Tests the old webview user agent
+ '''
+
+ agent = "Mozilla/5.0 (Linux; U; Android 4.1.1; en-gb; Build/KLP) AppleWebKit/534.30 "\
+ "(KHTML, like Gecko) Version/4.0 Safari/534.30 WgerAndroidWebApp"
+ self.assertTrue(user_agents.is_android_webview(agent))
+
+ def test_user_agent_new_ua(self):
+ '''
+ Tests the old webview user agent
+ '''
+
+ agent = "Mozilla/5.0 (Linux; Android 4.4; Nexus 5 Build/BuildID) AppleWebKit/537.36 "\
+ "(KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 "\
+ "WgerAndroidWebApp"
+ self.assertTrue(user_agents.is_android_webview(agent))
+
+ def test_user_agent_firefox(self):
+ '''
+ Tests vanilla firefox user agent
+ '''
+
+ agent = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:24.0) Gecko/20100101 Firefox/24.0"
+ self.assertFalse(user_agents.is_android_webview(agent))
+
+ agent = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0"
+ self.assertFalse(user_agents.is_android_webview(agent))
+
+ def test_user_agent_chrome(self):
+ '''
+ Tests vanilla chrome user agent
+ '''
+
+ agent = "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko)"\
+ "Chrome/32.0.1667.0 Safari/537.36"
+ self.assertFalse(user_agents.is_android_webview(agent))
+
+ agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like "\
+ "Gecko) Chrome/32.0.1664.3 Safari/537.36"
+ self.assertFalse(user_agents.is_android_webview(agent))
diff --git a/wger/utils/user_agents.py b/wger/utils/user_agents.py
index d529c96b6..b444b46cb 100644
--- a/wger/utils/user_agents.py
+++ b/wger/utils/user_agents.py
@@ -39,8 +39,32 @@ def check_request_amazon(request):
:param request:
:return: boolean
'''
- print request.META.get('HTTP_USER_AGENT')
if request.META.get('HTTP_USER_AGENT'):
return is_amazon_webview(request.META.get('HTTP_USER_AGENT'))
else:
return False
+
+
+def is_android_webview(user_agent):
+ '''
+ Check if the client is an Android WebView.
+
+ :param user_agent A string with the user agent to check
+ :return boolean
+ '''
+ if 'wgerandroidwebapp' in user_agent.lower():
+ return True
+ else:
+ return False
+
+
+def check_request_android(request):
+ '''
+
+ :param request:
+ :return: boolean
+ '''
+ if request.META.get('HTTP_USER_AGENT'):
+ return is_android_webview(request.META.get('HTTP_USER_AGENT'))
+ else:
+ return False