SS-643 Users can edit their account details #235

anondo1969 · 2024-10-07T14:26:48Z

Description

Reference: SS-643

It should be an option under the Profile dropdown. Users can update their first name, last name, and department. The university and email will be shown but can't be edited. There should be a note on the page saying that to change email or university affiliation, they need to contact [email protected].

Types of changes

new feature

Checklist

If you're unsure about any of the items below, don't hesitate to ask. We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

This pull request is against develop branch (not applicable for hotfixes)
I have included a link to the issue on GitHub or JIRA (if any)
I have included migration files (if there are changes to the model classes)
I have included, reviewed and executed tests (unit and end2end) to complement my changes
I have updated the related documentation (if necessary)
I have added a reviewer for this pull request
I have added myself as an author for this pull request
In the case I have modified settings.py, then I have also updated the studio-settings-configmap.yaml file in serve-charts

Further comments

Anything else you think we should know before merging your code!

Co-authored-by: Viktor Sandström <[email protected]>

This reverts commit d321a3f.

common/views.py

templates/user/profile.html

templates/registration/edit_profile.html

common/views.py

…ails

common/views.py

common/forms.py

churnikov · 2024-10-15T09:51:24Z

common/views.py

+        user_form_details = self.user_edit_form_class(
+            request.POST,
+            instance=request.user,
+            initial={
+                "email": user_profile_data.user.email,
+            },
+        )
+
+        profile_form_details = self.profile_edit_form_class(
+            request.POST,
+            instance=user_profile_data,
+            initial={
+                "affiliation": user_profile_data.affiliation,
+            },
+        )


Please make sure, that user cannot pass any other information in the form data.

For instance, that user via direct curl request cannot change their email or password.

I used decorator to ensure login-required in 'common/urls.py' and in 'EditProfileView' class in 'common/views.py'.

common/forms.py

removed comments Co-authored-by: Nikita Churikov <[email protected]>

fixed the gap after hash sign Co-authored-by: Nikita Churikov <[email protected]>

changed the comment text Co-authored-by: Nikita Churikov <[email protected]>

…ails

churnikov · 2024-10-16T07:26:36Z

common/urls.py

@@ -9,5 +10,5 @@
    path("success/", views.RegistrationCompleteView.as_view(), name="success"),
    path("signup/", views.SignUpView.as_view(), name="signup"),
    path("verify/", views.VerifyView.as_view(), name="verify"),
-    path("edit-profile/", views.EditProfileView.as_view(), name="edit-profile"),
+    path("edit-profile/", login_required(views.EditProfileView.as_view()), name="edit-profile"),


Why did you define login_required here and in common/views.py?

Just curious

I wanted to make sure only logged-in user can access the view/form. I removed in the last commit.

churnikov · 2024-10-16T07:29:30Z

common/views.py

+                        user_form_retrived_data.save()
+
+                    else:
+                        logger.info("Not saving user form info as nothing has changed", exc_info=True)


Suggested change

logger.info("Not saving user form info as nothing has changed", exc_info=True)

logger.info("Not saving user form info as nothing has changed")

Correct me if I'm wrong, but I don't think that exc_info needed here.

You are right. I removed it.

common/views.py

churnikov · 2024-10-17T08:49:15Z

common/views.py

+                        user_form_retrived_data.password1 = user_profile_data.user.password
+                        user_form_retrived_data.password2 = user_profile_data.user.password


I don't fully get it, why are we doing this?

I wanted to save only the new information. I removed it, as I checked the the previous way is okay to prevent the curl injection.

churnikov

You've submitted a few code pieces that are just commented out. They should be either uncommented or removed.

common/urls.py

common/views.py

churnikov · 2024-10-17T12:32:41Z

common/views.py

+        except Exception as e:
+            logger.error(str(e), exc_info=True)
+            user_profile = UserProfile()


Btw, just want to tell you that it doesn't solve it for the admin user.

Added some dummy values for the super user to fix it.

…ails

churnikov · 2024-10-21T16:07:07Z

common/views.py

@@ -170,72 +169,48 @@ def get_user_profile_info(self, request):

    def get(self, request, *args, **kwargs):
        user_profile_data = self.get_user_profile_info(request)
+        common_user = True if not request.user.is_superuser else False


Suggested change

common_user = True if not request.user.is_superuser else False

common_user = not request.user.is_superuser

And superuser can be a regular promoted user, so this would be misleading.

What I suggest us doing is keeping it a broken page for now, but add a jira issue to populate default super user with this data. We should bring it to the broad group.

churnikov · 2024-10-21T16:13:01Z

common/views.py

+                # For the superuser it is expected to not to be able to update records
+                # as it does not have a user profile object.


That's what I'm talking about as well, may be we should actually generate this data for the super user as well. Let's discuss this with the team.

…ser status

churnikov · 2024-10-22T12:08:33Z

You can merge the code:)
But please do the squash and merge and write details of what was done in the resulting commit

anondo1969 · 2024-10-22T13:47:32Z

You can merge the code:) But please do the squash and merge and write details of what was done in the resulting commit

Thanks a lot. I have done it.

