API - update OAuth2 scopes

fittrackee/oauth2/client.py

@@ -3,28 +3,37 @@ from typing import Dict
 
 from werkzeug.security import gen_salt
 
-from fittrackee.oauth2.models import OAuth2Client
 from fittrackee.users.models import User
 
-DEFAULT_SCOPE = 'read'
-VALID_SCOPES = ['read', 'write']
+from .exceptions import InvalidOAuth2Scopes
+from .models import OAuth2Client
+
+VALID_SCOPES = [
+    'application:write',
+    'profile:read',
+    'profile:write',
+    'users:read',
+    'users:write',
+    'workouts:read',
+    'workouts:write',
+]
 
 
 def check_scope(scope: str) -> str:
     """
     Verify if provided scope is valid.
-    If not, it returns the default scope ('read').
     """
-    valid_scopes = []
     if not isinstance(scope, str) or not scope:
-        return DEFAULT_SCOPE
+        raise InvalidOAuth2Scopes()
 
+    valid_scopes = []
     scopes = scope.split()
     for value in scopes:
         if value in VALID_SCOPES:
             valid_scopes.append(value)
-    if len(valid_scopes) == 0:
-        valid_scopes.append(DEFAULT_SCOPE)
+
+    if not valid_scopes:
+        raise InvalidOAuth2Scopes()
 
     return ' '.join(valid_scopes)
 

fittrackee/oauth2/exceptions.py

@@ -0,0 +1,2 @@
+class InvalidOAuth2Scopes(Exception):
+    ...

fittrackee/oauth2/routes.py

@@ -5,8 +5,6 @@ from flask import Blueprint, Response, request
 from urllib3.util import parse_url
 
 from fittrackee import db
-from fittrackee.oauth2.models import OAuth2Client, OAuth2Token
-from fittrackee.oauth2.server import require_auth
 from fittrackee.responses import (
     HttpResponse,
     InvalidPayloadErrorResponse,
@@ -15,7 +13,9 @@ from fittrackee.responses import (
 from fittrackee.users.models import User
 
 from .client import create_oauth_client
-from .server import authorization_server
+from .exceptions import InvalidOAuth2Scopes
+from .models import OAuth2Client, OAuth2Token
+from .server import authorization_server, require_auth
 
 oauth_blueprint = Blueprint('oauth', __name__)
 
@@ -86,7 +86,13 @@ def create_client(auth_user: User) -> Union[HttpResponse, Tuple[Dict, int]]:
             )
         )
 
-    new_client = create_oauth_client(client_metadata, auth_user)
+    try:
+        new_client = create_oauth_client(client_metadata, auth_user)
+    except InvalidOAuth2Scopes:
+        return InvalidPayloadErrorResponse(
+            message=('OAuth client invalid scopes')
+        )
+
     db.session.add(new_client)
     db.session.commit()
     return (
@@ -134,10 +140,10 @@ def get_client_by_id(
     return get_client(auth_user, client_id=client_id, client_client_id=None)
 
 
-@oauth_blueprint.route('/oauth/apps/<string:client_id>', methods=['DELETE'])
+@oauth_blueprint.route('/oauth/apps/<int:client_id>', methods=['DELETE'])
 @require_auth()
 def delete_client(
-    auth_user: User, client_id: str
+    auth_user: User, client_id: int
 ) -> Union[Tuple[Dict, int], HttpResponse]:
     client = OAuth2Client.query.filter_by(
         id=client_id,