Skip to content

Comments

User can able to delete from bin #670

Merged
MrgSub merged 25 commits intoMail-0:stagingfrom
Adarsh9977:zero/new-feature
Apr 25, 2025
Merged

User can able to delete from bin #670
MrgSub merged 25 commits intoMail-0:stagingfrom
Adarsh9977:zero/new-feature

Conversation

@Adarsh9977
Copy link
Contributor

@Adarsh9977 Adarsh9977 commented Apr 15, 2025

Description

User now able to delete his mails permanently from bin


Type of Change

Please delete options that are not relevant.

  • ✨ New feature (non-breaking change which adds functionality)
  • 🎨 UI/UX improvement
  • 🔒 Security enhancement
  • ⚡ Performance improvement

Present workflow

  • user not able to delete his mails from bin
Screen.Recording.2025-04-15.at.5.12.38.PM.mov

Upgraded workflow

  • user now able to delete his mails permanently from bin
Screen.Recording.2025-04-15.at.5.14.13.PM.mov

By submitting this pull request, I confirm that my contribution is made under the terms of the project's license.

Summary by CodeRabbit

  • New Features
    • Added the ability to permanently delete email threads from the Bin folder via a new context menu option.
  • Improvements
    • Enhanced Google authentication by requesting additional permissions for broader mail access.
  • User Interface
    • Introduced new status messages and labels for mail deletion actions, providing clearer feedback during the deletion process.

@vercel
Copy link

vercel bot commented Apr 15, 2025

@Adarsh9977 is attempting to deploy a commit to the Zero Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Apr 15, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Walkthrough

A new asynchronous function for deleting email threads has been added to the mail actions. The thread context menu now includes an option to delete threads from the Bin folder, invoking this new deletion logic and providing user feedback via toast notifications. The Google OAuth provider's scope has been expanded to include both mail modification and full mail access. Additionally, new English localization strings have been introduced to support the deletion action and related UI elements.

Changes

File(s) Change Summary
apps/mail/actions/mail.ts Added deleteThread async function for deleting email threads with error handling.
apps/mail/components/context/thread-context.tsx Added handleDelete async function and "Delete from Bin" context menu item, integrating deletion UI and toast feedback.
apps/mail/lib/auth-providers.ts Expanded Google OAuth provider scopes to include full mail access.
apps/mail/locales/en.json Added new localization strings for deletion actions and menu labels.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant UI (ThreadContextMenu)
    participant Actions (deleteThread)
    participant Driver
    participant Toast

    User->>UI (ThreadContextMenu): Clicks "Delete from Bin"
    UI->>Toast: Show "Deleting mail..."
    UI->>Actions (deleteThread): Calls handleDelete with threadId
    Actions->>Driver: driver.delete(threadId)
    alt Success
        Actions->>UI: Return { success: true }
        UI->>Toast: Show "Mail deleted"
        UI->>UI: mutate() to refresh threads
    else Error
        Actions->>UI: Throw error
        UI->>Toast: Show "Failed to delete mail"
    end
Loading

Suggested reviewers

  • needleXO
  • MrgSub

Poem

In the Bin, a thread may dwell,
But now a button casts its spell—
With a click and a toast,
The old mail is lost,
As rabbits cheer, "Delete works well!"
🐇✉️✨


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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 generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this 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: 1

🧹 Nitpick comments (3)
apps/mail/lib/auth-providers.ts (1)

51-51:

Details

❓ Verification inconclusive

Scope expansion should follow principle of least privilege.

The Google OAuth scope has been expanded to include both "https://www.googleapis.com/auth/gmail.modify" and "https://mail.google.com". However, using both scopes appears redundant since "https://mail.google.com" already provides full access to Gmail, which includes all permissions from the more limited "gmail.modify" scope.

Consider using only the minimum scope required for the application's functionality. If the delete operation requires full access, you could simplify to:

-      scope: ["https://www.googleapis.com/auth/gmail.modify", 'https://mail.google.com'],
+      scope: ["https://mail.google.com"],

🌐 Web query:

What's the difference between Gmail API scopes "https://www.googleapis.com/auth/gmail.modify" and "https://mail.google.com"?

💡 Result:

The primary difference between the Gmail API scopes https://www.googleapis.com/auth/gmail.modify and https://mail.google.com lies in their levels of access and use cases:

