[#7035] updated the X/Twitter provider to return the confirmed_email field and to use the x.com domain
This commit is contained in:
Gani Georgiev
parent
5461120b04
commit
125e99e4c8
|
|
@ -26,24 +26,25 @@ type Twitter struct {
|
||||||
func NewTwitterProvider() *Twitter {
|
func NewTwitterProvider() *Twitter {
|
||||||
return &Twitter{BaseProvider{
|
return &Twitter{BaseProvider{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
displayName: "Twitter",
|
displayName: "X/Twitter",
|
||||||
pkce: true,
|
pkce: true,
|
||||||
scopes: []string{
|
scopes: []string{
|
||||||
"users.read",
|
"users.read",
|
||||||
|
"users.email",
|
||||||
|
|
||||||
// we don't actually use this scope, but for some reason it is required by the `/2/users/me` endpoint
|
// we don't actually use this scope, but for some reason the `/2/users/me` endpoint fails with 403 without it
|
||||||
// (see https://developer.twitter.com/en/docs/twitter-api/users/lookup/api-reference/get-users-me)
|
// (see https://docs.x.com/fundamentals/authentication/guides/v2-authentication-mapping#x-api-v2-authentication-mapping)
|
||||||
"tweet.read",
|
"tweet.read",
|
||||||
},
|
},
|
||||||
authURL: "https://twitter.com/i/oauth2/authorize",
|
authURL: "https://x.com/i/oauth2/authorize",
|
||||||
tokenURL: "https://api.twitter.com/2/oauth2/token",
|
tokenURL: "https://api.x.com/2/oauth2/token",
|
||||||
userInfoURL: "https://api.twitter.com/2/users/me?user.fields=id,name,username,profile_image_url",
|
userInfoURL: "https://api.x.com/2/users/me?user.fields=id,name,username,profile_image_url,confirmed_email",
|
||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FetchAuthUser returns an AuthUser instance based on the Twitter's user api.
|
// FetchAuthUser returns an AuthUser instance based on the Twitter's user api.
|
||||||
//
|
//
|
||||||
// API reference: https://developer.twitter.com/en/docs/twitter-api/users/lookup/api-reference/get-users-me
|
// API reference: https://docs.x.com/x-api/users/user-lookup-me
|
||||||
func (p *Twitter) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
|
func (p *Twitter) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
|
||||||
data, err := p.FetchRawUserInfo(token)
|
data, err := p.FetchRawUserInfo(token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -60,11 +61,8 @@ func (p *Twitter) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
|
||||||
Id string `json:"id"`
|
Id string `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
|
Email string `json:"confirmed_email"`
|
||||||
ProfileImageURL string `json:"profile_image_url"`
|
ProfileImageURL string `json:"profile_image_url"`
|
||||||
|
|
||||||
// NB! At the time of writing, Twitter OAuth2 doesn't support returning the user email address
|
|
||||||
// (see https://twittercommunity.com/t/which-api-to-get-user-after-oauth2-authorization/162417/33)
|
|
||||||
// Email string `json:"email"`
|
|
||||||
} `json:"data"`
|
} `json:"data"`
|
||||||
}{}
|
}{}
|
||||||
if err := json.Unmarshal(data, &extracted); err != nil {
|
if err := json.Unmarshal(data, &extracted); err != nil {
|
||||||
|
|
@ -75,6 +73,7 @@ func (p *Twitter) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
|
||||||
Id: extracted.Data.Id,
|
Id: extracted.Data.Id,
|
||||||
Name: extracted.Data.Name,
|
Name: extracted.Data.Name,
|
||||||
Username: extracted.Data.Username,
|
Username: extracted.Data.Username,
|
||||||
|
Email: extracted.Data.Email,
|
||||||
AvatarURL: extracted.Data.ProfileImageURL,
|
AvatarURL: extracted.Data.ProfileImageURL,
|
||||||
RawUser: rawUser,
|
RawUser: rawUser,
|
||||||
AccessToken: token.AccessToken,
|
AccessToken: token.AccessToken,
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<svg width="256px" height="209px" viewBox="0 0 256 209" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
|
<svg width="300" height="300.251" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||||
<g>
|
<path d="M178.57 127.15 290.27 0h-26.46l-97.03 110.38L89.34 0H0l117.13 166.93L0 300.25h26.46l102.4-116.59 81.8 116.59h89.34M36.01 19.54H76.66l187.13 262.13h-40.66"/>
|
||||||
<path d="M256,25.4500259 C246.580841,29.6272672 236.458451,32.4504868 225.834156,33.7202333 C236.678503,27.2198053 245.00583,16.9269929 248.927437,4.66307685 C238.779765,10.6812633 227.539325,15.0523376 215.57599,17.408298 C205.994835,7.2006971 192.34506,0.822 177.239197,0.822 C148.232605,0.822 124.716076,24.3375931 124.716076,53.3423116 C124.716076,57.4586875 125.181462,61.4673784 126.076652,65.3112644 C82.4258385,63.1210453 43.7257252,42.211429 17.821398,10.4359288 C13.3005011,18.1929938 10.710443,27.2151234 10.710443,36.8402889 C10.710443,55.061526 19.9835254,71.1374907 34.0762135,80.5557137 C25.4660961,80.2832239 17.3681846,77.9207088 10.2862577,73.9869292 C10.2825122,74.2060448 10.2825122,74.4260967 10.2825122,74.647085 C10.2825122,100.094453 28.3867003,121.322443 52.413563,126.14673 C48.0059695,127.347184 43.3661509,127.988612 38.5755734,127.988612 C35.1914554,127.988612 31.9009766,127.659938 28.694773,127.046602 C35.3777973,147.913145 54.7742053,163.097665 77.7569918,163.52185 C59.7820257,177.607983 37.1354036,186.004604 12.5289147,186.004604 C8.28987161,186.004604 4.10888474,185.75646 0,185.271409 C23.2431033,200.173139 50.8507261,208.867532 80.5109185,208.867532 C177.116529,208.867532 229.943977,128.836982 229.943977,59.4326002 C229.943977,57.1552968 229.893412,54.8901664 229.792282,52.6381454 C240.053257,45.2331635 248.958338,35.9825545 256,25.4500259" fill="#55acee"></path>
|
</svg>
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 297 B |
|
|
@ -1,6 +1,4 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<svg width="256px" height="209px" viewBox="0 0 256 209" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
|
<svg width="300" height="300.251" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||||
<g>
|
<path d="M178.57 127.15 290.27 0h-26.46l-97.03 110.38L89.34 0H0l117.13 166.93L0 300.25h26.46l102.4-116.59 81.8 116.59h89.34M36.01 19.54H76.66l187.13 262.13h-40.66"/>
|
||||||
<path d="M256,25.4500259 C246.580841,29.6272672 236.458451,32.4504868 225.834156,33.7202333 C236.678503,27.2198053 245.00583,16.9269929 248.927437,4.66307685 C238.779765,10.6812633 227.539325,15.0523376 215.57599,17.408298 C205.994835,7.2006971 192.34506,0.822 177.239197,0.822 C148.232605,0.822 124.716076,24.3375931 124.716076,53.3423116 C124.716076,57.4586875 125.181462,61.4673784 126.076652,65.3112644 C82.4258385,63.1210453 43.7257252,42.211429 17.821398,10.4359288 C13.3005011,18.1929938 10.710443,27.2151234 10.710443,36.8402889 C10.710443,55.061526 19.9835254,71.1374907 34.0762135,80.5557137 C25.4660961,80.2832239 17.3681846,77.9207088 10.2862577,73.9869292 C10.2825122,74.2060448 10.2825122,74.4260967 10.2825122,74.647085 C10.2825122,100.094453 28.3867003,121.322443 52.413563,126.14673 C48.0059695,127.347184 43.3661509,127.988612 38.5755734,127.988612 C35.1914554,127.988612 31.9009766,127.659938 28.694773,127.046602 C35.3777973,147.913145 54.7742053,163.097665 77.7569918,163.52185 C59.7820257,177.607983 37.1354036,186.004604 12.5289147,186.004604 C8.28987161,186.004604 4.10888474,185.75646 0,185.271409 C23.2431033,200.173139 50.8507261,208.867532 80.5109185,208.867532 C177.116529,208.867532 229.943977,128.836982 229.943977,59.4326002 C229.943977,57.1552968 229.893412,54.8901664 229.792282,52.6381454 C240.053257,45.2331635 248.958338,35.9825545 256,25.4500259" fill="#55acee"></path>
|
</svg>
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 297 B |
Loading…
Reference in New Issue