ayo/maingate
8
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into kd-live

Browse Source
This commit is contained in:
mountain
2023-08-09 17:39:30 +09:00
parent 8e908982a8 c7f073c779
commit 9edea29983
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/service.go
View File

@ -576,31 +576,35 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
var email string var email string
if !*noauth { if !*noauth {
//email, err := sh.readProfile(authtype, uid, accesstoken) if len(authtype) > 0 {
bfinfo, err := sh.getUserBrowserInfo(r) //email, err := sh.readProfile(authtype, uid, accesstoken)
if err != nil { bfinfo, err := sh.getUserBrowserInfo(r)
logger.Error("getUserBrowserInfo failed :", err) if err != nil {
w.WriteHeader(http.StatusBadRequest) logger.Error("getUserBrowserInfo failed :", err)
return w.WriteHeader(http.StatusBadRequest)
} return
}
email, err = sh.readProfile(authtype, uid, bfinfo) email, err = sh.readProfile(authtype, uid, bfinfo)
if err != nil { if err != nil {
logger.Error("readProfile failed :", err) logger.Error("readProfile failed :", err)
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
newType, newId, err := sh.getProviderInfo(authtype, uid) newType, newId, err := sh.getProviderInfo(authtype, uid)
if err != nil { if err != nil {
logger.Error("getProviderInfo failed :", err) logger.Error("getProviderInfo failed :", err)
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
} }
if authtype != newType || uid != newId { if authtype != newType || uid != newId {
authtype = newType authtype = newType
uid = newId uid = newId
logger.Println("auth success ( redirect ) :", authtype, uid, email, session) logger.Println("auth success ( redirect ) :", authtype, uid, email, session)
}
} else {
email = fmt.Sprintf("%s@guest.flag", uid)
} }
} else { } else {
email = fmt.Sprintf("%s@noauth.flag", uid) email = fmt.Sprintf("%s@noauth.flag", uid)