Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API - refacto

Browse Source
This commit is contained in:
Sam
2022-06-19 20:04:42 +02:00
parent 6b497bd72f
commit 63af0b70d9
19 changed files with 119 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fittrackee/tests/oauth2/test_oauth2_clean.py
View File

@ -13,7 +13,7 @@ class TestOAuth2CleanTokens(OAuth2Mixin):
def test_it_does_not_delete_not_expired_token(
self, app: Flask, user_1: User
) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
self.create_oauth2_token(oauth_client)
clean_tokens(days=1)
@ -21,7 +21,7 @@ class TestOAuth2CleanTokens(OAuth2Mixin):
assert OAuth2Token.query.count() == 1
def test_it_deletes_expired_token(self, app: Flask, user_1: User) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
expires_in = 864000 # 10 days
days = 5
self.create_oauth2_token(
@ -37,7 +37,7 @@ class TestOAuth2CleanTokens(OAuth2Mixin):
def test_it_returns_deleted_rows_count(
self, app: Flask, user_1: User
) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
expires_in = 86400 # 10 days
days = 5
expected_deleted_rows = 3

32
fittrackee/tests/oauth2/test_oauth2_client.py
View File

@ -5,7 +5,7 @@ from unittest.mock import patch
import pytest
from flask import Flask
from fittrackee.oauth2.client import check_scope, create_oauth_client
from fittrackee.oauth2.client import check_scope, create_oauth2_client
from fittrackee.oauth2.exceptions import InvalidOAuth2Scopes
from fittrackee.oauth2.models import OAuth2Client
from fittrackee.users.models import User
@ -22,7 +22,7 @@ TEST_METADATA = {
class TestCreateOAuth2Client:
def test_it_creates_oauth_client(self, app: Flask, user_1: User) -> None:
oauth_client = create_oauth_client(TEST_METADATA, user_1)
oauth_client = create_oauth2_client(TEST_METADATA, user_1)
assert isinstance(oauth_client, OAuth2Client)
@ -34,7 +34,7 @@ class TestCreateOAuth2Client:
'fittrackee.oauth2.client.gen_salt', return_value=client_id
):
oauth_client = create_oauth_client(TEST_METADATA, user_1)
oauth_client = create_oauth2_client(TEST_METADATA, user_1)
assert oauth_client.client_id == client_id
@ -45,7 +45,7 @@ class TestCreateOAuth2Client:
with patch(
'fittrackee.oauth2.client.time', return_value=client_id_issued_at
):
oauth_client = create_oauth_client(TEST_METADATA, user_1)
oauth_client = create_oauth2_client(TEST_METADATA, user_1)
assert oauth_client.client_id_issued_at == client_id_issued_at
@ -55,14 +55,14 @@ class TestCreateOAuth2Client:
client_name = random_string()
client_metadata: Dict = {**TEST_METADATA, 'client_name': client_name}
oauth_client = create_oauth_client(client_metadata, user_1)
oauth_client = create_oauth2_client(client_metadata, user_1)
assert oauth_client.client_name == client_name
def test_oauth_client_has_no_description_when_not_provided_in_metadata(
self, app: Flask, user_1: User
) -> None:
oauth_client = create_oauth_client(TEST_METADATA, user_1)
oauth_client = create_oauth2_client(TEST_METADATA, user_1)
assert oauth_client.client_description is None
@ -75,7 +75,7 @@ class TestCreateOAuth2Client:
'client_description': client_description,
}
oauth_client = create_oauth_client(client_metadata, user_1)
oauth_client = create_oauth2_client(client_metadata, user_1)
assert oauth_client.client_description == client_description
@ -85,14 +85,14 @@ class TestCreateOAuth2Client:
client_uri = random_domain()
client_metadata: Dict = {**TEST_METADATA, 'client_uri': client_uri}
oauth_client = create_oauth_client(client_metadata, user_1)
oauth_client = create_oauth2_client(client_metadata, user_1)
assert oauth_client.client_uri == client_uri
def test_oauth_client_has_expected_grant_types(
self, app: Flask, user_1: User
) -> None:
oauth_client = create_oauth_client(TEST_METADATA, user_1)
oauth_client = create_oauth2_client(TEST_METADATA, user_1)
assert oauth_client.grant_types == [
'authorization_code',
@ -108,7 +108,7 @@ class TestCreateOAuth2Client:
'redirect_uris': redirect_uris,
}
oauth_client = create_oauth_client(client_metadata, user_1)
oauth_client = create_oauth2_client(client_metadata, user_1)
assert oauth_client.redirect_uris == redirect_uris
@ -121,7 +121,7 @@ class TestCreateOAuth2Client:
'response_types': response_types,
}
oauth_client = create_oauth_client(client_metadata, user_1)
oauth_client = create_oauth2_client(client_metadata, user_1)
assert oauth_client.response_types == ['code']
@ -131,7 +131,7 @@ class TestCreateOAuth2Client:
scope = 'workouts:write'
client_metadata: Dict = {**TEST_METADATA, 'scope': scope}
oauth_client = create_oauth_client(client_metadata, user_1)
oauth_client = create_oauth2_client(client_metadata, user_1)
assert oauth_client.scope == scope
@ -141,12 +141,12 @@ class TestCreateOAuth2Client:
client_metadata: Dict = {**TEST_METADATA, 'scope': random_string()}
with pytest.raises(InvalidOAuth2Scopes):
create_oauth_client(client_metadata, user_1)
create_oauth2_client(client_metadata, user_1)
def test_oauth_client_has_expected_token_endpoint_auth_method(
self, app: Flask, user_1: User
) -> None:
oauth_client = create_oauth_client(TEST_METADATA, user_1)
oauth_client = create_oauth2_client(TEST_METADATA, user_1)
assert oauth_client.token_endpoint_auth_method == 'client_secret_post'
@ -158,14 +158,14 @@ class TestCreateOAuth2Client:
'fittrackee.oauth2.client.gen_salt', return_value=client_secret
):
oauth_client = create_oauth_client(TEST_METADATA, user_1)
oauth_client = create_oauth2_client(TEST_METADATA, user_1)
assert oauth_client.client_secret == client_secret
def test_it_creates_oauth_client_for_given_user(
self, app: Flask, user_1: User
) -> None:
oauth_client = create_oauth_client(TEST_METADATA, user_1)
oauth_client = create_oauth2_client(TEST_METADATA, user_1)
assert oauth_client.user_id == user_1.id