1. Scope: https://www.googleapis.com/auth/gmail.modify

  • Access Level: This is a more restricted scope. It allows applications to read, send, and modify emails in the user's Gmail account but does not grant full control or other advanced permissions like account settings management.
  • Capabilities:
    • Reading emails.
    • Sending emails.
    • Modifying emails (e.g., marking messages as read/unread or applying labels).
  • Limitations: This scope cannot perform non-email functions like managing Gmail settings or accessing certain advanced features.
  • Use Case: Ideal for apps that need to perform basic email tasks while maintaining a narrower security profile[1][3][5].

2. Scope: https://mail.google.com

  • Access Level: This is a significantly broader scope that grants full access to the Gmail account, including all emails, labels, settings, and metadata.
  • Capabilities:
    • Everything possible with the gmail.modify scope, plus:
      • Access to Gmail settings (e.g., filters and forwarding).
      • Viewing and managing additional account configurations.
    • Essentially provides complete control over the Gmail mailbox and associated data.
  • Limitations: Due to the high level of access, this scope requires a higher level of security review from Google to ensure proper use.
  • Use Case: Best suited for applications that need extensive control over a Gmail account, such as email backup and migration tools or apps requiring deep Gmail integration[1][3][4][6].

Key Differences in Summary:

Feature https://www.googleapis.com/auth/gmail.modify https://mail.google.com
Level of Access Moderate - Focused on email modification Full - Broad access and control
Email Modification Yes Yes
Settings Management No Yes
Metadata & Advanced Access Limited Full
Review Requirement Standard High (due to greater permissions)

In conclusion, https://www.googleapis.com/auth/gmail.modify is a more secure, limited scope designed for basic email functionality, whereas https://mail.google.com provides full access, making it more versatile but also riskier and requiring stricter compliance measures.

Citations:


Action: Revisit the OAuth Scope Selection

The current implementation in apps/mail/lib/auth-providers.ts (line 51) includes both
"https://www.googleapis.com/auth/gmail.modify" and "https://mail.google.com". Since "https://mail.google.com" already provides full access—including all capabilities granted by "gmail.modify"—this dual inclusion is redundant. In line with the principle of least privilege, please confirm which level of access is truly needed:

  • If only email modifications (including deletion) are required:
    Use the more restricted scope "https://www.googleapis.com/auth/gmail.modify" to minimize access.

  • If full mailbox access is required:
    Keep only "https://mail.google.com".

Example diff (if full access is intended):

-      scope: ["https://www.googleapis.com/auth/gmail.modify", "https://mail.google.com"],
+      scope: ["https://mail.google.com"],
apps/mail/actions/mail.ts (1)

158-169: The deleteThread implementation looks good.

The function correctly obtains the active mail driver, performs the deletion operation, and handles errors appropriately. It follows the same error handling pattern used throughout the file.

For consistency with other functions:

-  console.log("Deleting thread:", id);
+  console.log(`Server: Deleting thread ${id}`);
apps/mail/components/context/thread-context.tsx (1)

259-265: Context menu item for deleting from bin implemented correctly.

The menu item is properly placed in the bin-specific actions and uses appropriate icons and labels.

