feat: add endpoint for retrieving the user detail based on token

Pipfile

@@ -27,6 +27,7 @@ marshmallow-sqlalchemy = "*"
 bcrypt = "*"
 flask-cors = "*"
 webargs = "*"
+flask-wtf = "*"
 
 [requires]
 python_version = "3.7"

authserver/api/__init__.py

@@ -4,3 +4,4 @@
 from authserver.api.client import client_bp
 from authserver.api.oauth2 import oauth2_bp
 from authserver.api.role import role_bp
+from authserver.api.home import home_bp

authserver/api/home.py

@@ -0,0 +1,37 @@
+import json
+import requests
+from flask import Blueprint, render_template, request, redirect, url_for, session
+from wtforms import Form, StringField, PasswordField, validators
+
+from authserver.db import db, User, OAuth2Client
+
+home_bp = Blueprint('home_ep', __name__, static_folder='static', template_folder='templates', url_prefix='/')
+
+
+class LoginForm(Form):
+    username = StringField('Username', [validators.DataRequired(), validators.length(min=4, max=40)])
+    password = PasswordField('Password', [validators.DataRequired()])
+
+
+@home_bp.route('/', methods=['GET', 'POST'])
+def login():
+    form = LoginForm(request.form)
+    client_id = request.args.get('client_id')
+    return_to = request.args.get('return_to')
+    if request.method == 'GET':
+        if not client_id or not return_to:
+            return render_template('login.html', form=form)
+        else:
+            return render_template('login.html', client_id=client_id, return_to=return_to, form=form)
+    if form.validate():
+        username = form.username.data
+        password = form.password.data
+        user = User.query.filter_by(username=username).first()
+        if user and user.verify_password(password):
+            session['id'] = user.id
+            return redirect(return_to)
+        else:
+            if not client_id or not return_to:
+                return redirect(url_for('home_ep.login'))
+            else:
+                return redirect(url_for('home_ep.login', client_id=client_id, return_to=return_to))

authserver/api/oauth2.py

@@ -29,28 +29,12 @@ def current_user():
     return None
 
 
-@oauth2_bp.route('/login', methods=['GET', 'POST'])
-def login():
-    client_id = request.args.get('client_id')
-    return_to = request.args.get('return_to')
-    if request.method == 'GET':
-        return render_template('login.html', client_id=client_id, return_to=return_to)
-    username = request.form.get('username')
-    password = request.form.get('password')
-    user = User.query.filter_by(username=username).first()
-    if user and user.verify_password(password):
-        session['id'] = user.id
-        return redirect(return_to)
-    else:
-        return redirect(url_for('oauth2_ep.login', client_id=client_id, return_to=return_to))
-
-
 @oauth2_bp.route('/authorize', methods=['GET', 'POST'])
 def authorize():
     user = current_user()
     if not user:
         client_id = request.args.get('client_id')
-        return redirect(url_for('oauth2_ep.login', client_id=client_id, return_to=request.url))
+        return redirect(url_for('home_ep.login', client_id=client_id, return_to=request.url))
     if request.method == 'GET':
         try:
             grant = authorization.validate_consent_request(end_user=user)
@@ -91,26 +75,6 @@ def post(self):
         return authorization.create_endpoint_response('revocation')
 
 
-class RedirectResource(Resource):
-    """A User Resource.
-
-    This resource defines an Auth Service user who may have zero or more OAuth 2.0 clients
-    associated with their accounts.
-
-    """
-
-    def get(self):
-        try:
-            code = request.args.get('code')
-        except Exception:
-            code = None
-        if code:
-            # foo = requests.get('http://localhost:8000/oauth/token')
-            # print(foo.status_code)
-            return {'message': 'ok'}, 200
-
-
 oauth2_api = Api(oauth2_bp)
 oauth2_api.add_resource(CreateOAuth2TokenResource, '/token')
 oauth2_api.add_resource(RevokeOAuth2TokenResource, '/revoke')
-oauth2_api.add_resource(RedirectResource, '/redirect')

authserver/api/static/css/style.css

@@ -0,0 +1,8 @@
+body {
+  background-color:#333333;
+  font-family: 'Raleway', sans-serif;
+}
+
+label {
+  color: #ffffff;
+}

