Merge branch 'develop' into 'master' (7c1f3b9a) · Commits · namibsun / python / bundesliga-tippspiel

CHANGELOG

+2 −0

Original line number	Diff line number	Diff line
		V 0.16.3:
		- Added user data to api generation
		V 0.16.2:
		- Improved the design of the website
		V 0.16.1:

+2 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,8 @@ class ApiKeyGenAction(Action):

		return {
		"api_key": "{}:{}".format(api_key.id, key.decode("utf-8")),
		"expiration": int(api_key.creation_time) + ApiKey.MAX_AGE
		"expiration": int(api_key.creation_time) + ApiKey.MAX_AGE,
		"user": user.__json__(True)
		}

		@classmethod

+5 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ LICENSE"""

		from typing import Dict, Any
		from flask_login import current_user, logout_user
		from bundesliga_tippspiel import db
		from bundesliga_tippspiel import app, db
		from bundesliga_tippspiel.actions.Action import Action
		from bundesliga_tippspiel.types.exceptions import ActionException

		@@ -61,9 +61,13 @@ class DeleteUserAction(Action):
		:return: A JSON-compatible dictionary containing the response
		:raises ActionException: if anything went wrong
		"""
		app.logger.info("Deleting user {}.".format(current_user.username))
		db.session.delete(current_user)
		db.session.commit()

		app.logger.info("User {} logged out.".format(current_user.username))
		logout_user()

		return {}

		@classmethod

+7 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ LICENSE"""

		from typing import Dict, Any
		from flask_login import login_user, current_user
		from bundesliga_tippspiel import app
		from bundesliga_tippspiel.types.enums import AlertSeverity
		from bundesliga_tippspiel.models.auth.User import User
		from bundesliga_tippspiel.types.exceptions import ActionException
		@@ -80,11 +81,17 @@ class LoginAction(Action):

		if verified:
		login_user(user, remember=self.remember)
		app.logger.info("User {} successfully logged in."
		.format(self.username))
		else:
		app.logger.info("Unsuccessful login attempt for user {}."
		.format(self.username))

		raise ActionException(
		"Invalid Password",
		"Das angegebene Password ist inkorrekt."
		)

		return {}

		@classmethod

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ along with bundesliga-tippspiel. If not, see <http://www.gnu.org/licenses/>.
		LICENSE"""

		from flask import request, url_for, redirect, render_template
		from flask_login import login_required, logout_user
		from flask_login import login_required, logout_user, current_user
		from bundesliga_tippspiel import app
		from bundesliga_tippspiel.utils.routes import action_route
		from bundesliga_tippspiel.actions.LoginAction import LoginAction
		@@ -49,5 +49,6 @@ def logout():
		Logs out the user
		:return:
		"""
		app.logger.info("User {} logged out.".format(current_user.username))
		logout_user()
		return redirect(url_for("index"))