Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Document Google OpenID Connect email attribute #14081

Merged
merged 3 commits into from
Oct 7, 2022
Merged

Document Google OpenID Connect email attribute #14081

merged 3 commits into from
Oct 7, 2022

Conversation

ptman
Copy link
Contributor

@ptman ptman commented Oct 6, 2022

In the example config

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Pull request includes a sign off
  • Code style is correct
    (run the linters)

@ptman ptman requested a review from a team as a code owner October 6, 2022 13:18
@ptman
Copy link
Contributor Author

ptman commented Oct 6, 2022

This is a very short documentation change that I made using the GitHub web editor. Please let me know if all the boxes still need to be ticked

Copy link
Contributor

@DMRobertson DMRobertson left a comment

Choose a reason for hiding this comment

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

This is a very short documentation change that I made using the GitHub web editor. Please let me know if all the boxes still need to be ticked

Many thanks for this. Per that comment with the tickboxes, could you please:

  • add a changelog entry
  • a comment with your sign-off

There's no need to run the linters for a documentation-only change like this.

scopes: ["openid", "profile"]
scopes: ["openid", "profile", "email"] # email is optional, read below
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm guessing this corresponds to the three scopes listed here?

https://developers.google.com/identity/protocols/oauth2/scopes#oauth2

Copy link
Contributor

Choose a reason for hiding this comment

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

Sanity check: have you used this config yourself and confirmed that it works? (On matrix.org we are using the scope name https://www.googleapis.com/auth/userinfo.email.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It does, and yes.

@DMRobertson DMRobertson added the X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged label Oct 7, 2022
@ptman
Copy link
Contributor Author

ptman commented Oct 7, 2022

* add a changelog entry
* a comment with your sign-off

How do you perform these steps using the GitHub web interface?

There's no need to run the linters for a documentation-only change like this.

Thanks, that's what I thought.

@DMRobertson
Copy link
Contributor

How do you perform these steps using the GitHub web interface?

For adding a changelog entry, I think you want to go to the fork and branch that github has created for you and follow the instructions here.

For adding a sign-off, writing a comment on this PR with Signed-off-by: as per the notes here is all that's needed.

@clokep
Copy link
Member

clokep commented Oct 7, 2022

* add a changelog entry
* a comment with your sign-off

How do you perform these steps using the GitHub web interface?

You can go to https://github.com/ptman/synapse/tree/patch-1/changelog.d and click the + in the top right and choose "Create new file".

For sign-off you can just add it manually via a comment on the PR.

@ptman
Copy link
Contributor Author

ptman commented Oct 7, 2022

Signed-off-by: Paul Tötterman paul.totterman@iki.fi

Copy link
Contributor

@DMRobertson DMRobertson left a comment

Choose a reason for hiding this comment

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

Many thanks, SGTM!

@DMRobertson DMRobertson enabled auto-merge (squash) October 7, 2022 13:51
@DMRobertson DMRobertson removed the X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged label Oct 7, 2022
@DMRobertson DMRobertson merged commit 8074430 into matrix-org:develop Oct 7, 2022
@ptman ptman deleted the patch-1 branch October 10, 2022 08:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants