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] Push gateway and cloud integration #18377

Merged
merged 3 commits into from
Jul 27, 2020
Merged

Conversation

sampaiodiego
Copy link
Member

@sampaiodiego sampaiodiego commented Jul 24, 2020

Proposed changes

Add more strict relationship between push gateway and cloud registration.

Disable push gateway if server is not registered to our cloud services but also alerts admins via a banner and a message as shown on the screenshot below.

Issue(s)

How to test or reproduce

Screenshots

  • alert and message sent to admins during upgrade
    image

  • new description to settings
    image

image

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Hotfix (a major bugfix that has to be merged asap)
  • Documentation Update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Changelog

Further comments

@geekgonecrazy
Copy link
Contributor

This alert is only when disabled indirectly right?

@sampaiodiego
Copy link
Member Author

sampaiodiego commented Jul 25, 2020

the alert is triggered only during server upgrade if push gateway is enabled and server is not registered and cloud services terms not agreed. so in this scenario the push gateway setting will be automatically disabled and the alert will be sent.

after server upgrade push gateway will be blocked if those conditions are not met, thus no alert needed.

Copy link
Contributor

@geekgonecrazy geekgonecrazy left a comment

Choose a reason for hiding this comment

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

I think we need to make sure to add a checkbox on the connectivity services screen to agree otherwise once through wizard they have no clear place to find this

@sampaiodiego
Copy link
Member Author

I think we need to make sure to add a checkbox on the connectivity services screen to agree otherwise once through wizard they have no clear place to find this

we'll add a checkbox in another PR 😉

@sampaiodiego sampaiodiego dismissed geekgonecrazy’s stale review July 27, 2020 12:49

we'll add a checkbox in another PR

@sampaiodiego sampaiodiego merged commit dfeebb8 into develop Jul 27, 2020
@sampaiodiego sampaiodiego deleted the push-gateway-and-cloud branch July 27, 2020 12:51
@sampaiodiego sampaiodiego mentioned this pull request Jul 28, 2020
@Exordian
Copy link
Contributor

Exordian commented Aug 22, 2020

This change will also disable non-official push gateways (when configured). I guess that's not intended, since this should not require any terms and conditions from the rocketchat cloud infrastructure.

@rodrigok
Copy link
Member

@Exordian that's a good question, we didn't realize other push gateways may exist. Will figure out a solution for that.

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.

4 participants