fix: show enrollment modal for existing clients after e2ei activation [WPB-9816] #17422
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tlebon
approved these changes
May 17, 2024
PatrykBuniX
reviewed
May 22, 2024
| @@ -99,6 +100,11 @@ export function getEnrollmentTimer( | |||
| const deadline = getGracePeriod(identity, e2eiActivatedAt, teamGracePeriodDuration); | |||
| const nextTick = getNextTick(deadline); | |||
|
|
|||
| // For the first activation, we want to trigger the timer immediately | |||
| if (isFirstActivation) { | |||
| return {isSnoozable: nextTick > 0, firingDate: Date.now()}; | |||
There was a problem hiding this comment.
question: Will it be snoozable for the existing mls client (basic credential type) during the grace period? 🤔
There was a problem hiding this comment.
Depends on the nextTick value I guess.
Nothing changed code related to this case. We just show the modal now with the option to snooze after first activation instead of snoozing automatically.
|
github-actions bot
pushed a commit
that referenced
this pull request
May 22, 2024
… [WPB-9816] (#17422) * fix: show modal after first activation * chore: please pipeline, run tests * fix: make it possible to snooze for existing clients after failed enrolment
otto-the-bot
added a commit
that referenced
this pull request
May 23, 2024
* Revert "fix: show enrollment modal for existing clients after e2ei activation [WPB-9816] (#17422)" This reverts commit 72c8c63. * runfix: show modal for a basic device * runfix: old client can snooze the enrollment * test: enrollment for basic credential type Co-authored-by: Patryk Górka <patrykbunix@gmail.com>
PatrykBuniX
added a commit
that referenced
this pull request
May 24, 2024
* Revert "fix: show enrollment modal for existing clients after e2ei activation [WPB-9816] (#17422)" This reverts commit 72c8c63. * runfix: old client can snooze the enrollment * runfix: show the update button during the grace period * runfix: always calculate the next fire date * runfix: don't open the confirmation modal if delay <= 0 * test: fix tests * test: show get cert button * Revert "runfix: always calculate the next fire date" This reverts commit b15d2c7. * runfix: reset timers when updating the cert manually * refactor: use certificate status * runfix: pass 'is current device' flag * runfix: update state after enrollment * runfix: recalculate isSnoozable value when task runs * refactor: improve naming * runfix: get and update buttons visible at once * test: update expired cert test * test: expires soon cert
github-actions bot
pushed a commit
that referenced
this pull request
May 24, 2024
* Revert "fix: show enrollment modal for existing clients after e2ei activation [WPB-9816] (#17422)" This reverts commit 72c8c63. * runfix: old client can snooze the enrollment * runfix: show the update button during the grace period * runfix: always calculate the next fire date * runfix: don't open the confirmation modal if delay <= 0 * test: fix tests * test: show get cert button * Revert "runfix: always calculate the next fire date" This reverts commit b15d2c7. * runfix: reset timers when updating the cert manually * refactor: use certificate status * runfix: pass 'is current device' flag * runfix: update state after enrollment * runfix: recalculate isSnoozable value when task runs * refactor: improve naming * runfix: get and update buttons visible at once * test: update expired cert test * test: expires soon cert
PatrykBuniX
added a commit
that referenced
this pull request
May 27, 2024
* Revert "fix: show enrollment modal for existing clients after e2ei activation [WPB-9816] (#17422)" This reverts commit 72c8c63. * runfix: old client can snooze the enrollment * runfix: show the update button during the grace period * runfix: always calculate the next fire date * runfix: don't open the confirmation modal if delay <= 0 * test: fix tests * test: show get cert button * Revert "runfix: always calculate the next fire date" This reverts commit b15d2c7. * runfix: reset timers when updating the cert manually * refactor: use certificate status * runfix: pass 'is current device' flag * runfix: update state after enrollment * runfix: recalculate isSnoozable value when task runs * refactor: improve naming * runfix: get and update buttons visible at once * test: update expired cert test * test: expires soon cert
PatrykBuniX
added a commit
that referenced
this pull request
May 27, 2024
* runfix: renew certificate device details [WPB-9193] (#17451) * Revert "fix: show enrollment modal for existing clients after e2ei activation [WPB-9816] (#17422)" This reverts commit 72c8c63. * runfix: old client can snooze the enrollment * runfix: show the update button during the grace period * runfix: always calculate the next fire date * runfix: don't open the confirmation modal if delay <= 0 * test: fix tests * test: show get cert button * Revert "runfix: always calculate the next fire date" This reverts commit b15d2c7. * runfix: reset timers when updating the cert manually * refactor: use certificate status * runfix: pass 'is current device' flag * runfix: update state after enrollment * runfix: recalculate isSnoozable value when task runs * refactor: improve naming * runfix: get and update buttons visible at once * test: update expired cert test * test: expires soon cert * runfix: reset timer only after user interaction with modal [WPB-9431] (#17469) * runfix: reset timer only after user interaction with modal * test: reset timer on user interaction * docs: add comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We did automatically "snooze" the certificate enrollment for existing clients, after e2ei feature activation.
This was not supposed to happen, instead we need to show the activation modal to the user, and he/she needs to take action to either enroll or snooze him-/herself