Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix login when email domain contains capital symbols and user was created after invitation to some org #7906

Conversation

Marishka17
Copy link
Contributor

@Marishka17 Marishka17 commented May 17, 2024

Motivation and context

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have created a changelog fragment
  • I have updated the documentation accordingly
  • I have added tests to cover my changes
  • I have linked related issues (see GitHub docs)
  • I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

Summary by CodeRabbit

  • Bug Fixes
    • Improved email creation process to ensure the use of the normalized email from the user object, enhancing data consistency and reducing errors.

Copy link
Contributor

coderabbitai bot commented May 17, 2024

Warning

Rate Limit Exceeded

@Marishka17 has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 0 minutes and 27 seconds before requesting another review.

How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.
Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.
Please see our FAQ for further information.

Commits Files that changed from the base of the PR and between 60933b5 and 79c3d9c.

Walkthrough

The email creation logic in the create method of the serializer within cvat/apps/organizations/serializers.py has been updated. Instead of using the original email passed to the method, the system now uses the normalized email from the user object. This ensures consistency and correctness in email handling.

Changes

File Path Change Summary
cvat/apps/organizations/serializers.py Updated email creation logic to use user.email instead of the passed user_email.

🐇
In code, a change so small and neat,
Emails now with more concrete.
User's email, normalized and clear,
Consistency we hold dear.
Cheers to code that's clean and bright,
For bugs, we'll put up a fight!
🐰


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between f7b47fe and 60933b5.
Files selected for processing (1)
  • cvat/apps/organizations/serializers.py (1 hunks)

Comment on lines +106 to +107
# User.objects.create_user(...) normalizes passed email and user.email can be different from original user_email
email = EmailAddress.objects.create(user=user, email=user.email, primary=True, verified=False)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use normalized email to ensure case-insensitive handling.

Consider adding a comment explaining why normalization is necessary, for future maintainability.

+ # Normalize email to handle case-insensitivity
  email = EmailAddress.objects.create(user=user, email=user.email, primary=True, verified=False)

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
# User.objects.create_user(...) normalizes passed email and user.email can be different from original user_email
email = EmailAddress.objects.create(user=user, email=user.email, primary=True, verified=False)
# User.objects.create_user(...) normalizes passed email and user.email can be different from original user_email
# Normalize email to handle case-insensitivity
email = EmailAddress.objects.create(user=user, email=user.email, primary=True, verified=False)

@Marishka17 Marishka17 changed the title [WIP] Fix login when email domain contains capital symbols Fix login when email domain contains capital symbols May 17, 2024
@Marishka17 Marishka17 requested a review from azhavoro May 20, 2024 09:05
@Marishka17 Marishka17 changed the title Fix login when email domain contains capital symbols Fix login when email domain contains capital symbols and user was created after invitation to some org May 22, 2024
@azhavoro
Copy link
Contributor

@Marishka17 please add a note to the changelog, otherwise LGTM

@Marishka17 Marishka17 requested a review from nmanovic as a code owner May 24, 2024 11:04
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 0% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 83.34%. Comparing base (852b396) to head (79c3d9c).
Report is 18 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7906      +/-   ##
===========================================
- Coverage    83.35%   83.34%   -0.01%     
===========================================
  Files          380      381       +1     
  Lines        40032    40053      +21     
  Branches      3766     3769       +3     
===========================================
+ Hits         33367    33384      +17     
- Misses        6665     6669       +4     
Components Coverage Δ
cvat-ui 79.25% <ø> (+0.03%) ⬆️
cvat-server 87.12% <16.66%> (-0.03%) ⬇️

@azhavoro azhavoro merged commit b4a165b into develop May 27, 2024
32 checks passed
@cvat-bot cvat-bot bot mentioned this pull request Jun 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants