fixes #3

Author: brunsgaard

models.py

@@ -6,19 +6,22 @@
 from core import db
 import bcrypt
 
+
 class User(db.Model):
     """ User which will be querying resources from the API.
 
     :param db.Model: Base class for database models.
     """
-    id       = db.Column(db.Integer, primary_key=True)
+
+    id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(40), unique=True)
-    hashpw   = db.Column(db.String(80))
+    hashpw = db.Column(db.String(80))
 
     @staticmethod
     def find_with_password(username, password, *args, **kwargs):
-        """ Query the User collection for a record with matching username and password hash.
-        If only a username is supplied, find the first matching document with that username.
+        """ Query the User collection for a record with matching username and
+        password hash. If only a username is supplied, find the first matching
+        document with that username.
 
         :param username: Username of the user.
         :param password: Password of the user.
@@ -28,8 +31,11 @@ def find_with_password(username, password, *args, **kwargs):
         user = User.query.filter_by(username=username).first()
         if user and password:
             encodedpw = password.encode('utf-8')
-            userhash  = user.hashpw.encode('utf-8')
-            return User.query.filter(User.username == username, User.hashpw == bcrypt.hashpw(encodedpw, userhash)).first()
+            userhash = user.hashpw.encode('utf-8')
+            return User.query.filter(
+                User.username == username,
+                User.hashpw == bcrypt.hashpw(encodedpw, userhash)
+            ).first()
         else:
             return user
 
@@ -113,7 +119,7 @@ def find(id):
     def delete(self):
         """ Delete existing token. """
         db.session.delete(self)
-        db.session(commit)
+        db.session.commit()
         return self
 
     @staticmethod
@@ -144,16 +150,17 @@ class Token(db.Model):
 
         :param db.Model: Base class for database models.
     """
-    id            = db.Column(db.Integer, primary_key=True)
-    client_id     = db.Column(db.String(40), db.ForeignKey('client.client_id'), nullable=False)
-    client        = db.relationship('Client')
-    user_id       = db.Column(db.Integer, db.ForeignKey('user.id'))
-    user          = db.relationship('User')
-    token_type    = db.Column(db.String(40))
-    access_token  = db.Column(db.String(255), unique=True)
+    id = db.Column(db.Integer, primary_key=True)
+    client_id = db.Column(db.String(40), db.ForeignKey('client.client_id'),
+                          nullable=False)
+    client = db.relationship('Client')
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+    user = db.relationship('User')
+    token_type = db.Column(db.String(40))
+    access_token = db.Column(db.String(255), unique=True)
     refresh_token = db.Column(db.String(255), unique=True)
-    expires       = db.Column(db.DateTime)
-    scopes        = ['']
+    expires = db.Column(db.DateTime)
+    scopes = ['']
 
     @staticmethod
     def find(access_token=None, refresh_token=None):
@@ -172,8 +179,10 @@ def find(access_token=None, refresh_token=None):
     def save(token, request, *args, **kwargs):
         """ Save a new token to the database.
 
-        :param token: Token dictionary containing access and refresh tokens, plus token type.
-        :param request: Request dictionary containing information about the client and user.
+        :param token: Token dictionary containing access and refresh tokens,
+            plus token type.
+        :param request: Request dictionary containing information about the
+            client and user.
         :param *args: Variable length argument list.
         :param **kwargs: Arbitrary keyword arguments.
         """
@@ -186,7 +195,7 @@ def save(token, request, *args, **kwargs):
         [db.session.delete(t) for t in toks]
 
         expires_in = token.pop('expires_in')
-        expires    = datetime.utcnow() + timedelta(seconds=expires_in)
+        expires = datetime.utcnow() + timedelta(seconds=expires_in)
 
         tok = Token(
             access_token=token['access_token'],

validator.py

@@ -7,10 +7,10 @@
 
 class MyRequestValidator(OAuth2RequestValidator):
     """ Defines a custom OAuth2 Request Validator based on the Client, User
-	and Token models.
+        and Token models.
 
-	:param OAuth2RequestValidator: Overrides the OAuth2RequestValidator.
-	"""
+        :param OAuth2RequestValidator: Overrides the OAuth2RequestValidator.
+    """
     def __init__(self):
         self._clientgetter = Client.find
         self._usergetter = User.find_with_password

views.py

@@ -7,35 +7,42 @@
 
 yoloapi = Blueprint('yoloApi', __name__)
 
+
 @yoloapi.route('/oauth/token', methods=['POST'])
 @oauth.token_handler
 def access_token(*args, **kwargs):
     """ This endpoint is for exchanging/refreshing an access token.
 
-    Returns a dictionary or None as the extra credentials for creating the token response.
+    Returns a dictionary or None as the extra credentials for creating the
+    token response.
 
     :param *args: Variable length argument list.
     :param **kwargs: Arbitrary keyword arguments.
     """
     return None
 
+
 @yoloapi.route('/oauth/revoke', methods=['POST'])
 @oauth.revoke_handler
 def revoke_token():
     """ This endpoint allows a user to revoke their access token."""
     pass
 
+
 @yoloapi.route('/', methods=['GET', 'POST'])
 def management():
     """ This endpoint is for vieweing and adding users and clients. """
     if request.method == 'POST' and request.form['submit'] == 'Add User':
         User.save(request.form['username'], request.form['password'])
     if request.method == 'POST' and request.form['submit'] == 'Add Client':
         Client.generate()
-    return render_template('management.html', users=User.all(), clients=Client.all())
+    return render_template('management.html', users=User.all(),
+                           clients=Client.all())
+
 
 @yoloapi.route('/yolo')
 @oauth.require_oauth()
 def yolo():
     """ This is an example endpoint we are trying to protect. """
-    return "YOLO! Congraulations, you made it through and accessed the protected resource!"
+    return "YOLO! Congraulations, you made it through and accessed the " \
+        "protected resource!"