disallow ext-auth user to change nickname

2 files changed, 8 insertions, 3 deletions

diff --git a/newspipe/web/forms.py b/newspipe/web/forms.py
index 7a245b94..0f6200f8 100644
--- a/newspipe/web/forms.py
+++ b/newspipe/web/forms.py
@@ -239,7 +239,8 @@ class ProfileForm(FlaskForm):
 
     nickname = TextField(
         lazy_gettext("Nickname"),
-        [validators.Required(lazy_gettext("Please enter your nickname."))],
+        #[validators.Required(lazy_gettext("Please enter your nickname."))],
+        [validators.Optional()],
     )
     password = PasswordField(lazy_gettext("Password"))
     password_conf = PasswordField(lazy_gettext("Password"))
@@ -264,7 +265,7 @@ class ProfileForm(FlaskForm):
                 )
                 self.password.errors.append(message)
                 validated = False
-        if self.nickname.data != User.make_valid_nickname(self.nickname.data):
+        if self.nickname.data and (self.nickname.data != User.make_valid_nickname(self.nickname.data)):
             self.nickname.errors.append(
                 lazy_gettext(
                     "This nickname has "
diff --git a/newspipe/web/views/user.py b/newspipe/web/views/user.py
index b8d01967..7bb6e6b1 100644
--- a/newspipe/web/views/user.py
+++ b/newspipe/web/views/user.py
@@ -9,6 +9,7 @@ from flask_login import current_user
 from flask_login import login_required
 from flask_paginate import get_page_args
 from flask_paginate import Pagination
+from werkzeug.exceptions import BadRequest
 
 from newspipe.bootstrap import application
 from newspipe.controllers import ArticleController
@@ -165,6 +166,9 @@ def profile():
     if request.method == "POST":
         if form.validate():
             try:
+                # for external user, just force the exact same username.
+                if user.external_auth or not form.nickname.data:
+                    form.nickname.data = user.nickname
                 user_contr.update(
                     {"id": current_user.id},
                     {
@@ -195,7 +199,7 @@ def profile():
 
     if request.method == "GET":
         form = ProfileForm(obj=user)
-        return render_template("profile.html", user=user, form=form)
+        return render_template("profile.html", user=user, form=form, nick_disabled=bool(user.external_auth))
 
 
 @user_bp.route("/delete_account", methods=["GET"])