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(hybrid-cloud): Redirect to org restoration page for customer domains #45159

Merged

Conversation

dashed
Copy link
Member

@dashed dashed commented Feb 27, 2023

In the context of customer domains (i.e. accessing orgslug.sentry.io), this pull request adds the following:

  • when an organization is pending deletion, we redirect users to orgslug.sentry.io/restore/, and
  • when an organization is deleted, we redirect users to sentry.io/organizations/new/.

I've normalized these redirects for both Django views: ReactPageView and HomeView.

@dashed dashed requested a review from a team February 27, 2023 21:22
@dashed dashed self-assigned this Feb 27, 2023
@github-actions github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Feb 27, 2023
@@ -487,8 +488,8 @@ def is_auth_required(

return False

def handle_permission_required(self, request: Request, organization: Organization | RpcOrganization, *args: Any, **kwargs: Any) -> HttpResponse: # type: ignore[override]
if self.needs_sso(request, organization):
def handle_permission_required(self, request: Request, organization: Organization | RpcOrganization | None, *args: Any, **kwargs: Any) -> HttpResponse: # type: ignore[override]
Copy link
Member Author

Choose a reason for hiding this comment

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

I've adjusted the organization type here, since handle_permission_required() will be called when an organization is not visible.

Copy link
Member

@markstory markstory left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@dashed dashed force-pushed the hybrid-cloud/redirect-to-customer-domain-restore-route branch from 3dacd89 to 290fd0d Compare February 28, 2023 14:41
@dashed dashed enabled auto-merge (squash) February 28, 2023 14:41
@dashed dashed merged commit e242496 into master Feb 28, 2023
@dashed dashed deleted the hybrid-cloud/redirect-to-customer-domain-restore-route branch February 28, 2023 15:19
jan-auer added a commit that referenced this pull request Feb 28, 2023
* master: (79 commits)
  feat(perf-issues): Add performance issue detection timing runner command (#44912)
  Revert "chore: Investigating org slug already set to a different value (#45134)"
  fix(hybrid-cloud): Redirect to org restoration page for customer domains (#45159)
  bug(replays): Fix 500 error when marshaling tags field (#45097)
  ref(sourcemaps): Redesign lookup of source and sourcemaps (#45032)
  chore: Investigating org slug already set to a different value (#45134)
  feat(dynamic-sampling): Implement prioritize by project bias [TET-574] (#42939)
  feat(dynamic-sampling): Add transaction name prioritize option - (#45034)
  feat(dyn-sampling): add new bias toggle to project details for prioritise by tx name [TET-717] (#44944)
  feat(admin) Add admin relay project config view [TET-509] (#45120)
  Revert "chore(assignment): Add analytics when autoassigning after a manual assignment (#45099)"
  feat(sourcemaps): Implement new tables supporting debug ids (#44572)
  ref(js): Remove usage of react-document-title (#45170)
  chore(py): Consistently name urls using `organization-` prefix (#45180)
  ref: rename acceptance required checks collector (#45156)
  chore(assignment): Add analytics when autoassigning after a manual assignment (#45099)
  feat(source-maps): Update copy for source map debug alerts (#45164)
  ref(js): Remove custom usage of DocumentTitle (#45165)
  chore(login): update the login banners (#45151)
  ref(py): Remove one more legacy project_id from Environment (#45160)
  ...
@github-actions github-actions bot locked and limited conversation to collaborators Mar 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Scope: Backend Automatically applied to PRs that change backend components
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants