Session에 email도 저장해둔다. 필요할때 꺼내줄 api만들 예정
This commit is contained in:
@ -587,6 +587,7 @@ func (mg *Maingate) setUserToken(info usertokeninfo) error {
|
|||||||
"lastupdate": time.Now().Unix(),
|
"lastupdate": time.Now().Unix(),
|
||||||
"accesstoken": info.accesstoken,
|
"accesstoken": info.accesstoken,
|
||||||
"accesstoken_expire_time": info.accesstoken_expire_time,
|
"accesstoken_expire_time": info.accesstoken_expire_time,
|
||||||
|
"email": info.email,
|
||||||
},
|
},
|
||||||
}, options.Update().SetUpsert(true))
|
}, options.Update().SetUpsert(true))
|
||||||
return logger.ErrorWithCallStack(err)
|
return logger.ErrorWithCallStack(err)
|
||||||
@ -639,6 +640,11 @@ func (mg *Maingate) getUserTokenWithCheck(platform string, userid string, brinfo
|
|||||||
info.accesstoken_expire_time = accesstoken_expire_time.(int64)
|
info.accesstoken_expire_time = accesstoken_expire_time.(int64)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
email := found["email"]
|
||||||
|
if email != nil {
|
||||||
|
info.email = email.(string)
|
||||||
|
}
|
||||||
|
|
||||||
return info, nil
|
return info, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -676,6 +682,10 @@ func (mg *Maingate) updateUserinfo(info usertokeninfo) (bool, string, string) {
|
|||||||
return false, "", ""
|
return false, "", ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !(strings.HasPrefix("email", "__dummy_") && strings.HasSuffix("email", "temp__")) {
|
||||||
|
info.email = email
|
||||||
|
}
|
||||||
|
|
||||||
mg.setUserToken(info)
|
mg.setUserToken(info)
|
||||||
|
|
||||||
return success, userid, email
|
return success, userid, email
|
||||||
|
|||||||
@ -255,6 +255,7 @@ func (mg *Maingate) platform_apple_authorize_result(w http.ResponseWriter, r *ht
|
|||||||
info.userid = userid
|
info.userid = userid
|
||||||
info.token = resp.RefreshToken
|
info.token = resp.RefreshToken
|
||||||
info.brinfo = brinfo
|
info.brinfo = brinfo
|
||||||
|
info.email = email
|
||||||
|
|
||||||
mg.setUserToken(info)
|
mg.setUserToken(info)
|
||||||
params := url.Values{}
|
params := url.Values{}
|
||||||
|
|||||||
@ -208,6 +208,7 @@ func (mg *Maingate) platform_firebaseauth_authorize_raw(w http.ResponseWriter, b
|
|||||||
info.brinfo = brinfo
|
info.brinfo = brinfo
|
||||||
info.accesstoken = ""
|
info.accesstoken = ""
|
||||||
info.accesstoken_expire_time = acceestoken_expire_time
|
info.accesstoken_expire_time = acceestoken_expire_time
|
||||||
|
info.email = email
|
||||||
mg.setUserToken(info)
|
mg.setUserToken(info)
|
||||||
|
|
||||||
mg.mongoClient.Delete(CollectionFirebaseUserInfo, bson.M{
|
mg.mongoClient.Delete(CollectionFirebaseUserInfo, bson.M{
|
||||||
|
|||||||
@ -262,6 +262,7 @@ func (mg *Maingate) platform_google_authorize_result(w http.ResponseWriter, r *h
|
|||||||
info.brinfo = brinfo
|
info.brinfo = brinfo
|
||||||
info.accesstoken = respReferesh.AccessToken
|
info.accesstoken = respReferesh.AccessToken
|
||||||
info.accesstoken_expire_time = acceestoken_expire_time
|
info.accesstoken_expire_time = acceestoken_expire_time
|
||||||
|
info.email = email
|
||||||
mg.setUserToken(info)
|
mg.setUserToken(info)
|
||||||
|
|
||||||
params := url.Values{}
|
params := url.Values{}
|
||||||
@ -316,6 +317,7 @@ func (mg *Maingate) platform_google_getuserinfo(info usertokeninfo) (bool, strin
|
|||||||
info.token = respReferesh.RefreshToken
|
info.token = respReferesh.RefreshToken
|
||||||
info.accesstoken = respReferesh.AccessToken
|
info.accesstoken = respReferesh.AccessToken
|
||||||
info.accesstoken_expire_time = acceestoken_expire_time
|
info.accesstoken_expire_time = acceestoken_expire_time
|
||||||
|
info.email = email
|
||||||
mg.setUserToken(info) //-- accesstoken 업데이트
|
mg.setUserToken(info) //-- accesstoken 업데이트
|
||||||
} else {
|
} else {
|
||||||
logger.Println("JWTparseCode fail.")
|
logger.Println("JWTparseCode fail.")
|
||||||
|
|||||||
@ -239,6 +239,7 @@ func (mg *Maingate) platform_microsoft_authorize_result(w http.ResponseWriter, r
|
|||||||
info.brinfo = brinfo
|
info.brinfo = brinfo
|
||||||
info.accesstoken = respReferesh.AccessToken
|
info.accesstoken = respReferesh.AccessToken
|
||||||
info.accesstoken_expire_time = acceestoken_expire_time
|
info.accesstoken_expire_time = acceestoken_expire_time
|
||||||
|
info.email = ""
|
||||||
mg.setUserToken(info)
|
mg.setUserToken(info)
|
||||||
|
|
||||||
params := url.Values{}
|
params := url.Values{}
|
||||||
@ -295,6 +296,7 @@ func (mg *Maingate) platform_microsoft_getuserinfo(info usertokeninfo) (bool, st
|
|||||||
info.token = respReferesh.RefreshToken
|
info.token = respReferesh.RefreshToken
|
||||||
info.accesstoken = respReferesh.AccessToken
|
info.accesstoken = respReferesh.AccessToken
|
||||||
info.accesstoken_expire_time = acceestoken_expire_time
|
info.accesstoken_expire_time = acceestoken_expire_time
|
||||||
|
info.email = ""
|
||||||
mg.setUserToken(info) //-- accesstoken 업데이트
|
mg.setUserToken(info) //-- accesstoken 업데이트
|
||||||
} else {
|
} else {
|
||||||
logger.Println("JWTparseCode fail.")
|
logger.Println("JWTparseCode fail.")
|
||||||
|
|||||||
@ -53,6 +53,7 @@ func (mg *Maingate) platform_steamsdk_authorize(w http.ResponseWriter, r *http.R
|
|||||||
info.brinfo = brinfo
|
info.brinfo = brinfo
|
||||||
//info.accesstoken = respReferesh.AccessToken
|
//info.accesstoken = respReferesh.AccessToken
|
||||||
info.accesstoken_expire_time = acceestoken_expire_time
|
info.accesstoken_expire_time = acceestoken_expire_time
|
||||||
|
info.email = ""
|
||||||
mg.setUserToken(info)
|
mg.setUserToken(info)
|
||||||
|
|
||||||
params := url.Values{}
|
params := url.Values{}
|
||||||
|
|||||||
@ -208,6 +208,7 @@ func (mg *Maingate) platform_twitter_authorize_result(w http.ResponseWriter, r *
|
|||||||
info.token = token
|
info.token = token
|
||||||
info.secret = secret
|
info.secret = secret
|
||||||
info.brinfo = brinfo
|
info.brinfo = brinfo
|
||||||
|
info.email = ""
|
||||||
|
|
||||||
mg.setUserToken(info)
|
mg.setUserToken(info)
|
||||||
params := url.Values{}
|
params := url.Values{}
|
||||||
|
|||||||
@ -63,6 +63,7 @@ type usertokeninfo struct {
|
|||||||
token string //refreshtoken
|
token string //refreshtoken
|
||||||
secret string
|
secret string
|
||||||
brinfo string
|
brinfo string
|
||||||
|
email string
|
||||||
accesstoken string // microsoft only
|
accesstoken string // microsoft only
|
||||||
accesstoken_expire_time int64 // microsoft only
|
accesstoken_expire_time int64 // microsoft only
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user