8
fittrackee/tests/oauth2/test_oauth2_models.py
View File

@ -12,7 +12,7 @@ from ..mixins import OAuth2Mixin
class TestOAuth2ClientSerialize(OAuth2Mixin):
def test_it_returns_oauth_client(self, app: Flask, user_1: User) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
oauth_client.client_id_issued_at = 1653738796
serialized_oauth_client = oauth_client.serialize()
@ -71,7 +71,7 @@ class TestOAuth2Token(OAuth2Mixin):
input_expiration: int,
expected_status: bool,
) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
token = OAuth2Token(
client_id=oauth_client.client_id,
access_token=self.random_string(),
@ -85,7 +85,7 @@ class TestOAuth2Token(OAuth2Mixin):
def test_it_returns_refresh_token_active_when_below_twice_expiration(
self, app: Flask, user_1: User
) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
issued_at = int(time.time())
expires_in = self.random_int()
token = OAuth2Token(
@ -105,7 +105,7 @@ class TestOAuth2Token(OAuth2Mixin):
def test_it_returns_refresh_token_inactive_when_token_revoked(
self, app: Flask, user_1: User
) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
token = OAuth2Token(
client_id=oauth_client.client_id,
access_token=self.random_string(),

76
fittrackee/tests/oauth2/test_oauth2_routes.py
View File

@ -52,7 +52,7 @@ class TestOAuthClientCreation(ApiTestCaseMixin):
)
self.assert_400(
response, error_message='OAuth client metadata missing'
response, error_message='OAuth2 client metadata missing'
)
@pytest.mark.parametrize(
@ -82,7 +82,9 @@ class TestOAuthClientCreation(ApiTestCaseMixin):
self.assert_400(
response,
error_message=f'OAuth client metadata missing keys: {missing_key}',
error_message=(
f'OAuth2 client metadata missing keys: {missing_key}'
),
)
def test_it_returns_error_when_scope_is_invalid(
@ -106,7 +108,7 @@ class TestOAuthClientCreation(ApiTestCaseMixin):
self.assert_400(
response,
error_message=('OAuth client invalid scopes'),
error_message=('OAuth2 client invalid scopes'),
)
def test_it_creates_oauth_client(self, app: Flask, user_1: User) -> None:
@ -200,7 +202,7 @@ class TestOAuthClientAuthorization(ApiTestCaseMixin):
def test_it_returns_error_not_authenticated(
self, app: Flask, user_1: User
) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
client = app.test_client()
response = client.post(
@ -239,7 +241,7 @@ class TestOAuthClientAuthorization(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
response = client.post(
self.route,
@ -261,7 +263,7 @@ class TestOAuthClientAuthorization(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
client.post(
self.route,
@ -288,7 +290,7 @@ class TestOAuthClientAuthorization(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
client.post(
self.route,
@ -314,7 +316,7 @@ class TestOAuthClientAuthorization(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
response = client.post(
self.route,
@ -346,7 +348,7 @@ class TestOAuthClientAuthorization(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
response = client.post(
self.route,
@ -378,7 +380,7 @@ class TestOAuthClientAuthorizationWithCodeChallenge(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
code_verifier = generate_token(48)
code_challenge = create_s256_code_challenge(code_verifier)
@ -405,7 +407,7 @@ class TestOAuthClientAuthorizationWithCodeChallenge(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
code_verifier = generate_token(48)
code_challenge = create_s256_code_challenge(code_verifier)
@ -441,7 +443,7 @@ class OAuthIssueTokenTestCase(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
code = self.authorize_client(
client, oauth_client, auth_token, code_challenge=code_challenge
)
@ -513,7 +515,7 @@ class TestOAuthIssueAccessToken(OAuthIssueTokenTestCase):
def test_it_returns_error_when_client_not_authorized(
self, app: Flask, user_1: User
) -> None:
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
client = app.test_client()
response = client.post(
@ -697,7 +699,7 @@ class TestOAuthTokenRevocation(ApiTestCaseMixin):
oauth_client,
access_token,
_,
) = self.create_oauth_client_and_issue_token(app, user_1)
) = self.create_oauth2_client_and_issue_token(app, user_1)
response = client.post(
self.route,
@ -750,7 +752,7 @@ class TestOAuthGetClients(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
[self.create_oauth_client(user_1) for _ in range(7)]
[self.create_oauth2_client(user_1) for _ in range(7)]
response = client.get(
self.route,
@ -773,7 +775,7 @@ class TestOAuthGetClients(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
[self.create_oauth_client(user_1) for _ in range(6)]
[self.create_oauth2_client(user_1) for _ in range(6)]
response = client.get(
f'{self.route}?page=2',
@ -798,7 +800,7 @@ class TestOAuthGetClients(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
clients = [self.create_oauth_client(user_1) for _ in range(7)]
clients = [self.create_oauth2_client(user_1) for _ in range(7)]
response = client.get(
self.route,
@ -817,7 +819,7 @@ class TestOAuthGetClients(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
self.create_oauth_client(user_2)
self.create_oauth2_client(user_2)
response = client.get(
self.route,
@ -859,7 +861,7 @@ class TestOAuthGetClientById(ApiTestCaseMixin):
headers=dict(Authorization=f'Bearer {auth_token}'),
)
self.assert_404_with_message(response, 'OAuth client not found')
self.assert_404_with_message(response, 'OAuth2 client not found')
def test_it_returns_user_oauth_client(
self, app: Flask, user_1: User
@ -868,7 +870,7 @@ class TestOAuthGetClientById(ApiTestCaseMixin):
app, user_1.email
)
client_description = self.random_string()
oauth_client = self.create_oauth_client(
oauth_client = self.create_oauth2_client(
user_1,
metadata={
**TEST_OAUTH_CLIENT_METADATA,
@ -911,7 +913,7 @@ class TestOAuthGetClientById(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_2)
oauth_client = self.create_oauth2_client(user_2)
response = client.get(
self.route.format(client_id=oauth_client.id),
@ -919,7 +921,7 @@ class TestOAuthGetClientById(ApiTestCaseMixin):
headers=dict(Authorization=f'Bearer {auth_token}'),
)
self.assert_404_with_message(response, 'OAuth client not found')
self.assert_404_with_message(response, 'OAuth2 client not found')
class TestOAuthGetClientByClientId(ApiTestCaseMixin):
@ -950,7 +952,7 @@ class TestOAuthGetClientByClientId(ApiTestCaseMixin):
headers=dict(Authorization=f'Bearer {auth_token}'),
)
self.assert_404_with_message(response, 'OAuth client not found')
self.assert_404_with_message(response, 'OAuth2 client not found')
def test_it_returns_user_oauth_client(
self, app: Flask, user_1: User
@ -959,7 +961,7 @@ class TestOAuthGetClientByClientId(ApiTestCaseMixin):
app, user_1.email
)
client_description = self.random_string()
oauth_client = self.create_oauth_client(
oauth_client = self.create_oauth2_client(
user_1,
metadata={
**TEST_OAUTH_CLIENT_METADATA,
@ -1002,7 +1004,7 @@ class TestOAuthGetClientByClientId(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_2)
oauth_client = self.create_oauth2_client(user_2)
response = client.get(
self.route.format(client_id=oauth_client.client_id),
@ -1010,7 +1012,7 @@ class TestOAuthGetClientByClientId(ApiTestCaseMixin):
headers=dict(Authorization=f'Bearer {auth_token}'),
)
self.assert_404_with_message(response, 'OAuth client not found')
self.assert_404_with_message(response, 'OAuth2 client not found')
class TestOAuthDeleteClient(ApiTestCaseMixin):
@ -1041,7 +1043,7 @@ class TestOAuthDeleteClient(ApiTestCaseMixin):
headers=dict(Authorization=f'Bearer {auth_token}'),
)
self.assert_404_with_message(response, 'OAuth client not found')
self.assert_404_with_message(response, 'OAuth2 client not found')
def test_it_deletes_user_oauth_client(
self, app: Flask, user_1: User
@ -1049,7 +1051,7 @@ class TestOAuthDeleteClient(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
client_id = oauth_client.id
response = client.delete(
@ -1068,7 +1070,7 @@ class TestOAuthDeleteClient(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
self.authorize_client(client, oauth_client, auth_token)
client_id = oauth_client.id
@ -1088,7 +1090,7 @@ class TestOAuthDeleteClient(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
code = self.authorize_client(client, oauth_client, auth_token)
client_id = oauth_client.id
@ -1112,7 +1114,7 @@ class TestOAuthDeleteClient(ApiTestCaseMixin):
oauth_client,
access_token,
auth_token,
) = self.create_oauth_client_and_issue_token(app, user_1)
) = self.create_oauth2_client_and_issue_token(app, user_1)
client_id = oauth_client.id
response = client.delete(
@ -1131,7 +1133,7 @@ class TestOAuthDeleteClient(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_2)
oauth_client = self.create_oauth2_client(user_2)
client_id = oauth_client.id
response = client.delete(
@ -1140,7 +1142,7 @@ class TestOAuthDeleteClient(ApiTestCaseMixin):
headers=dict(Authorization=f'Bearer {auth_token}'),
)
self.assert_404_with_message(response, 'OAuth client not found')
self.assert_404_with_message(response, 'OAuth2 client not found')
client = OAuth2Client.query.filter_by(id=client_id).first()
assert client is not None
@ -1173,7 +1175,7 @@ class TestOAuthRevokeClientToken(ApiTestCaseMixin):
headers=dict(Authorization=f'Bearer {auth_token}'),
)
self.assert_404_with_message(response, 'OAuth client not found')
self.assert_404_with_message(response, 'OAuth2 client not found')
def test_it_revokes_all_client_tokens(
self, app: Flask, user_1: User
@ -1181,7 +1183,7 @@ class TestOAuthRevokeClientToken(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
tokens = [self.create_oauth2_token(oauth_client) for _ in range(3)]
response = client.post(
@ -1202,9 +1204,9 @@ class TestOAuthRevokeClientToken(ApiTestCaseMixin):
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
oauth_client = self.create_oauth_client(user_1)
oauth_client = self.create_oauth2_client(user_1)
client_id = oauth_client.id
another_client = self.create_oauth_client(user_1)
another_client = self.create_oauth2_client(user_1)
another_client_token = self.create_oauth2_token(another_client)
response = client.post(

4
fittrackee/tests/oauth2/test_oauth2_scopes.py
View File

@ -22,7 +22,7 @@ class TestOAuth2Scopes(ApiTestCaseMixin):
oauth_client,
access_token,
_,
) = self.create_oauth_client_and_issue_token(app, user_1, scope=scope)
) = self.create_oauth2_client_and_issue_token(app, user_1, scope=scope)
response = client.get(
endpoint_url,
@ -47,7 +47,7 @@ class TestOAuth2Scopes(ApiTestCaseMixin):
oauth_client,
access_token,
_,
) = self.create_oauth_client_and_issue_token(app, user_1, scope=scope)
) = self.create_oauth2_client_and_issue_token(app, user_1, scope=scope)
response = client.get(
endpoint_url,