From 734cd8e6e51ab563a3b15e2b7dfd5c86836deff0 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 28 Dec 2021 12:45:33 +0100 Subject: [PATCH 1/9] export SECRET_KEY required by Flask-WTF (CSRF) --- .github/workflows/flask.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flask.yml b/.github/workflows/flask.yml index bb192c94..ccc4a798 100644 --- a/.github/workflows/flask.yml +++ b/.github/workflows/flask.yml @@ -66,6 +66,7 @@ jobs: - name: Run Tests run: | + export SECRET_KEY=`python3 -c 'import secrets; print(secrets.token_hex())'` source env/bin/activate coverage run --source='ereuse_devicehub' env/bin/pytest -m mvp --maxfail=5 tests/ coverage report --include='ereuse_devicehub/*' From 43b5a67caba17aebd54c08ec75842795761be530 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 28 Dec 2021 13:05:41 +0100 Subject: [PATCH 2/9] Create logout view --- .../templates/ereuse_devicehub/base_site.html | 14 ++------------ ereuse_devicehub/views.py | 9 ++++++++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index b68d5635..d1c50e43 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -185,7 +185,7 @@
  • - + My Profile @@ -194,16 +194,6 @@
    • -
  • - - - Account Settings - -
    • -
  • -
    -
    • -
  • @@ -215,7 +205,7 @@
  • - + Sign Out diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index 3c5b28d0..84397ce7 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -1,7 +1,7 @@ import flask from flask import Blueprint from flask.views import View -from flask_login import login_required, login_user +from flask_login import login_required, login_user, logout_user from ereuse_devicehub.forms import LoginForm from ereuse_devicehub.resources.user.models import User @@ -32,6 +32,12 @@ class LoginView(View): return flask.render_template('ereuse_devicehub/user_login.html', form=form) +class LogoutView(View): + def dispatch_request(self): + logout_user() + return flask.redirect(flask.url_for('core.login')) + + class UserProfileView(View): decorators = [login_required] template_name = 'ereuse_devicehub/user_profile.html' @@ -42,4 +48,5 @@ class UserProfileView(View): core.add_url_rule('/login/', view_func=LoginView.as_view('login')) +core.add_url_rule('/logout/', view_func=LogoutView.as_view('logout')) core.add_url_rule('/profile/', view_func=UserProfileView.as_view('user-profile')) From a9515dce139b8915a13874e863ecd9243f5c2c35 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 28 Dec 2021 13:26:56 +0100 Subject: [PATCH 3/9] Print current_user info & drop topbar unused elements --- ereuse_devicehub/resources/user/models.py | 6 + ereuse_devicehub/static/img/profile-img.jpg | Bin 4957 -> 0 bytes .../templates/ereuse_devicehub/base_site.html | 148 +----------------- .../ereuse_devicehub/user_profile.html | 12 +- ereuse_devicehub/views.py | 6 +- 5 files changed, 15 insertions(+), 157 deletions(-) delete mode 100644 ereuse_devicehub/static/img/profile-img.jpg diff --git a/ereuse_devicehub/resources/user/models.py b/ereuse_devicehub/resources/user/models.py index c9d3fef7..70f14e00 100644 --- a/ereuse_devicehub/resources/user/models.py +++ b/ereuse_devicehub/resources/user/models.py @@ -71,6 +71,12 @@ class User(UserMixin, Thing): """Alias because flask-login expects `is_active` attribute""" return self.active + @property + def get_full_name(self): + # TODO(@slamora) create first_name & last_name fields and use + # them to generate user full name + return self.email + def check_password(self, password): # take advantage of SQL Alchemy PasswordType to verify password return self.password == password diff --git a/ereuse_devicehub/static/img/profile-img.jpg b/ereuse_devicehub/static/img/profile-img.jpg deleted file mode 100644 index 16ac22904218c0ab01136463638b24715503874e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4957 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 Lw@DStzWw
    • -
  • - - - - 4 - - -
      -
    • - You have 4 new notifications - View all -
      • -
    • -
      -
      • - -
    • - -
      -

      Lorem Ipsum

      -

      Quae dolorem earum veritatis oditseno

      -

      30 min. ago

      -
      -
      • - -
    • -
      -
      • - -
    • - -
      -

      Atque rerum nesciunt

      -

      Quae dolorem earum veritatis oditseno

      -

      1 hr. ago

      -
      -
      • - -
    • -
      -
      • - -
    • - -
      -

      Sit rerum fuga

      -

      Quae dolorem earum veritatis oditseno

      -

      2 hrs. ago

      -
      -
      • - -
    • -
      -
      • - -
    • - -
      -

      Dicta reprehenderit

      -

      Quae dolorem earum veritatis oditseno

      -

      4 hrs. ago

      -
      -
      • - -
    • -
      -
      • -
    • - Show all notifications -
      • - -
    - -
    • - -
  • - - - - 3 - - - - -
    • -
  • - Profile - K. Anderson + + {{ current_user.email }}
    • -
      Kevin Anderson
      - Web Designer +
      {{ current_user.get_full_name }}
    • diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html index d744f1b4..014e66e6 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html @@ -18,16 +18,8 @@
      - - Profile -

      Kevin Anderson

      -

      Web Designer

      - + +

      {{ current_user.get_full_name }}

      diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index 84397ce7..8e1ea877 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -1,7 +1,7 @@ import flask from flask import Blueprint from flask.views import View -from flask_login import login_required, login_user, logout_user +from flask_login import current_user, login_required, login_user, logout_user from ereuse_devicehub.forms import LoginForm from ereuse_devicehub.resources.user.models import User @@ -43,7 +43,9 @@ class UserProfileView(View): template_name = 'ereuse_devicehub/user_profile.html' def dispatch_request(self): - context = {} + context = { + 'current_user': current_user, + } return flask.render_template(self.template_name, **context) From e97ee61c362634760d4e725c6a77131822547703 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 28 Dec 2021 13:31:24 +0100 Subject: [PATCH 4/9] Define Stamps link to StampsView --- ereuse_devicehub/templates/ereuse_devicehub/base_site.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 1e43caea..a2f84c8c 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -167,7 +167,7 @@
    • - From f4e2689f82a8c1e798a04350376a5a8095d64b28 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 28 Dec 2021 13:41:45 +0100 Subject: [PATCH 5/9] Add USOdy logo to login & navbar --- ereuse_devicehub/static/img/logo.png | Bin 738 -> 0 bytes .../static/img/usody-logo-black.svg | 47 ++++++++++++++++++ .../templates/ereuse_devicehub/base_site.html | 3 +- .../ereuse_devicehub/user_login.html | 5 +- 4 files changed, 50 insertions(+), 5 deletions(-) delete mode 100644 ereuse_devicehub/static/img/logo.png create mode 100644 ereuse_devicehub/static/img/usody-logo-black.svg diff --git a/ereuse_devicehub/static/img/logo.png b/ereuse_devicehub/static/img/logo.png deleted file mode 100644 index 9cfbaf2dec1e2f9140b03605c27f9dca6addea65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 738 zcmeAS@N?(olHy`uVBq!ia0vp^hCpn>!3-ot`W5B^snP(S5LY1W81j+MsPsO6KG0&d zk|4iehG#DvlHilJ@*x<u9`!N`@^LYW^5EUCRdV*PSf{AgH&?B{y4D}P7BL#WZBg!d!J(ZpZL?F;`K~Eq zPjjQ(`^~ZfMBH*ZXWzQHz@d6W@QZ2l1siM5a + + + + + + image/svg+xml + + + + + + + USOdy + + diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index a2f84c8c..4db59575 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -5,8 +5,7 @@
      diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html index b8696521..8c193062 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html @@ -9,9 +9,8 @@
      -
      From 9f31c2cad87bd1b42b7ddf93a5999678ec17f892 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Wed, 29 Dec 2021 08:10:26 +0100 Subject: [PATCH 6/9] Implement 'remember me' feature --- ereuse_devicehub/forms.py | 7 +++---- .../templates/ereuse_devicehub/user_login.html | 11 ++++------- ereuse_devicehub/views.py | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ereuse_devicehub/forms.py b/ereuse_devicehub/forms.py index 5c2b8d15..d88c9cf1 100644 --- a/ereuse_devicehub/forms.py +++ b/ereuse_devicehub/forms.py @@ -1,15 +1,14 @@ from flask_wtf import FlaskForm from werkzeug.security import generate_password_hash -from wtforms import EmailField, PasswordField, validators +from wtforms import BooleanField, EmailField, PasswordField, validators from ereuse_devicehub.resources.user.models import User class LoginForm(FlaskForm): email = EmailField('Email Address', [validators.Length(min=6, max=35)]) - password = PasswordField('Password', [ - validators.DataRequired(), - ]) + password = PasswordField('Password', [validators.DataRequired()]) + remember = BooleanField('Remember me') error_messages = { 'invalid_login': ( diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html index 8c193062..a096dc7a 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html @@ -34,12 +34,9 @@ {{ form.csrf_token }}
      - -
      - @ - -
      Please enter your username.
      -
      + + +
      Please enter your email.
      @@ -50,7 +47,7 @@
      - +
      diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index 8e1ea877..8578ae01 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -20,7 +20,7 @@ class LoginView(View): # Login and validate the user. # user should be an instance of your `User` class user = User.query.filter_by(email=form.email.data).first() - login_user(user) + login_user(user, remember=form.remember.data) next_url = flask.request.args.get('next') # is_safe_url should check if the url is safe for redirects. From b1d7eb12b799a99d9cdb4dcd25f7e0e5870e6294 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Wed, 29 Dec 2021 08:17:42 +0100 Subject: [PATCH 7/9] Set page title --- ereuse_devicehub/templates/ereuse_devicehub/base.html | 2 +- ereuse_devicehub/templates/ereuse_devicehub/user_login.html | 3 +++ ereuse_devicehub/templates/ereuse_devicehub/user_profile.html | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base.html b/ereuse_devicehub/templates/ereuse_devicehub/base.html index 2e323ffa..5ca885f7 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base.html @@ -5,7 +5,7 @@ - Users / Profile - NiceAdmin Bootstrap Template + {% block page_title %}{% endblock %} - USOdy diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html index a096dc7a..fa80daba 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html @@ -1,4 +1,7 @@ {% extends "ereuse_devicehub/base.html" %} + +{% block page_title %}Login{% endblock %} + {% block body %}
      diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html index 014e66e6..0a6b7710 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html @@ -1,4 +1,7 @@ {% extends "ereuse_devicehub/base_site.html" %} + +{% block page_title %}Your Profile{% endblock %} + {% block main %}
      From 74ae8ce5595e379ba037d64c7ff70f147508ed27 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Wed, 29 Dec 2021 08:30:46 +0100 Subject: [PATCH 8/9] Replace favicon with USOdy logo --- .../static/img/apple-touch-icon.png | Bin 1201 -> 7939 bytes ereuse_devicehub/static/img/favicon.png | Bin 610 -> 4101 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ereuse_devicehub/static/img/apple-touch-icon.png b/ereuse_devicehub/static/img/apple-touch-icon.png index 78b2586da940aeea4661034925b3b7064ec38a18..126f00359eb3e270658b2a12f59fa8125bebcb61 100644 GIT binary patch literal 7939 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 b8?m3^>6J5g<>xeOgR-xutDnm{r-UW|(oz7Q diff --git a/ereuse_devicehub/static/img/favicon.png b/ereuse_devicehub/static/img/favicon.png index f9bc1743c1d86ea9ccb5e6c8cff94be527ad4995..ca34de6fc1b2db2115be381248246ccffd6026ed 100644 GIT binary patch literal 4101 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 D*-7}_ literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyegQrqu0Yx`~AK&_v0S zAirRSmoK8TX0E7A_FmB4@?~@AWR1614+yg5SqU*r@L*tIWXueSD2ed(u}aR*)k{pt zPfFFR$SnZsW?-r5%(GQ`zk9!uy`4>wRgjCDLPc&)Ua?h?tx`rw zNr9EVetCJhUb(Seeo?xGK4vJyzMOKNd)QD#9& zW_}*jkP5gVdBspS09~VBkyxN_sAr%L)Ky{ST$GwvlIjA)c18w9hPnpEx`sv}hK5!q zhE}Gg+6G2e1_n0zDC%tVQ7p3q@qsS4L-;E-FU3}=2JGXyi=6Xrt_9wU&Ou! zH52xJu8c_z6Arxg7xnlGu?fy~5?5PKW8m2l-VenzySKOw>WzhANHLJ_4=dzp=oBhXD Vwfwst-7KKE@pScbS?83{1OR@x-UI*u From e1786ddcb284a4ab3d0b4bc69279d26ea927b365 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 4 Jan 2022 11:59:03 +0100 Subject: [PATCH 9/9] Refactor: store current user on `before_request()` --- ereuse_devicehub/devicehub.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ereuse_devicehub/devicehub.py b/ereuse_devicehub/devicehub.py index f97e7b74..f286abc0 100644 --- a/ereuse_devicehub/devicehub.py +++ b/ereuse_devicehub/devicehub.py @@ -7,10 +7,10 @@ import click import click_spinner import ereuse_utils.cli from ereuse_utils.session import DevicehubClient -from flask.globals import _app_ctx_stack, g -from flask_login import current_user -from flask import g as gg +from flask import _app_ctx_stack, g +from flask_login import LoginManager, current_user from flask_sqlalchemy import SQLAlchemy +from flask_wtf.csrf import CSRFProtect from teal.db import SchemaSQLAlchemy from teal.teal import Teal @@ -21,12 +21,8 @@ from ereuse_devicehub.db import db from ereuse_devicehub.dummy.dummy import Dummy from ereuse_devicehub.resources.device.search import DeviceSearch from ereuse_devicehub.resources.inventory import Inventory, InventoryDef -from ereuse_devicehub.templating import Environment - - -from flask_login import LoginManager -from flask_wtf.csrf import CSRFProtect from ereuse_devicehub.resources.user.models import User +from ereuse_devicehub.templating import Environment class Devicehub(Teal): @@ -80,7 +76,6 @@ class Devicehub(Teal): @login_manager.user_loader def load_user(user_id): - gg.user = current_user return User.query.get(user_id) # noinspection PyMethodOverriding @@ -172,6 +167,9 @@ class Devicehub(Teal): inv = g.inventory = Inventory.current # type: Inventory g.tag_provider = DevicehubClient(base_url=inv.tag_provider, token=DevicehubClient.encode_token(inv.tag_token)) + # NOTE: models init methods expects that current user is + # available on g.user (e.g. to initialize object owner) + g.user = current_user def create_client(self, email='user@dhub.com', password='1234'): client = UserClient(self, email, password, response_wrapper=self.response_class)