web/notify.moe
Code Issues Pull Requests Activity

Minor changes

Browse Source
This commit is contained in:
Eduard Urbach 2019-02-25 12:01:53 +09:00
parent d6230b7a0d
commit 157a5f7487
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
auth/twitter.go
View File

@ -3,21 +3,22 @@ package auth
import ( import (
"errors" "errors"
"fmt" "fmt"
"io/ioutil"
"net/http"
"strings"
"github.com/aerogo/aero" "github.com/aerogo/aero"
"github.com/animenotifier/arn" "github.com/animenotifier/arn"
"github.com/animenotifier/notify.moe/utils" "github.com/animenotifier/notify.moe/utils"
"github.com/gomodule/oauth1/oauth" "github.com/gomodule/oauth1/oauth"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
"io/ioutil"
"net/http"
"strings"
) )
// TwitterUser is the user data we receive from Twitter // TwitterUser is the user data we receive from Twitter
type TwitterUser struct { type TwitterUser struct {
ID string `json:"id_str"` ID string `json:"id_str"`
Email string `json:"email"` Email string `json:"email"`
Name string `json:"name"` Name string `json:"name"`
} }
// InstallTwitterAuth enables Twitter login for the app. // InstallTwitterAuth enables Twitter login for the app.
@ -63,7 +64,7 @@ func InstallTwitterAuth(app *aero.Application) {
session := ctx.Session() session := ctx.Session()
// get back the request token to get the access token // Get back the request token to get the access token
tempCred, _ := session.Get("tempCred").(*oauth.Credentials) tempCred, _ := session.Get("tempCred").(*oauth.Credentials)
if tempCred == nil || tempCred.Token != ctx.Query("oauth_token") { if tempCred == nil || tempCred.Token != ctx.Query("oauth_token") {
@ -78,7 +79,7 @@ func InstallTwitterAuth(app *aero.Application) {
} }
// Fetch user data from Twitter // Fetch user data from Twitter
resp, err := config.Get(nil, tokenCred, "https://api.twitter.com/1.1/account/verify_credentials.json?include_email=true1skip_status=true", nil) resp, err := config.Get(nil, tokenCred, "https://api.twitter.com/1.1/account/verify_credentials.json?include_email=true&skip_status=true", nil)
if err != nil { if err != nil {
return ctx.Error(http.StatusBadRequest, "Failed requesting user data from Twitter", err) return ctx.Error(http.StatusBadRequest, "Failed requesting user data from Twitter", err)
@ -146,10 +147,11 @@ func InstallTwitterAuth(app *aero.Application) {
user = arn.NewUser() user = arn.NewUser()
user.Nick = "tw" + twUser.ID user.Nick = "tw" + twUser.ID
user.Email = twUser.Email user.Email = twUser.Email
// The full name is in Name and separated like other services
user.FirstName = twUser.Name
user.LastLogin = arn.DateTimeUTC() user.LastLogin = arn.DateTimeUTC()
// TODO: The full name is in the Name field
user.FirstName = twUser.Name
// Save basic user info already to avoid data inconsistency problems // Save basic user info already to avoid data inconsistency problems
user.Save() user.Save()