For consistency with the bulk selection handling in other actions, consider modifying handleDelete to support bulk deletion:

  const handleDelete = async () => {
    try {
+      const targets = mail.bulkSelected.length ? mail.bulkSelected : [threadId];
+      
-      const promise = deleteThread({ id: threadId }).then(() => {
+      // Since deleteThread only accepts one ID at a time, we need to process them sequentially
+      const promise = Promise.all(
+        targets.map(id => deleteThread({ id }))
+      ).then(() => {
        setMail(prev => ({ ...prev, bulkSelected: [] }));
        return mutate();
      });
      
      toast.promise(promise, {
        loading: t('common.actions.deletingMail'),
        success: t('common.actions.deletedMail'),
        error: t('common.actions.failedToDeleteMail'),
      });
    } catch (error) {
-      console.error(`Error deleting ${threadId ? 'email' : 'thread'}:`, error);
+      console.error('Error deleting emails:', error);
    }
  };
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 4f5f60f and abfeca0.

📒 Files selected for processing (4)
  • apps/mail/actions/mail.ts (1 hunks)
  • apps/mail/components/context/thread-context.tsx (3 hunks)
  • apps/mail/lib/auth-providers.ts (1 hunks)
  • apps/mail/locales/en.json (2 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (2)
apps/mail/actions/mail.ts (2)
apps/mail/app/api/driver/google.ts (1)
  • driver (85-823)
apps/mail/actions/utils.ts (3)
  • getActiveDriver (29-60)
  • FatalErrors (9-9)
  • deleteActiveConnection (11-27)
apps/mail/components/context/thread-context.tsx (1)
apps/mail/actions/mail.ts (1)
  • deleteThread (158-169)
🔇 Additional comments (3)
apps/mail/locales/en.json (2)

22-24: Good addition of required localization strings for deletion operations.

The added strings for deletion operations follow the existing pattern and will enable proper user feedback during mail deletion operations.


251-251: Appropriately added "Delete from Bin" menu label.

This label is correctly added to support the new context menu item implemented in the thread-context component.

apps/mail/components/context/thread-context.tsx (1)

38-38: Correctly added import for the deleteThread function.

The import statement has been properly updated to include the new deleteThread function from mail actions.

@MrgSub
Copy link
Collaborator

MrgSub commented Apr 15, 2025

Changing the scopes requires a whole thing with google, putting this on hold

@MrgSub MrgSub added the on hold to revisit in the near future label Apr 15, 2025
@Adarsh9977
Copy link
Contributor Author

@MrgSub got it

@MrgSub MrgSub changed the base branch from main to staging April 17, 2025 05:04
@vercel
Copy link

vercel bot commented Apr 17, 2025

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

Name Status Preview Comments Updated (UTC)
0 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 24, 2025 8:13pm

prompt: "consent",
accessType: "offline",
scope: ["https://www.googleapis.com/auth/gmail.modify"],
scope: ["https://www.googleapis.com/auth/gmail.modify", 'https://mail.google.com'],
Copy link
Collaborator

Choose a reason for hiding this comment

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

Let's not change the scopes, our scope should be enough

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok @MrgSub

Copy link
Contributor Author

Choose a reason for hiding this comment

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

should I close his PR or left it for future

Copy link
Contributor

Choose a reason for hiding this comment

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

we just don't need that scope. remove it and we can merge

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ahmetskilinc removed the scope

@ahmetskilinc
Copy link
Contributor

@Adarsh9977 is this ready now?

@Adarsh9977
Copy link
Contributor Author

@ahmetskilinc yes ready

@Adarsh9977
Copy link
Contributor Author

@ahmetskilinc on hold from many days !

@Adarsh9977 Adarsh9977 requested a review from ahmetskilinc April 25, 2025 17:47
@MrgSub MrgSub merged commit e9f159d into Mail-0:staging Apr 25, 2025
2 of 3 checks passed
@coderabbitai coderabbitai bot mentioned this pull request Apr 25, 2025
MrgSub added a commit that referenced this pull request Apr 25, 2025
* draft fixes:
- added cc and bcc when saving drafts
- save drafts less aggresively

* some fixes for saving attachments to draft

* fix for empty draft loading

* fix draft list recipient name/address

* also show 'No Recipient' if empty

* remove comments

* switch to mimetext for draft saving to keep formatting consistent

* add message title to draft list

* feat: single api for oauth connections

* fix: add extra error handling

* chore: simplify and fix the dev env

* Ai generate security (#706)

* Create prompts with XML formatting

* Include XML formatted prompts in generate func

* remove unused regex and add helper functions/warnings

* error handling

* Update apps/mail/lib/prompts.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* lint issues

* Update prompts.ts

* #706 (comment)

Coderabbit fix 1

* erabbitai bot 3 days ago ⚠️ Potential issue  errorOccurred state is stale inside finally  React state setters (setErrorOccurred) are asynchronous; the errorOccurred value captured at render time will not yet reflect changes made earlier in the same event loop. Consequently, the logic deciding whether to collapse/expand may run with an outdated flag.  -  } finally { -      setIsLoading(false); -      if (!errorOccurred || isAskingQuestion) { -        setIsExpanded(true); -      } else { -        setIsExpanded(false); // Collapse on errors -      } -  } +  } finally { +      setIsLoading(false); +      // Use a local flag to track errors deterministically +      const hadError = isAskingQuestion ? false : !!errorFlagRef.current; +      setIsExpanded(!hadError); +  } You can create const errorFlagRef = useRef(false); and update errorFlagRef.current = true every time an error is detected, ensuring reliable behaviour irrespective of React batching.  Committable suggestion skipped: line range outside the PR's diff.

* #706 (comment)

* #706 (comment)

* #706 (comment)

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Add a new Vietnamese translation file to support Vietnamese language users (#726)

* feat(i18n): add Vietnamese language support

Add Vietnamese ('vi') to the list of supported languages in the
i18n configuration and JSON file to expand language options.

* Add a new Vietnamese translation file to support Vietnamese language users.

* Clear Vietnamese translation strings

* Update es.json (#710)

Co-authored-by: needle <122770437+needleXO@users.noreply.github.com>

* Update app manifest and add new icons for PWA (#739)

* feat: allow sending from email aliases added through gmail (#743)

* Refactor IP handling in early-access routes

* Add unauthorized error handling in sign out function

* Redirect from Home Page on Session (#701)

* Updated lockfile

* Updated home page session validation

---------

Co-authored-by: Adam <x_1337@outlook.com>

* Refactor settings handling and golden ticket logic

* Feat: og:image Generation on /compose route (#730)

* Create route og image

* resolve coderabbit nitpicks

---------

Co-authored-by: Adam <x_1337@outlook.com>

* Update session check to include user id before redirecting

* Fix unauthorized error handling in multiple actions

* Enable shortcuts settings in navigation

* Refactor error handling to return unauthorized gracefully

* Update Hero component with new imports and link adjustments

* Update redirect URL to use hostname from req object

* Fix redirect URL formatting and add log for missing user ID

* Fix error handling in API routes for unauthorized requests

* Refactor throwUnauthorizedGracefully function for readability

* Fix error handling in driver routes

* Handle unauthorized gracefully when getting connections

* Refactor mail actions for better error handling

* Refactor deleteActiveConnection function for readability

* fixed (#752)

* Refactor error handling in mail actions to return null or specific error messages instead of throwing unauthorized errors. This improves readability and maintains functionality across various actions.

* Update Google auth provider configuration

* Delete connection and update hero text

* Refactor error handling to use StandardizedError class

* Refactor error handling for Google API driver

* Add labels to sidebar, labels settings and useLabels hook (#746)

* Adds labels from the provider:
- labels page in settings
- labels page translations
- added labels for google provider

* useLabels and labels in sidebar

* fix rate limit parts of labels route

* Added labels to mail-list

* - add rate limiting
- move useThreadsLabel

---------

Co-authored-by: Adam <x_1337@outlook.com>

* bin count of unread messages

* dixes drafts not saving persistently

* dont show from field is no aliases

* limited height of attachment dialog

* added delete page

* correct way to delete accounts

* - adds new revokeRefreshToken method to Google driver
- updates lib/auth.ts to use the new method
- updates actions/user.ts
- updates app/(routes)/settings/danger-zone/page.tsx

* Add posthog-js dependency and implement label filtering in NavMain component

- Added posthog-js version 1.236.6 to package.json and bun.lock.
- Introduced search functionality by implementing handleFilterByLabel in NavMain component.
- Updated NavItem to trigger label filtering on click.

* Enhance NavItem component to support onClick event handling

- Updated NavItem to include an onClick prop for the Link component, allowing for custom click behavior.
- Maintained existing functionality with prefetch and target attributes.

* fix: add missing dompurify dep (#765)

* user can edit enail after selecting (#760)

* User can able to delete from bin  (#670)

* delete mails permanently from bin

* add English translations for delete mail actions

* update the call handleDelete

* fixed handle delete function

* handleDelete call

* enhance handledelete to reset bulk selection after deletion

* removed the scope

* delete mails permanently from bin

* add English translations for delete mail actions

* update the call handleDelete

* handleDelete call

* enhance handledelete to reset bulk selection after deletion

* removed the scope

---------

Co-authored-by: Ahmet Kilinc <akx9@icloud.com>
Co-authored-by: Adam <x_1337@outlook.com>

* send draft instead of new message (#767)

* Add sendDraft method to Gmail driver and MailManager interface

* fix sendDraft method

* Add support for sending draft emails and clear draftId after sending

---------

Co-authored-by: Adam <x_1337@outlook.com>

* Add Chinese language support for mail app

* Update email addresses in send function

* Add import statement for deleteActiveConnection function

---------

Co-authored-by: Ahmet Kilinc <akx9@icloud.com>
Co-authored-by: BlankParticle <blankparticle@gmail.com>
Co-authored-by: grim <75869731+ripgrim@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Chánh Đại <dai@chanhdai.com>
Co-authored-by: Dani B. <danibaldomirm@gmail.com>
Co-authored-by: needle <122770437+needleXO@users.noreply.github.com>
Co-authored-by: Humber Nieto <56887259+humbernieto@users.noreply.github.com>
Co-authored-by: Atharva Deosthale <atharva.deosthale17@gmail.com>
Co-authored-by: Nikita Drokin <86173808+nikitadrokin@users.noreply.github.com>
Co-authored-by: Adarsh Tiwari <adarshtiwari797023@gmail.com>
Co-authored-by: Adarsh Tiwari <134617221+Adarsh9977@users.noreply.github.com>
@coderabbitai coderabbitai bot mentioned this pull request Apr 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

on hold to revisit in the near future

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants