feat: combined SSO improvements and CLI version flags - #13
Open
coolaj86 wants to merge 6 commits into
Open
Conversation
This file contains hidden or 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
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.
Combined deployment branch for
memos.oneal.im. Not intended for upstream — this is the integration branch that cherry-picks the six isolated feature PRs in lowest-conflict order.Included PRs (in apply order)
Conflicts resolved
CreateIdentityProviderDialog.tsx: docs(SSO): explain SSO filters with RE2 tester usememos/memos#6297 regex101 link preserved in feat(SSO): allow SSO filters on arbitrary claims usememos/memos#6301 restructured filter-pattern field; feat(SSO): separate External ID from Username mapping usememos/memos#6295 username field inserted alongside docs(SSO): claim mapping defaults and suggested values usememos/memos#6300 description propsen.json: all locale keys from all four UI PRs keptoauth2.go: Claims map population (feat(SSO): allow SSO filters on arbitrary claims usememos/memos#6301) +firstMappedClaimrefactor (feat: support ordered SSO claim fallbacks usememos/memos#6296) applied to all fields including username (feat(SSO): separate External ID from Username mapping usememos/memos#6295)oauth2_test.go: both new test functions keptbuf generatefrom merged proto sourcesVerification
go buildpassesgo testpassesgo vetcleanbuf generateproduces no diffmemos.oneal.imas versionmemos-oneal-im(commit1768c8d0)