Refactor aiogram/utils/auth_widget.py

+ fix check auth widget token in BaseBot, fix tests

tests/test_bot/test_api.py

@@ -0,0 +1,18 @@
+import pytest
+from aiogram.bot.api import check_token
+
+from aiogram.utils.exceptions import ValidationError
+
+
+VALID_TOKEN = '123456789:AABBCCDDEEFFaabbccddeeff-1234567890'
+INVALID_TOKEN = '123456789:AABBCCDDEEFFaabbccddeeff 123456789'  # Space in token and wrong length
+
+
+class Test_check_token:
+
+    def test_valid(self):
+        assert check_token(VALID_TOKEN) is True
+
+    def test_invalid_token(self):
+        with pytest.raises(ValidationError):
+            check_token(INVALID_TOKEN)

tests/test_token.py

@@ -1,41 +0,0 @@
-import pytest
-
-from aiogram.bot import api
-from aiogram.utils import auth_widget, exceptions
-
-VALID_TOKEN = '123456789:AABBCCDDEEFFaabbccddeeff-1234567890'
-INVALID_TOKEN = '123456789:AABBCCDDEEFFaabbccddeeff 123456789'  # Space in token and wrong length
-
-VALID_DATA = {
-    'date': 1525385236,
-    'first_name': 'Test',
-    'last_name': 'User',
-    'id': 123456789,
-    'username': 'username',
-    'hash': '69a9871558fbbe4cd0dbaba52fa1cc4f38315d3245b7504381a64139fb024b5b'
-}
-INVALID_DATA = {
-    'date': 1525385237,
-    'first_name': 'Test',
-    'last_name': 'User',
-    'id': 123456789,
-    'username': 'username',
-    'hash': '69a9871558fbbe4cd0dbaba52fa1cc4f38315d3245b7504381a64139fb024b5b'
-}
-
-
-def test_valid_token():
-    assert api.check_token(VALID_TOKEN)
-
-
-def test_invalid_token():
-    with pytest.raises(exceptions.ValidationError):
-        api.check_token(INVALID_TOKEN)
-
-
-def test_widget():
-    assert auth_widget.check_token(VALID_DATA, VALID_TOKEN)
-
-
-def test_invalid_widget_data():
-    assert not auth_widget.check_token(INVALID_DATA, VALID_TOKEN)

tests/test_utils/test_auth_widget.py

@@ -0,0 +1,46 @@
+import pytest
+
+from aiogram.utils.auth_widget import check_integrity, \
+    generate_hash, check_token
+
+TOKEN = '123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11'
+
+
+@pytest.fixture
+def data():
+    return {
+        'id': '42',
+        'first_name': 'John',
+        'last_name': 'Smith',
+        'username': 'username',
+        'photo_url': 'https://t.me/i/userpic/320/picname.jpg',
+        'auth_date': '1565810688',
+        'hash': 'c303db2b5a06fe41d23a9b14f7c545cfc11dcc7473c07c9c5034ae60062461ce',
+    }
+
+
+def test_generate_hash(data):
+    res = generate_hash(data, TOKEN)
+    assert res == data['hash']
+
+
+class Test_check_token:
+    """
+    This case gonna be deleted
+    """
+    def test_ok(self, data):
+        assert check_token(data, TOKEN) is True
+
+    def test_fail(self, data):
+        data.pop('username')
+        assert check_token(data, TOKEN) is False
+
+
+class Test_check_integrity:
+
+    def test_ok(self, data):
+        assert check_integrity(TOKEN, data) is True
+
+    def test_fail(self, data):
+        data.pop('username')
+        assert check_integrity(TOKEN, data) is False