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

Made external permissioned users and slack users show diff #3147

Merged
merged 6 commits into from
Nov 17, 2024

Conversation

hagen-danswer
Copy link
Contributor

@hagen-danswer hagen-danswer commented Nov 16, 2024

Description

Externally permissioned users no longer show up in the billing/admin panel.
Slack users now show up distincly

Screen.Recording.2024-11-16.at.8.56.57.AM.mov

Mental Checklist:

  • All of the automated tests pass
  • All PR comments are addressed and marked resolved
  • If there are migrations, they have been rebased to latest main
  • If there are new dependencies, they are added to the requirements
  • If there are new environment variables, they are added to all of the deployment methods
  • If there are new APIs that don't require auth, they are added to PUBLIC_ENDPOINT_SPECS
  • Docker images build and basic functionalities work
  • Author has done a final read through of the PR right before merge

Backporting (check the box to trigger backport action)

Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.

  • This PR should be backported (make sure to check that the backport attempt succeeds)

Copy link

vercel bot commented Nov 16, 2024

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

Name Status Preview Comments Updated (UTC)
internal-search ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 17, 2024 0:51am

@@ -43,7 +44,10 @@ def get_total_users_count(db_session: Session) -> int:
"""
user_count = (
db_session.query(User)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this filters out externally permissioned users

op.execute(
"""
UPDATE "user"
SET role = 'SLACK_USER'
Copy link
Contributor

Choose a reason for hiding this comment

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

default to external perm to be "least permissive"

@Weves Weves enabled auto-merge November 17, 2024 00:51
@Weves Weves added this pull request to the merge queue Nov 17, 2024
Merged via the queue into main with commit 954b5b2 Nov 17, 2024
11 of 12 checks passed
@Weves Weves deleted the role-external-user branch November 17, 2024 01:40
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