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: Intercom setting anonymous user a common user id #36017

Merged
merged 2 commits into from
Aug 30, 2024

Conversation

hetunandu
Copy link
Member

@hetunandu hetunandu commented Aug 30, 2024

Description

Avoids setting the user_id field in intercom when the user is not logged in

Fixes https://github.com/appsmithorg/appsmith-ee/issues/5003

Automation

/ok-to-test tags="@tag.Sanity"

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/10631847104
Commit: 1eaad31
Cypress dashboard.
Tags: @tag.Sanity
Spec:


Fri, 30 Aug 2024 11:52:03 UTC

Communication

Should the DevRel and Marketing teams inform users about this change?

  • Yes
  • No

Summary by CodeRabbit

  • New Features

    • Enhanced user information handling for improved privacy in the application.
    • Anonymous users will no longer have their usernames processed, ensuring greater data protection.
  • Bug Fixes

    • Refined logic for extracting user information to prevent exposure of sensitive data.
  • Documentation

    • Updated comments and documentation to reflect changes in user data handling and privacy measures.

Copy link
Contributor

coderabbitai bot commented Aug 30, 2024

Walkthrough

The changes involve modifications to the bootIntercom function in the bootIntercom.ts file. These modifications enhance the handling of user information, particularly focusing on user privacy. The logic for extracting user details such as name, email, and username has been refined, ensuring that anonymous users are treated appropriately and that sensitive information is not exposed.

Changes

Files Change Summary
app/client/src/utils/bootIntercom.ts Updated bootIntercom function to improve user information handling, specifically refining logic for name, email, and username, and ensuring anonymous users are not processed further.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant bootIntercom
    participant Intercom

    User->>bootIntercom: Provide user data
    bootIntercom->>bootIntercom: Extract name, email, username
    bootIntercom->>Intercom: Send user data (if not anonymous)
Loading

🌟 In the code, a change took place,
Where usernames found a safer space.
Anonymous now, they fade away,
While privacy shines in a brighter way.
With names and emails, clear and bright,
Intercom greets with pure delight! 🎉


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.
    • @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.

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.

@hetunandu hetunandu added the ok-to-test Required label for CI label Aug 30, 2024
@github-actions github-actions bot added the Bug Something isn't working label Aug 30, 2024
albinAppsmith
albinAppsmith previously approved these changes Aug 30, 2024
@hetunandu hetunandu enabled auto-merge (squash) August 30, 2024 11:28
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.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 827f22e and 1eaad31.

Files selected for processing (1)
  • app/client/src/utils/bootIntercom.ts (2 hunks)
Additional comments not posted (1)
app/client/src/utils/bootIntercom.ts (1)

Line range hint 28-36: Consistency maintained in updateIntercomProperties.

This function remains unchanged and continues to update Intercom properties appropriately. It's good to see consistency maintained across the functions, ensuring that user data handling aligns with the new privacy standards set in bootIntercom.

The code changes are approved.

Comment on lines +10 to +15
let name: string | undefined = user?.name;
let email: string | undefined = user?.email;
let username =
user?.username === ANONYMOUS_USERNAME ? undefined : user?.username;
if (!cloudHosting && username) {
// We are hiding their information when self-hosted
Copy link
Contributor

Choose a reason for hiding this comment

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

Well done on enhancing user privacy!

The changes made to handle username and email more securely are commendable. It's good to see that anonymous users are not assigned a common user_id, aligning with the PR's objectives.

However, I noticed a small area for improvement:

  • The conditional logic inside the if (!cloudHosting && username) block could be simplified for better readability. Consider extracting this logic into a separate function to handle user data sanitization.

The code changes are approved.

Consider refactoring the user data sanitization into a separate function for clarity:

+ function sanitizeUserData(user: User | undefined) {
+   let username = user?.username === ANONYMOUS_USERNAME ? undefined : user?.username;
+   let email = user?.email;
+   if (!cloudHosting && username) {
+     username = sha256(username);
+     email = undefined;
+   }
+   return { username, email };
+ }

  export default function bootIntercom(user?: User) {
    if (intercomAppID && window.Intercom) {
      const { username, email } = sanitizeUserData(user);
      ...
    }
  }
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. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
let name: string | undefined = user?.name;
let email: string | undefined = user?.email;
let username =
user?.username === ANONYMOUS_USERNAME ? undefined : user?.username;
if (!cloudHosting && username) {
// We are hiding their information when self-hosted
function sanitizeUserData(user: User | undefined) {
let username = user?.username === ANONYMOUS_USERNAME ? undefined : user?.username;
let email = user?.email;
if (!cloudHosting && username) {
username = sha256(username);
email = undefined;
}
return { username, email };
}
let name: string | undefined = user?.name;
let email: string | undefined = user?.email;
let username =
user?.username === ANONYMOUS_USERNAME ? undefined : user?.username;
if (!cloudHosting && username) {
// We are hiding their information when self-hosted

@hetunandu hetunandu merged commit e69ca89 into release Aug 30, 2024
46 checks passed
@hetunandu hetunandu deleted the fix/intercom-anonymous-user branch August 30, 2024 11:52
Shivam-z pushed a commit to Shivam-z/appsmith that referenced this pull request Sep 26, 2024
)

## Description

Avoids setting the `user_id` field in intercom when the user is not
logged in

Fixes https://github.com/appsmithorg/appsmith-ee/issues/5003


## Automation

/ok-to-test tags="@tag.Sanity"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!IMPORTANT]
> 🟣 🟣 🟣 Your tests are running.
> Tests running at:
<https://github.com/appsmithorg/appsmith/actions/runs/10631847104>
> Commit: 1eaad31
> Workflow: `PR Automation test suite`
> Tags: `@tag.Sanity`
> Spec: ``
> <hr>Fri, 30 Aug 2024 11:26:34 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Enhanced user information handling for improved privacy in the
application.
- Anonymous users will no longer have their usernames processed,
ensuring greater data protection.

- **Bug Fixes**
- Refined logic for extracting user information to prevent exposure of
sensitive data.

- **Documentation**
- Updated comments and documentation to reflect changes in user data
handling and privacy measures.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working ok-to-test Required label for CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants