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(users): Allow accepting invites for org_admins #6253

Merged
merged 4 commits into from
Oct 8, 2024

Conversation

ThisIsMani
Copy link
Contributor

@ThisIsMani ThisIsMani commented Oct 7, 2024

Type of Change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring
  • Dependency updates
  • Documentation
  • CI/CD

Description

Currently accepting invites for org_admin will not work. This PR fixes it.

Additional Changes

  • This PR modifies the API contract
  • This PR modifies the database schema
  • This PR modifies application configuration/environment variables

Motivation and Context

Closes #6254

How did you test it?

curl 'http://localhost:8080/user/accept_invite_from_email' \
  -H 'authorization: Bearer SPT with accept_invite_from_email' \
  --data-raw '{"token":"email token"}'

Response:

{
    "token": "JWT",
    "token_type": "user_info"
}

Checklist

  • I formatted the code cargo +nightly fmt --all
  • I addressed lints thrown by cargo clippy
  • I reviewed the submitted code
  • I added unit tests for my changes where possible

@ThisIsMani ThisIsMani added C-bug Category: Bug S-waiting-on-review Status: This PR has been implemented and needs to be reviewed A-users Area: Users labels Oct 7, 2024
@ThisIsMani ThisIsMani self-assigned this Oct 7, 2024
@ThisIsMani ThisIsMani requested review from a team as code owners October 7, 2024 15:00
Copy link

semanticdiff-com bot commented Oct 7, 2024

Review changes with SemanticDiff.

Analyzed 6 of 6 files.

Overall, the semantic diff is 22% smaller than the GitHub diff.

Filename Status
✔️ crates/router/src/utils/user_role.rs 18.09% smaller
✔️ crates/router/src/db/kafka_store.rs Analyzed
✔️ crates/router/src/db/user_role.rs 42.64% smaller
✔️ crates/router/src/core/user.rs 28.67% smaller
✔️ crates/router/src/core/user_role.rs Analyzed
✔️ crates/diesel_models/src/query/user_role.rs Analyzed

apoorvdixit88
apoorvdixit88 previously approved these changes Oct 7, 2024
crates/router/src/utils/user_role.rs Show resolved Hide resolved
Copy link
Contributor

@racnan racnan left a comment

Choose a reason for hiding this comment

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

lets remove Entity type from email and use one Entity across repo.

@likhinbopanna likhinbopanna added this pull request to the merge queue Oct 8, 2024
Merged via the queue into main with commit 2bc21cf Oct 8, 2024
14 of 17 checks passed
@likhinbopanna likhinbopanna deleted the accept-invite-org-admin branch October 8, 2024 11:43
@likhinbopanna likhinbopanna removed the S-waiting-on-review Status: This PR has been implemented and needs to be reviewed label Oct 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-users Area: Users C-bug Category: Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fix(users): Accepting invite for org_admins
6 participants