akochari and others added 7 commits April 19, 2024 15:53

Updated info about using Serve for teaching (#194)

d321a3f

Co-authored-by: Viktor Sandström <[email protected]>

Revert "Updated info about using Serve for teaching (#194)"

2b5cadc

This reverts commit d321a3f.

Merge branch 'staging' into main

2d769be

Merge branch 'staging'

ab7d54f

Merge branch 'staging'

46f589c

SS-643-Make-an-option-to-edit-account-details

c958069

SS-643-Make-an-option-to-edit-account-details

7c8099b

anondo1969 requested a review from churnikov October 7, 2024 14:30

anondo1969 self-assigned this Oct 7, 2024

churnikov reviewed Oct 8, 2024

View reviewed changes

SS-643 extending ProfileForm

4e3de76

churnikov requested changes Oct 9, 2024

View reviewed changes

common/views.py Outdated Show resolved Hide resolved

common/views.py Outdated Show resolved Hide resolved

anondo1969 added 3 commits October 10, 2024 13:37

SS-643 Updated edit HTML form

d38f4ce

SS-643 Updated edit HTML form

d86a443

SS-643 pre-commit check fixed

32b49eb

anondo1969 requested a review from churnikov October 10, 2024 14:04

anondo1969 and others added 5 commits October 10, 2024 16:10

SS-643 pre-commit with black check

bba6f8b

SS-643 pre-commit with black check 2

0048d66

Merge branch 'develop' into SS-643-Make-an-option-to-edit-account-det…

cf33450

…ails

fix failing e2e test

cded668

change the edit profile icon

8194013

anondo1969 marked this pull request as ready for review October 14, 2024 10:46

uncomment the line I accidentally commented out

a05bf15

churnikov reviewed Oct 15, 2024

View reviewed changes

anondo1969 and others added 6 commits October 15, 2024 13:03

Update common/views.py

ee23c4e

removed comments Co-authored-by: Nikita Churikov <[email protected]>

Update common/forms.py

b3481fd

fixed the gap after hash sign Co-authored-by: Nikita Churikov <[email protected]>

Update common/forms.py

6bb12aa

changed the comment text Co-authored-by: Nikita Churikov <[email protected]>

fix super class init.

41b2862

changes in view

491b6f8

ensure login required in form post method

da00974

Merge branch 'develop' into SS-643-Make-an-option-to-edit-account-det…

f78edf6

…ails

churnikov reviewed Oct 17, 2024

View reviewed changes

ensuring curl injection does not work

7f13f1e

churnikov requested changes Oct 17, 2024

View reviewed changes

anondo1969 added 3 commits October 21, 2024 14:40

fixing the profile-edit bug in superuser mode

a96fdfd

Merge branch 'develop' into SS-643-Make-an-option-to-edit-account-det…

5a7fa52

…ails

Merge branch 'develop' into SS-643-Make-an-option-to-edit-account-det…

0d50532

…ails

churnikov reviewed Oct 21, 2024

View reviewed changes

anondo1969 added 2 commits October 22, 2024 11:20

differentiate admin user and common user with or without Staff/Superu…

2d11a65

…ser status

differentiate admin user and common user with or without Staff/Superu…

ce5e4a8

…ser status

churnikov approved these changes Oct 22, 2024

View reviewed changes

anondo1969 merged commit 0ed3393 into develop Oct 22, 2024
2 checks passed

anondo1969 deleted the SS-643-Make-an-option-to-edit-account-details branch October 22, 2024 13:44

akochari changed the title ~~Ss 643 make an option to edit account details~~ SS-643 Users can edit their account details Nov 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SS-643 Users can edit their account details #235

SS-643 Users can edit their account details #235

anondo1969 commented Oct 7, 2024 •

edited

Loading

churnikov Oct 15, 2024

anondo1969 Oct 15, 2024

churnikov Oct 16, 2024

anondo1969 Oct 17, 2024

churnikov Oct 16, 2024

anondo1969 Oct 17, 2024

churnikov Oct 17, 2024

anondo1969 Oct 17, 2024

churnikov left a comment

churnikov Oct 17, 2024

anondo1969 Oct 21, 2024

churnikov Oct 21, 2024

churnikov Oct 21, 2024

churnikov Oct 21, 2024

churnikov commented Oct 22, 2024

anondo1969 commented Oct 22, 2024

	logger.info("Not saving user form info as nothing has changed", exc_info=True)
	logger.info("Not saving user form info as nothing has changed")

		user_form_retrived_data.password1 = user_profile_data.user.password
		user_form_retrived_data.password2 = user_profile_data.user.password

	common_user = True if not request.user.is_superuser else False
	common_user = not request.user.is_superuser

		# For the superuser it is expected to not to be able to update records
		# as it does not have a user profile object.

SS-643 Users can edit their account details #235

SS-643 Users can edit their account details #235

Conversation

anondo1969 commented Oct 7, 2024 • edited Loading

Description

Types of changes

Checklist

Further comments

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

churnikov left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

churnikov commented Oct 22, 2024

anondo1969 commented Oct 22, 2024

anondo1969 commented Oct 7, 2024 •

edited

Loading