Skip to content

Conversation

@Dhruwang
Copy link
Member

What does this PR do?

Fixes FOR-1461

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (refactoring code, technical debt, workflow improvements)
  • Enhancement (small improvements)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change adds a new database migration
  • This change requires a documentation update

How should this be tested?

Create a formbricks account without using any provider (for example test@gmail.com)
Now try to login using same email but this time using a provider(for example lets say google)

Checklist

Required

  • Filled out the "How to test" section in this PR
  • Read How we Code at Formbricks
  • Self-reviewed my own code
  • Commented on my code in hard-to-understand bits
  • Ran pnpm build
  • Checked for warnings, there are none
  • Removed all console.logs
  • Merged the latest changes from main onto my branch with git pull origin main
  • My changes don't cause any responsiveness issues
  • First PR at Formbricks? Please sign the CLA! Without it we wont be able to merge it 🙏

Appreciated

  • If a UI change was made: Added a screen recording or screenshots to this PR
  • Updated the Formbricks Docs if changes were necessary

@vercel
Copy link

vercel bot commented Oct 30, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Ignored Deployments
Name Status Preview Comments Updated (UTC)
formbricks-cloud ⬜️ Ignored (Inspect) Visit Preview Oct 30, 2023 3:07am
formbricks-com ⬜️ Ignored (Inspect) Visit Preview Oct 30, 2023 3:07am

@github-actions
Copy link
Contributor

github-actions bot commented Oct 30, 2023

Thank you for following the naming conventions for pull request titles! 🙏

@review-agent-prime
Copy link
Contributor

The code looks good overall, but there are a few areas where improvements can be made:

  1. Error handling: The error handling in the onSubmit function could be improved. Currently, the error message is being set based on the error string, which is not a reliable way to handle errors. It would be better to handle specific error types or codes.

  2. useEffect dependency: In the useEffect hook where you're setting the sign-in error based on the URL parameter, you should include error in the dependency array. This will ensure that the effect runs whenever the error changes.

  3. Redundant state: The showLogin state seems to be redundant. It's only used to show or hide the login form, but this could be achieved by checking if the totpLogin or totpBackup states are false.

Here are the suggested changes:

// 1. Improved error handling
try {
  // ...
} catch (error) {
  let errorFeedback;
  if (error instanceof SomeSpecificError) {
    errorFeedback = "Specific error message";
  } else if (error.code === 'some_error_code') {
    errorFeedback = "Another specific error message";
  } else {
    errorFeedback = error.message;
  }
  setSignInError(errorFeedback);
} finally {
  setLoggingIn(false);
}

// 2. Add error to useEffect dependencies
useEffect(() => {
  if (error) {
    setSignInError(error);
  }
}, [error]);

// 3. Remove showLogin state
// Replace all instances of showLogin with !totpLogin && !totpBackup

Please consider these suggestions and apply them if they make sense in your context.

Copy link
Member

@mattinannt mattinannt left a comment

Choose a reason for hiding this comment

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

🙏

@mattinannt mattinannt added this pull request to the merge queue Oct 30, 2023
Merged via the queue into main with commit 7d0ebd3 Oct 30, 2023
@mattinannt mattinannt deleted the login-issue branch October 30, 2023 10:41
kevinkong91 added a commit to kevinkong91/formbricks that referenced this pull request Oct 30, 2023
* main: (28 commits)
  chore: Add Table of Contents to README (formbricks#1427)
  fix: account deletion failing issue (formbricks#1509)
  fix: remove welcome card from email preview (formbricks#1495)
  fix(bug): default role implemented (formbricks#1524)
  fix: changing description of Code Action (formbricks#1522)
  refactor: Migrate activity service (formbricks#1471)
  fix: Error in Docs navigation formbricks#1518 (formbricks#1521)
  feat: dynamic title and description (formbricks#1459)
  fix: Spelling Errors (formbricks#1517)
  fix: added scrollbar whenever overflowed in the settings/profile page (formbricks#1498)
  fix: long url not getting reset after closing modal (formbricks#1502)
  fix: Unexpected Behavior when Toggling Italics in Text Editor and improve clarity of formatting status (formbricks#1506)
  fix: zod pin validation failing (formbricks#1507)
  fix: Error message on Login not shown  (formbricks#1508)
  fix: downgrade nextjs to fix error with react email (formbricks#1516)
  chore: downgrade next version in formbricks-com (formbricks#1513)
  feat: picture selection question (formbricks#1388)
  feat: formtribe leaderboard update as per today (formbricks#1505)
  fix: Added if statement for preventing use of reserved word in question ID (formbricks#1435)
  fix: Disabling Welcome Card leads buggy preview (formbricks#1320)
  ...
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.

3 participants