Skip to content

Comments

Fix saml corner case#2464

Merged
fisx merged 9 commits intodevelopfrom
fix-saml-corner-case
Jun 9, 2022
Merged

Fix saml corner case#2464
fisx merged 9 commits intodevelopfrom
fix-saml-corner-case

Conversation

@fisx
Copy link
Contributor

@fisx fisx commented Jun 8, 2022

https://wearezeta.atlassian.net/browse/SQSERVICES-1616

Checklist

  • The PR Title explains the impact of the change.
  • The PR description provides context as to why the change should occur and what the code contributes to that effect. This could also be a link to a JIRA ticket or a Github issue, if there is one.
  • If this PR changes development workflow or dependencies, they have been A) automated and B) documented under docs/developer/. All efforts have been taken to minimize development setup breakage or slowdown for co-workers.
  • If HTTP endpoint paths have been added or renamed, or feature configs have changed, the endpoint / config-flag checklist (see Wire-employee only backend wiki page) has been followed.
  • If a cassandra schema migration has been added, I ran make git-add-cassandra-schema to update the cassandra schema documentation.
  • changelog.d contains the following bits of information (details):
    • A file with the changelog entry in one or more suitable sub-sections. The sub-sections are marked by directories inside changelog.d.
    • If new config options introduced: added usage description under docs/reference/config-options.md
    • If new config options introduced: recommended measures to be taken by on-premise instance operators.
    • If a cassandra schema migration is backwards incompatible (see also these docs), measures to be taken by on-premise instance operators are explained.
    • If a data migration (not schema migration) introduced: measures to be taken by on-premise instance operators.
    • If public end-points have been changed or added: does nginz need un upgrade?
    • If internal end-points have been added or changed: which services have to be deployed in a specific order?

@fisx fisx temporarily deployed to cachix June 8, 2022 13:19 Inactive
@fisx fisx temporarily deployed to cachix June 8, 2022 13:21 Inactive
@fisx fisx requested a review from battermann June 8, 2022 13:21
Copy link
Contributor

@battermann battermann left a comment

Choose a reason for hiding this comment

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

My comments are not very relevant, LGTM

let ek = userEmailKey em
blacklisted <- lift . wrapClient $ Blacklist.exists ek
eml <- either (throwE . InvalidNewEmail email) pure (validateEmail email)
let eky = userEmailKey eml
Copy link
Contributor

Choose a reason for hiding this comment

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

I personally find the name eky weird. But ok :-)

I would use eKey, emailKey or stick with ek

(validateEmail email)
let ek = userEmailKey em
blacklisted <- lift . wrapClient $ Blacklist.exists ek
eml <- either (throwE . InvalidNewEmail email) pure (validateEmail email)
Copy link
Contributor

Choose a reason for hiding this comment

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

Please do refactorings in a separate PR :-P

@fisx fisx temporarily deployed to cachix June 9, 2022 09:55 Inactive
@fisx fisx merged commit df13855 into develop Jun 9, 2022
@fisx fisx deleted the fix-saml-corner-case branch June 9, 2022 11:48
battermann added a commit that referenced this pull request Jun 9, 2022
smatting pushed a commit that referenced this pull request Jun 9, 2022
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.

2 participants