Merge branch 'refs/heads/feat-login-website'
This commit is contained in:
commit
94ab128ac7
|
|
@ -683,7 +683,7 @@ func DoGiteaCallBack(state *proto.ThirdPartyLoginState, code string) {
|
||||||
// return
|
// return
|
||||||
//}
|
//}
|
||||||
if tokenResp.AccessToken == "" {
|
if tokenResp.AccessToken == "" {
|
||||||
log.Printf("get %s access token is empty\n", state.Platform)
|
log.Printf("get %s access token is empty,token resp:%v\n", state.Platform, tokenResp)
|
||||||
thirdPartyLoginStatus.Status = proto.ParameterError
|
thirdPartyLoginStatus.Status = proto.ParameterError
|
||||||
} else {
|
} else {
|
||||||
log.Printf("get %s access token:%v\n", state.Platform, tokenResp.AccessToken)
|
log.Printf("get %s access token:%v\n", state.Platform, tokenResp.AccessToken)
|
||||||
|
|
|
||||||
|
|
@ -537,8 +537,11 @@ func GetGiteaAccessTokenByCode(baseUrl, code string, redirectURI string, clientI
|
||||||
Scope: "user",
|
Scope: "user",
|
||||||
}
|
}
|
||||||
reqData, err := json.Marshal(req)
|
reqData, err := json.Marshal(req)
|
||||||
|
|
||||||
|
log.Println("gitea request url:", url, "reqData:", string(reqData))
|
||||||
err2, respBytes := DoPostRequestJSON(url, reqData, nil)
|
err2, respBytes := DoPostRequestJSON(url, reqData, nil)
|
||||||
if err2 != nil {
|
if err2 != nil {
|
||||||
|
log.Println("gitea response err:", err2)
|
||||||
return resp, err2
|
return resp, err2
|
||||||
}
|
}
|
||||||
err = json.Unmarshal(respBytes, &resp)
|
err = json.Unmarshal(respBytes, &resp)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue