mirrors/remark42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change auth lib to 0.8.2, fixed user's aud promotion

Browse Source
This commit is contained in:
Umputun
2019-08-24 14:17:35 -05:00
parent a6149ae064
commit ef7476d3e1
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/_example/memory_store/go.sum
+1
View File
@@ -49,6 +49,7 @@ github.com/go-pkgz/auth v0.4.1/go.mod h1:CWtB8dHmOv+TfF3MUzKwk/YwTLepC2TaDL05A+p
github.com/go-pkgz/auth v0.7.2/go.mod h1:ibOpZYISiaOvAHe2bsKj2s3v4AkMam2WxxIFn+zhulo=
github.com/go-pkgz/auth v0.8.0/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8=
github.com/go-pkgz/auth v0.8.1/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8=
github.com/go-pkgz/auth v0.8.2/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8=
github.com/go-pkgz/auth/_example v0.0.0-20190722170031-705d3f732438/go.mod h1:rvZtFFkmm3p+E0CHmfUqTGKweCVg2ddsRUrEEPB1iaE=
github.com/go-pkgz/auth/_example v0.0.0-20190823054154-cc9c87832e19/go.mod h1:M9HLEzuiKQQ+rwGA9bAzmUDguCJi2HyGwKkxb5ouGJU=
github.com/go-pkgz/jrpc v0.1.0 h1:hNg/IyfEqJcSWOKkuHw0ZwcuGc9TDp7QZREsD2ycmiM=
backend/go.mod
+1 -1
View File
@@ -17,7 +17,7 @@ require (
github.com/go-chi/chi v4.0.2+incompatible
github.com/go-chi/cors v1.0.0
github.com/go-chi/render v1.0.1
github.com/go-pkgz/auth v0.8.1
github.com/go-pkgz/auth v0.8.2
github.com/go-pkgz/jrpc v0.1.0
github.com/go-pkgz/lcw v0.3.1
github.com/go-pkgz/lgr v0.6.3
backend/go.sum
+2 -2
View File
@@ -53,8 +53,8 @@ github.com/go-chi/cors v1.0.0/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VCh
github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
github.com/go-pkgz/auth v0.4.1/go.mod h1:CWtB8dHmOv+TfF3MUzKwk/YwTLepC2TaDL05A+pFVBM=
github.com/go-pkgz/auth v0.8.1 h1:HBJau0LDOZ9NI5+fnrJu5azETuXLJx9ipx5uosYdK8I=
github.com/go-pkgz/auth v0.8.1/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8=
github.com/go-pkgz/auth v0.8.2 h1:cMpLwoIeVAP1QwwRRDRlgQcsDvBS+yT/gL0m8p4gmcI=
github.com/go-pkgz/auth v0.8.2/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8=
github.com/go-pkgz/auth/_example v0.0.0-20190722170031-705d3f732438/go.mod h1:rvZtFFkmm3p+E0CHmfUqTGKweCVg2ddsRUrEEPB1iaE=
github.com/go-pkgz/jrpc v0.1.0 h1:hNg/IyfEqJcSWOKkuHw0ZwcuGc9TDp7QZREsD2ycmiM=
github.com/go-pkgz/jrpc v0.1.0/go.mod h1:JxZsvoBklA50DNhELVJnJ567Rt+KrMH9rR3u515wvE8=
backend/vendor/github.com/go-pkgz/auth/token/jwt.go
Generated Vendored
+6 -3
View File
@@ -245,6 +245,11 @@ func (j *Service) Get(r *http.Request) (Claims, string, error) {
return Claims{}, "", errors.Wrap(err, "failed to get token")
}
// promote claim's aud to User.Audience
if claims.User != nil {
claims.User.Audience = claims.Audience
}
if !fromCookie && j.IsExpired(claims) {
return Claims{}, "", errors.New("token expired")
}
@@ -259,9 +264,7 @@ func (j *Service) Get(r *http.Request) (Claims, string, error) {
return Claims{}, "", errors.New("xsrf mismatch")
}
}
if claims.User != nil {
claims.User.Audience = claims.Audience
}
return claims, tokenString, nil
}
backend/vendor/modules.txt
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ github.com/go-chi/chi/middleware
github.com/go-chi/cors
# github.com/go-chi/render v1.0.1
github.com/go-chi/render
# github.com/go-pkgz/auth v0.8.1
# github.com/go-pkgz/auth v0.8.2
github.com/go-pkgz/auth
github.com/go-pkgz/auth/avatar
github.com/go-pkgz/auth/provider