Merge branch 'master' into kd-live
This commit is contained in:
@ -576,6 +576,7 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
|
||||
var email string
|
||||
|
||||
if !*noauth {
|
||||
if len(authtype) > 0 {
|
||||
//email, err := sh.readProfile(authtype, uid, accesstoken)
|
||||
bfinfo, err := sh.getUserBrowserInfo(r)
|
||||
if err != nil {
|
||||
@ -602,6 +603,9 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
|
||||
uid = newId
|
||||
logger.Println("auth success ( redirect ) :", authtype, uid, email, session)
|
||||
}
|
||||
} else {
|
||||
email = fmt.Sprintf("%s@guest.flag", uid)
|
||||
}
|
||||
} else {
|
||||
email = fmt.Sprintf("%s@noauth.flag", uid)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user