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/Email verification only for verified users #1875

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

kkatusic
Copy link
Collaborator

@kkatusic kkatusic commented Nov 25, 2024

Summary by CodeRabbit

  • New Features

    • Enhanced email verification process to prevent reuse of verified email addresses during user registration.
  • Bug Fixes

    • Improved error handling for invalid email formats and already verified emails.

@kkatusic kkatusic self-assigned this Nov 25, 2024
Copy link
Contributor

coderabbitai bot commented Nov 25, 2024

Walkthrough

The changes involve a modification to the sendUserEmailConfirmationCodeFlow method in the UserResolver class. The update enhances the query that checks for existing email addresses by adding a condition to ensure that only verified emails are considered. This change prevents users from reusing an email that is already associated with a verified account, thereby improving the integrity of the email verification process.

Changes

File Change Summary
src/resolvers/userResolver.ts Modified the sendUserEmailConfirmationCodeFlow method to check for isEmailVerified: true when querying existing emails.

Poem

🐰 In the garden where emails bloom,
A change was made to lift the gloom.
Verified now, they stand so bright,
No duplicates in the soft moonlight.
Hooray for logic, clear and true,
A safer path for me and you! 🌼


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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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: 0

🧹 Outside diff range and nitpick comments (1)
src/resolvers/userResolver.ts (1)

291-293: Consider handling unverified email duplicates.

While the change prevents verified email reuse, it might allow multiple unverified users to attempt verification with the same email. Consider adding a check for unverified duplicates and implementing a cleanup strategy.

Example implementation:

    // Check do we have an email already in the database and is it verified
    const isEmailAlreadyUsed = await User.findOne({
      where: { email: email, isEmailVerified: true },
    });
+   
+   // Check for unverified duplicates
+   const unverifiedDuplicate = await User.findOne({
+     where: { email: email, isEmailVerified: false, id: Not(user.id) },
+   });
+   
+   if (unverifiedDuplicate) {
+     // Option 1: Prevent the operation
+     return 'EMAIL_PENDING_VERIFICATION';
+     // Option 2: Clean up old unverified entries
+     // await unverifiedDuplicate.remove();
+   }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 5d7a1d0 and 594842f.

📒 Files selected for processing (1)
  • src/resolvers/userResolver.ts (1 hunks)
🔇 Additional comments (1)
src/resolvers/userResolver.ts (1)

291-293: LGTM! Verify impact on existing unverified users.

The addition of isEmailVerified: true condition correctly implements the requirement to only consider verified emails when checking for duplicates.

Let's verify if there are any existing unverified users that might be affected:

✅ Verification successful

Let me gather more information about email verification handling in the codebase.


The email verification implementation is correctly handling all edge cases

The codebase has comprehensive email verification handling that prevents any issues with unverified users:

  • The sendUserEmailConfirmationCodeFlow method checks if the current user's email is already verified before proceeding
  • Multiple safeguards exist across the codebase to prevent operations when email is not verified
  • Test cases cover scenarios for both verified and unverified emails
  • The implementation correctly allows multiple unverified users to attempt verification while preventing verified email duplicates
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Search for potential cases where multiple users share the same email
# but have different verification statuses

ast-grep --pattern 'await User.findOne({
  where: { email: $_, isEmailVerified: true },
})' -A 10

Length of output: 852


Script:

#!/bin/bash
# Search for other email verification related queries and checks
ast-grep --pattern 'where: { email: $_ }'

# Also search for any other email-related conditions
rg "email.*verified" -A 3

Length of output: 7885

@kkatusic kkatusic merged commit 04b3a19 into staging Nov 25, 2024
3 checks passed
@kkatusic kkatusic deleted the fix/email_verification_check branch November 25, 2024 12:19
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.

2 participants