Refactor endpoints to use blueprints instead

4 files changed, 0 insertions, 432 deletions

diff --git a/app/views/users/__init__.py b/app/views/users/__init__.py
deleted file mode 100644
index 45af431..0000000
--- a/app/views/users/__init__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Content DB
-# Copyright (C) 2018  rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-from . import users, githublogin, notifications
diff --git a/app/views/users/githublogin.py b/app/views/users/githublogin.py
deleted file mode 100644
index 9ea2584..0000000
--- a/app/views/users/githublogin.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# Content DB
-# Copyright (C) 2018  rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-from flask import *
-from flask_user import *
-from flask_login import login_user, logout_user
-from sqlalchemy import func
-import flask_menu as menu
-from flask_github import GitHub
-from app import app, github
-from app.models import *
-from app.utils import loginUser
-
-@app.route("/user/github/start/")
-def github_signin_page():
-	return github.authorize("")
-
-@app.route("/user/github/callback/")
-@github.authorized_handler
-def github_authorized(oauth_token):
-	next_url = request.args.get("next")
-	if oauth_token is None:
-		flash("Authorization failed [err=gh-oauth-login-failed]", "danger")
-		return redirect(url_for("user.login"))
-
-	import requests
-
-	# Get Github username
-	url = "https://api.github.com/user"
-	r = requests.get(url, headers={"Authorization": "token " + oauth_token})
-	username = r.json()["login"]
-
-	# Get user by github username
-	userByGithub = User.query.filter(func.lower(User.github_username) == func.lower(username)).first()
-
-	# If logged in, connect
-	if current_user and current_user.is_authenticated:
-		if userByGithub is None:
-			current_user.github_username = username
-			db.session.commit()
-			flash("Linked github to account", "success")
-			return redirect(url_for("home_page"))
-		else:
-			flash("Github account is already associated with another user", "danger")
-			return redirect(url_for("home_page"))
-
-	# If not logged in, log in
-	else:
-		if userByGithub is None:
-			flash("Unable to find an account for that Github user", "error")
-			return redirect(url_for("user_claim_page"))
-		elif loginUser(userByGithub):
-			if current_user.password is None:
-				return redirect(next_url or url_for("set_password_page", optional=True))
-			else:
-				return redirect(next_url or url_for("home_page"))
-		else:
-			flash("Authorization failed [err=gh-login-failed]", "danger")
-			return redirect(url_for("user.login"))
diff --git a/app/views/users/notifications.py b/app/views/users/notifications.py
deleted file mode 100644
index 23dbb31..0000000
--- a/app/views/users/notifications.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Content DB
-# Copyright (C) 2018  rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-from flask import *
-from flask_user import current_user, login_required
-from app import app
-from app.models import *
-
-@app.route("/notifications/")
-@login_required
-def notifications_page():
-	return render_template("notifications/list.html")
-
-@app.route("/notifications/clear/", methods=["POST"])
-@login_required
-def clear_notifications_page():
-	current_user.notifications.clear()
-	db.session.commit()
-	return redirect(url_for("notifications_page"))
diff --git a/app/views/users/users.py b/app/views/users/users.py
deleted file mode 100644
index 1a81c7d..0000000
--- a/app/views/users/users.py
+++ /dev/null
@@ -1,308 +0,0 @@
-# Content DB
-# Copyright (C) 2018  rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-from flask import *
-from flask_user import *
-from flask_login import login_user, logout_user
-from app import app, markdown
-from app.models import *
-from flask_wtf import FlaskForm
-from wtforms import *
-from wtforms.validators import *
-from app.utils import randomString, loginUser, rank_required
-from app.tasks.forumtasks import checkForumAccount
-from app.tasks.emails import sendVerifyEmail, sendEmailRaw
-from app.tasks.phpbbparser import getProfile
-
-# Define the User profile form
-class UserProfileForm(FlaskForm):
-	display_name = StringField("Display name", [Optional(), Length(2, 20)])
-	email = StringField("Email", [Optional(), Email()], filters = [lambda x: x or None])
-	website_url = StringField("Website URL", [Optional(), URL()], filters = [lambda x: x or None])
-	donate_url = StringField("Donation URL", [Optional(), URL()], filters = [lambda x: x or None])
-	rank = SelectField("Rank", [Optional()], choices=UserRank.choices(), coerce=UserRank.coerce, default=UserRank.NEW_MEMBER)
-	submit = SubmitField("Save")
-
-
-@app.route("/users/", methods=["GET"])
-def user_list_page():
-	users = User.query.order_by(db.desc(User.rank), db.asc(User.display_name)).all()
-	return render_template("users/list.html", users=users)
-
-
-@app.route("/users/<username>/", methods=["GET", "POST"])
-def user_profile_page(username):
-	user = User.query.filter_by(username=username).first()
-	if not user:
-		abort(404)
-
-	form = None
-	if user.checkPerm(current_user, Permission.CHANGE_DNAME) or \
-			user.checkPerm(current_user, Permission.CHANGE_EMAIL) or \
-			user.checkPerm(current_user, Permission.CHANGE_RANK):
-		# Initialize form
-		form = UserProfileForm(formdata=request.form, obj=user)
-
-		# Process valid POST
-		if request.method=="POST" and form.validate():
-			# Copy form fields to user_profile fields
-			if user.checkPerm(current_user, Permission.CHANGE_DNAME):
-				user.display_name = form["display_name"].data
-				user.website_url  = form["website_url"].data
-				user.donate_url   = form["donate_url"].data
-
-			if user.checkPerm(current_user, Permission.CHANGE_RANK):
-				newRank = form["rank"].data
-				if current_user.rank.atLeast(newRank):
-					user.rank = form["rank"].data
-				else:
-					flash("Can't promote a user to a rank higher than yourself!", "error")
-
-			if user.checkPerm(current_user, Permission.CHANGE_EMAIL):
-				newEmail = form["email"].data
-				if newEmail != user.email and newEmail.strip() != "":
-					token = randomString(32)
-
-					ver = UserEmailVerification()
-					ver.user  = user
-					ver.token = token
-					ver.email = newEmail
-					db.session.add(ver)
-					db.session.commit()
-
-					task = sendVerifyEmail.delay(newEmail, token)
-					return redirect(url_for("check_task", id=task.id, r=url_for("user_profile_page", username=username)))
-
-			# Save user_profile
-			db.session.commit()
-
-			# Redirect to home page
-			return redirect(url_for("user_profile_page", username=username))
-
-	packages = user.packages.filter_by(soft_deleted=False)
-	if not current_user.is_authenticated or (user != current_user and not current_user.canAccessTodoList()):
-		packages = packages.filter_by(approved=True)
-	packages = packages.order_by(db.asc(Package.title))
-
-	topics_to_add = None
-	if current_user == user or user.checkPerm(current_user, Permission.CHANGE_AUTHOR):
-		topics_to_add = ForumTopic.query \
-					.filter_by(author_id=user.id) \
-					.filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \
-					.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
-					.all()
-
-	# Process GET or invalid POST
-	return render_template("users/user_profile_page.html",
-			user=user, form=form, packages=packages, topics_to_add=topics_to_add)
-
-
-@app.route("/users/<username>/check/", methods=["POST"])
-@login_required
-def user_check(username):
-	user = User.query.filter_by(username=username).first()
-	if user is None:
-		abort(404)
-
-	if current_user != user and not current_user.rank.atLeast(UserRank.MODERATOR):
-		abort(403)
-
-	if user.forums_username is None:
-		abort(404)
-
-	task = checkForumAccount.delay(user.forums_username)
-	next_url = url_for("user_profile_page", username=username)
-
-	return redirect(url_for("check_task", id=task.id, r=next_url))
-
-
-class SendEmailForm(FlaskForm):
-	subject = StringField("Subject", [InputRequired(), Length(1, 300)])
-	text    = TextAreaField("Message", [InputRequired()])
-	submit  = SubmitField("Send")
-
-
-@app.route("/users/<username>/email/", methods=["GET", "POST"])
-@rank_required(UserRank.MODERATOR)
-def send_email_page(username):
-	user = User.query.filter_by(username=username).first()
-	if user is None:
-		abort(404)
-
-	next_url = url_for("user_profile_page", username=user.username)
-
-	if user.email is None:
-		flash("User has no email address!", "error")
-		return redirect(next_url)
-
-	form = SendEmailForm(request.form)
-	if form.validate_on_submit():
-		text = form.text.data
-		html = markdown(text)
-		task = sendEmailRaw.delay([user.email], form.subject.data, text, html)
-		return redirect(url_for("check_task", id=task.id, r=next_url))
-
-	return render_template("users/send_email.html", form=form)
-
-
-
-class SetPasswordForm(FlaskForm):
-	email = StringField("Email", [Optional(), Email()])
-	password = PasswordField("New password", [InputRequired(), Length(2, 100)])
-	password2 = PasswordField("Verify password", [InputRequired(), Length(2, 100)])
-	submit = SubmitField("Save")
-
-@app.route("/user/set-password/", methods=["GET", "POST"])
-@login_required
-def set_password_page():
-	if current_user.password is not None:
-		return redirect(url_for("user.change_password"))
-
-	form = SetPasswordForm(request.form)
-	if current_user.email == None:
-		form.email.validators = [InputRequired(), Email()]
-
-	if request.method == "POST" and form.validate():
-		one = form.password.data
-		two = form.password2.data
-		if one == two:
-			# Hash password
-			hashed_password = user_manager.hash_password(form.password.data)
-
-			# Change password
-			user_manager.update_password(current_user, hashed_password)
-
-			# Send 'password_changed' email
-			if user_manager.enable_email and user_manager.send_password_changed_email and current_user.email:
-				emails.send_password_changed_email(current_user)
-
-			# Send password_changed signal
-			signals.user_changed_password.send(current_app._get_current_object(), user=current_user)
-
-			# Prepare one-time system message
-			flash('Your password has been changed successfully.', 'success')
-
-			newEmail = form["email"].data
-			if newEmail != current_user.email and newEmail.strip() != "":
-				token = randomString(32)
-
-				ver = UserEmailVerification()
-				ver.user = current_user
-				ver.token = token
-				ver.email = newEmail
-				db.session.add(ver)
-				db.session.commit()
-
-				task = sendVerifyEmail.delay(newEmail, token)
-				return redirect(url_for("check_task", id=task.id, r=url_for("user_profile_page", username=current_user.username)))
-			else:
-				return redirect(url_for("user_profile_page", username=current_user.username))
-		else:
-			flash("Passwords do not match", "error")
-
-	return render_template("users/set_password.html", form=form, optional=request.args.get("optional"))
-
-
-@app.route("/user/claim/", methods=["GET", "POST"])
-def user_claim_page():
-	username = request.args.get("username")
-	if username is None:
-		username = ""
-	else:
-		method = request.args.get("method")
-		user = User.query.filter_by(forums_username=username).first()
-		if user and user.rank.atLeast(UserRank.NEW_MEMBER):
-			flash("User has already been claimed", "error")
-			return redirect(url_for("user_claim_page"))
-		elif user is None and method == "github":
-			flash("Unable to get Github username for user", "error")
-			return redirect(url_for("user_claim_page"))
-		elif user is None:
-			flash("Unable to find that user", "error")
-			return redirect(url_for("user_claim_page"))
-
-		if user is not None and method == "github":
-			return redirect(url_for("github_signin_page"))
-
-	token = None
-	if "forum_token" in session:
-		token = session["forum_token"]
-	else:
-		token = randomString(32)
-		session["forum_token"] = token
-
-	if request.method == "POST":
-		ctype	= request.form.get("claim_type")
-		username = request.form.get("username")
-
-		if username is None or len(username.strip()) < 2:
-			flash("Invalid username", "error")
-		elif ctype == "github":
-			task = checkForumAccount.delay(username)
-			return redirect(url_for("check_task", id=task.id, r=url_for("user_claim_page", username=username, method="github")))
-		elif ctype == "forum":
-			user = User.query.filter_by(forums_username=username).first()
-			if user is not None and user.rank.atLeast(UserRank.NEW_MEMBER):
-				flash("That user has already been claimed!", "error")
-				return redirect(url_for("user_claim_page"))
-
-			# Get signature
-			sig = None
-			try:
-				profile = getProfile("https://forum.minetest.net", username)
-				sig = profile.signature
-			except IOError:
-				flash("Unable to get forum signature - does the user exist?", "error")
-				return redirect(url_for("user_claim_page", username=username))
-
-			# Look for key
-			if token in sig:
-				if user is None:
-					user = User(username)
-					user.forums_username = username
-					db.session.add(user)
-					db.session.commit()
-
-				if loginUser(user):
-					return redirect(url_for("set_password_page"))
-				else:
-					flash("Unable to login as user", "error")
-					return redirect(url_for("user_claim_page", username=username))
-
-			else:
-				flash("Could not find the key in your signature!", "error")
-				return redirect(url_for("user_claim_page", username=username))
-		else:
-			flash("Unknown claim type", "error")
-
-	return render_template("users/claim.html", username=username, key=token)
-
-@app.route("/users/verify/")
-def verify_email_page():
-	token = request.args.get("token")
-	ver = UserEmailVerification.query.filter_by(token=token).first()
-	if ver is None:
-		flash("Unknown verification token!", "error")
-	else:
-		ver.user.email = ver.email
-		db.session.delete(ver)
-		db.session.commit()
-
-	if current_user.is_authenticated:
-		return redirect(url_for("user_profile_page", username=current_user.username))
-	else:
-		return redirect(url_for("home_page"))