-
Notifications
You must be signed in to change notification settings - Fork 289
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: show enrollment modal for existing clients after e2ei activation [WPB-9816] #17422
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems fine / please add.. something to the PR body.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
question: Will it be snoozable for the existing mls client (basic credential type) during the grace period? 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Quality Gate passedIssues Measures |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks fine
… [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
* 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>
* 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
* 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
* 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: 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
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