Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-22 22:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow signing up using GitHub

Browse Source
This commit is contained in:
rubenwardy 2024-06-02 12:46:56 +01:00
parent 54c50a815d
commit bce06d45d0
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/blueprints/github/__init__.py
View File

@ -67,44 +67,65 @@ def callback(oauth_token):
r = requests.get(url, headers={"Authorization": "token " + oauth_token}) r = requests.get(url, headers={"Authorization": "token " + oauth_token})
json = r.json() json = r.json()
user_id = json["id"] user_id = json["id"]
username = json["login"] github_username = json["login"]
if type(user_id) is not int: if type(user_id) is not int:
abort(400) abort(400)
# Get user by GitHub user ID # Get user by GitHub user ID
userByGithub = User.query.filter(User.github_user_id == user_id).one_or_none() user_by_github = User.query.filter(User.github_user_id == user_id).one_or_none()
# If logged in, connect # If logged in, connect
if current_user and current_user.is_authenticated: if current_user and current_user.is_authenticated:
if userByGithub is None: if user_by_github is None:
current_user.github_username = username current_user.github_username = github_username
current_user.github_user_id = user_id current_user.github_user_id = user_id
db.session.commit() db.session.commit()
flash(gettext("Linked GitHub to account"), "success") flash(gettext("Linked GitHub to account"), "success")
return redirect(redirect_to) return redirect(redirect_to)
elif userByGithub == current_user: elif user_by_github == current_user:
return redirect(redirect_to) return redirect(redirect_to)
else: else:
flash(gettext("GitHub account is already associated with another user: %(username)s", flash(gettext("GitHub account is already associated with another user: %(username)s",
username=userByGithub.username), "danger") username=user_by_github.username), "danger")
return redirect(redirect_to) return redirect(redirect_to)
# If not logged in, log in # Log in to existing account
else: elif user_by_github:
if userByGithub is None: ret = login_user_set_active(user_by_github, next, remember=True)
flash(gettext("Unable to find an account for that GitHub user"), "danger")
return redirect(url_for("users.claim_forums"))
ret = login_user_set_active(userByGithub, next, remember=True)
if ret is None: if ret is None:
flash(gettext("Authorization failed [err=gh-login-failed]"), "danger") flash(gettext("Authorization failed [err=gh-login-failed]"), "danger")
return redirect(url_for("users.login")) return redirect(url_for("users.login"))
add_audit_log(AuditSeverity.USER, userByGithub, "Logged in using GitHub OAuth", add_audit_log(AuditSeverity.USER, user_by_github, "Logged in using GitHub OAuth",
url_for("users.profile", username=userByGithub.username)) url_for("users.profile", username=user_by_github.username))
db.session.commit() db.session.commit()
return ret return ret
# Sign up
else:
existing_user = (User.query
.filter(or_(User.username == github_username, User.forums_username == github_username))
.one_or_none())
if existing_user:
flash(gettext("Unable to create an account as the username is already taken. "
"If you meant to log in, you need to connect GitHub to your account first"), "danger")
return redirect(url_for("users.login"))
user = User(github_username, True)
db.session.add(user)
add_audit_log(AuditSeverity.USER, user, "Registered with GitHub, display name=" + user.display_name,
url_for("users.profile", username=user.username))
db.session.commit()
ret = login_user_set_active(user, next, remember=True)
if ret is None:
flash(gettext("Authorization failed [err=gh-login-failed]"), "danger")
return redirect(url_for("users.login"))
return ret
@bp.route("/github/webhook/", methods=["POST"]) @bp.route("/github/webhook/", methods=["POST"])
@csrf.exempt @csrf.exempt