Skip to content

Revert private key policy error handling in WebUI#32918

Merged
Joerger merged 2 commits intomasterfrom
joerger/enable-webui-with-hardware-key-support
Oct 9, 2023
Merged

Revert private key policy error handling in WebUI#32918
Joerger merged 2 commits intomasterfrom
joerger/enable-webui-with-hardware-key-support

Conversation

@Joerger
Copy link
Copy Markdown
Contributor

@Joerger Joerger commented Oct 3, 2023

Reverts gravitational/webapps#1298 so that the WebUI will work with Hardware Key support once #32781 is merged.

e PR https://github.com/gravitational/teleport.e/pull/2344

@Joerger Joerger requested a review from kimlisa October 3, 2023 18:31
@Joerger Joerger force-pushed the joerger/enable-webui-with-hardware-key-support branch from c8f46ef to 94e13b6 Compare October 3, 2023 19:19
@Joerger Joerger marked this pull request as ready for review October 3, 2023 19:21
@github-actions github-actions Bot requested review from gzdunek and ravicious October 3, 2023 19:22
@Joerger Joerger force-pushed the joerger/enable-webui-with-hardware-key-support branch 4 times, most recently from 9035b9e to 5b895b8 Compare October 4, 2023 00:30
Copy link
Copy Markdown
Member

@ravicious ravicious left a comment

Choose a reason for hiding this comment

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

Tested by compiling both OSS and e and logging in to both Web UIs.

Comment thread e
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

don't think this was intended?

Copy link
Copy Markdown
Contributor Author

@Joerger Joerger Oct 9, 2023

Choose a reason for hiding this comment

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

Plan is to update e ref here to https://github.com/gravitational/teleport.e/pull/2344, merge https://github.com/gravitational/teleport.e/pull/2344, then update e ref to e/master.

Merging this without the e changes will cause e to break/fail tests, but I'll see if there is a way to go that route.

@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from gzdunek October 4, 2023 17:46
@Joerger Joerger force-pushed the joerger/enable-webui-with-hardware-key-support branch from 5b895b8 to ff8d77d Compare October 9, 2023 18:00
@Joerger Joerger enabled auto-merge October 9, 2023 18:06
@Joerger Joerger force-pushed the joerger/enable-webui-with-hardware-key-support branch from ff8d77d to 589e330 Compare October 9, 2023 18:15
@Joerger Joerger force-pushed the joerger/enable-webui-with-hardware-key-support branch from 589e330 to f07a400 Compare October 9, 2023 18:52
@Joerger Joerger added this pull request to the merge queue Oct 9, 2023
Merged via the queue into master with commit 5e11bf5 Oct 9, 2023
@Joerger Joerger deleted the joerger/enable-webui-with-hardware-key-support branch October 9, 2023 19:17
Joerger added a commit that referenced this pull request Oct 10, 2023
github-merge-queue Bot pushed a commit that referenced this pull request Oct 10, 2023
…33173)

* Revert "Revert private key policy error handling in WebUI (#32918)"

This reverts commit 5e11bf5.

* Make privateKeyPolicyEnabled an optional field.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants