@@ -64,7 +64,7 @@ func Exchange(c *gin.Context) {
|
||||
}
|
||||
|
||||
userData := new(data.User)
|
||||
user, err := userData.GetByUserId(userId)
|
||||
user, err := userData.GetByUserId(c, userId)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusServer).
|
||||
@@ -78,7 +78,7 @@ func Exchange(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
code, err := authcode.NewAuthCode(exchangeReq.ClientId, user.Email)
|
||||
code, err := authcode.NewAuthCode(c, exchangeReq.ClientId, user.Email)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusServer).
|
||||
|
||||
@@ -51,7 +51,7 @@ func Magic(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
code, err := authcode.NewAuthCode(req.ClientId, req.Email)
|
||||
code, err := authcode.NewAuthCode(c, req.ClientId, req.Email)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusServer).
|
||||
|
||||
@@ -55,7 +55,7 @@ func Redirect(c *gin.Context) {
|
||||
code := c.Query("code")
|
||||
|
||||
// Verify email token
|
||||
authCode, ok := authcode.VerifyAuthCode(code)
|
||||
authCode, ok := authcode.VerifyAuthCode(c, code)
|
||||
if !ok {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusUser).
|
||||
@@ -70,7 +70,7 @@ func Redirect(c *gin.Context) {
|
||||
|
||||
// Verify if user exists
|
||||
userData := new(data.User)
|
||||
user, err := userData.GetByEmail(authCode.Email)
|
||||
user, err := userData.GetByEmail(c, authCode.Email)
|
||||
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
@@ -80,7 +80,7 @@ func Redirect(c *gin.Context) {
|
||||
user.Email = authCode.Email
|
||||
user.Username = user.UserId.String()
|
||||
user.PermissionLevel = 10
|
||||
if err := user.Create(); err != nil {
|
||||
if err := user.Create(c); err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusServer).
|
||||
SetService(exception.ServiceAuth).
|
||||
@@ -107,7 +107,7 @@ func Redirect(c *gin.Context) {
|
||||
}
|
||||
|
||||
clientData := new(data.Client)
|
||||
client, err := clientData.GetClientByClientId(clientId)
|
||||
client, err := clientData.GetClientByClientId(c, clientId)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusUser).
|
||||
@@ -135,7 +135,7 @@ func Redirect(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
newCode, err := authcode.NewAuthCode(clientId, authCode.Email)
|
||||
newCode, err := authcode.NewAuthCode(c, clientId, authCode.Email)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusServer).
|
||||
|
||||
@@ -31,7 +31,7 @@ func Refresh(c *gin.Context) {
|
||||
Application: viper.GetString("server.application"),
|
||||
}
|
||||
|
||||
accessToken, err := JwtTool.RefreshAccessToken(req.RefreshToken)
|
||||
accessToken, err := JwtTool.RefreshAccessToken(c, req.RefreshToken)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusUser).
|
||||
@@ -45,7 +45,7 @@ func Refresh(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
refreshToken, err := JwtTool.RenewRefreshToken(req.RefreshToken)
|
||||
refreshToken, err := JwtTool.RenewRefreshToken(c, req.RefreshToken)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusServer).
|
||||
|
||||
@@ -32,7 +32,7 @@ func Token(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
authCode, ok := authcode.VerifyAuthCode(req.Code)
|
||||
authCode, ok := authcode.VerifyAuthCode(c, req.Code)
|
||||
if !ok {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusUser).
|
||||
@@ -46,7 +46,7 @@ func Token(c *gin.Context) {
|
||||
}
|
||||
|
||||
userData := new(data.User)
|
||||
user, err := userData.GetByEmail(authCode.Email)
|
||||
user, err := userData.GetByEmail(c, authCode.Email)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusServer).
|
||||
@@ -64,7 +64,7 @@ func Token(c *gin.Context) {
|
||||
JwtTool := authtoken.Token{
|
||||
Application: viper.GetString("server.application"),
|
||||
}
|
||||
accessToken, refreshToken, err := JwtTool.IssueTokens(authCode.ClientId, user.UserId)
|
||||
accessToken, refreshToken, err := JwtTool.IssueTokens(c, authCode.ClientId, user.UserId)
|
||||
if err != nil {
|
||||
errorCode := new(exception.Builder).
|
||||
SetStatus(exception.StatusServer).
|
||||
|
||||
Reference in New Issue
Block a user