authserver/api/templates/_formhelpers.html

@@ -0,0 +1,20 @@
+{% macro render_field(field) %}
+<div class="form-row">
+  <div class="row">
+    <div class="col">
+      <label for="{{ field.name }}">{{ field.label }}</label>
+    </div>
+    <div class="col">
+      {{ field(**kwargs)|safe }}
+    </div>
+  </div>
+</div>
+{% if field.errors %}
+<ul class=errors>
+  {% for error in field.errors %}
+  <li>{{ error }}</li>
+  {% endfor %}
+</ul>
+{% endif %}
+</dd>
+{% endmacro %}

authserver/api/templates/login.html

@@ -1,13 +1,12 @@
 {% extends 'base.html' %}
 {% block content %}
-<form action="" method="post">
+{% from "_formhelpers.html" import render_field %}
+<form method="post">
     <div>
-        <label for="username">Username</label>
-        <input type="text" name="username" id="username">
+        {{ render_field(form.username) }}
     </div>
     <div>
-        <label for="password">Password</label>
-        <input type="password" name="password" id="password">
+        {{ render_field(form.password) }}
     </div>
     <br>
     <button>Sign In</button>

authserver/api/user.py

@@ -12,7 +12,7 @@
 from webargs import fields, validate
 from webargs.flaskparser import use_args, use_kwargs
 
-from authserver.db import DataTrust, DataTrustSchema, User, UserSchema, db, OAuth2Client
+from authserver.db import DataTrust, DataTrustSchema, User, UserSchema, db, OAuth2Client, OAuth2Token
 from authserver.utilities import ResponseBody, require_oauth
 
 POST_ARGS = {
@@ -23,6 +23,41 @@
 }
 
 
+class UserDetailResource(Resource):
+    """Details of the currently logged in user."""
+
+    @require_oauth()
+    def get(self):
+        try:
+            token = request.headers.get('authorization').split(' ')[1]
+        except Exception:
+            token = None
+
+        if token:
+            token_details = OAuth2Token.query.filter_by(access_token=token).first()
+            if token_details:
+                user_id = token_details.user_id
+                user = User.query.filter_by(id=user_id).first()
+                return {
+                    'id': user.id,
+                    'username': user.username,
+                    'firstname': user.firstname,
+                    'lastname': user.lastname,
+                    'organization': user.organization,
+                    'email_address': user.email_address,
+                    'telephone': user.telephone,
+                    'active': user.active,
+                    'data_trust_id': user.data_trust_id,
+                    'date_created': str(user.date_created),
+                    'date_last_updated': str(user.date_last_updated)
+                }
+
+        return {
+            'firstname': 'Unknown',
+            'lastname': 'Unknown'
+        }
+
+
 class UserResource(Resource):
     """A User Resource.
 
@@ -177,3 +212,4 @@ def _db_commit(self):
 user_bp = Blueprint('user_ep', __name__)
 user_api = Api(user_bp)
 user_api.add_resource(UserResource, '/users', '/users/<string:id>')
+user_api.add_resource(UserDetailResource, '/user')

authserver/app/app.py

@@ -7,7 +7,7 @@
 from flask_sqlalchemy import SQLAlchemy
 
 from authserver.api import (client_bp, data_trust_bp, health_api_bp, oauth2_bp,
-                            role_bp, user_bp)
+                            role_bp, user_bp, home_bp)
 from authserver.config import ConfigurationFactory
 from authserver.db import db
 from authserver.utilities import config_oauth
@@ -41,6 +41,7 @@ def create_app(environment: str = None):
     config_oauth(app)
     CORS(app)
     migrate = Migrate(app, db)
+    app.register_blueprint(home_bp)
     app.register_blueprint(health_api_bp)
     app.register_blueprint(data_trust_bp)
     app.register_blueprint(user_bp)

authserver/db/models/models.py

@@ -93,7 +93,6 @@ def password(self, password: str):
 
     def verify_password(self, password: str):
         try:
-            print(self.password_hash.encode())
             return bcrypt.checkpw(password.encode('utf-8'), self.password_hash.encode('utf-8'))
         except Exception as e:
             print(e)