From c65ac1637dc25bd574e5025e6ea280207d8c5fbb Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Thu, 16 May 2019 19:15:37 +0900 Subject: [PATCH] Upgraded to latest aero version --- auth/auth.go | 2 +- auth/twitter.go | 1 + go.mod | 10 +++++----- go.sum | 18 ++++++++++++------ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/auth/auth.go b/auth/auth.go index d5a74a34..140d3704 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -27,7 +27,7 @@ func Install(app *aero.Application) { authLog.Info("%s logged out | %s | %s | %s | %s", user.Nick, user.ID, ctx.RealIP(), user.Email, user.RealName()) } - ctx.Session().Set("userId", nil) + ctx.Session().Delete("userId") } return ctx.Redirect("/") diff --git a/auth/twitter.go b/auth/twitter.go index 1298501f..4fa4dd16 100644 --- a/auth/twitter.go +++ b/auth/twitter.go @@ -69,6 +69,7 @@ func InstallTwitterAuth(app *aero.Application) { // Get back the request token to get the access token tempCred, _ := session.Get("tempCred").(*oauth.Credentials) + session.Delete("tempCred") if tempCred == nil || tempCred.Token != ctx.Query("oauth_token") { return ctx.Error(http.StatusBadRequest, "Unknown OAuth request token", nil) diff --git a/go.mod b/go.mod index a6a835d9..b36ce6b7 100644 --- a/go.mod +++ b/go.mod @@ -6,18 +6,18 @@ require ( cloud.google.com/go v0.39.0 // indirect github.com/OneOfOne/xxhash v1.2.5 github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect - github.com/aerogo/aero v1.1.13 + github.com/aerogo/aero v1.1.14 github.com/aerogo/api v0.1.7 - github.com/aerogo/crawler v0.2.3 + github.com/aerogo/crawler v0.2.5 github.com/aerogo/graphql v0.3.6 github.com/aerogo/http v1.0.6 - github.com/aerogo/layout v0.1.6 + github.com/aerogo/layout v0.1.9 github.com/aerogo/log v0.2.5 github.com/aerogo/markdown v0.1.8 github.com/aerogo/nano v0.2.1 github.com/aerogo/pack v0.4.2 github.com/aerogo/run v1.0.0 - github.com/aerogo/session-store-nano v0.1.4 + github.com/aerogo/session-store-nano v0.1.5 github.com/aerogo/sitemap v0.1.2 github.com/akyoto/cache v1.0.2 github.com/akyoto/color v1.8.4 @@ -47,7 +47,7 @@ require ( github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect github.com/stretchr/testify v1.3.0 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a - golang.org/x/sys v0.0.0-20190516014833-cab07311ab81 // indirect + golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect golang.org/x/text v0.3.2 // indirect google.golang.org/appengine v1.6.0 // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect diff --git a/go.sum b/go.sum index 10ee8757..e1ac58d5 100644 --- a/go.sum +++ b/go.sum @@ -19,6 +19,8 @@ github.com/aerogo/aero v1.1.9 h1:EB+oTljSIfQENZTVyvnZ24Pb2UsV+Ows04/HfzOJ/3c= github.com/aerogo/aero v1.1.9/go.mod h1:MvHPJcXZmZUu5mh4q6j5n3DijKmAMY6puhzCH1w22Vw= github.com/aerogo/aero v1.1.13 h1:e+FXHaSRZ2a/xrLwF1Yeujh5yHBovdLfHxJYtZvPpWw= github.com/aerogo/aero v1.1.13/go.mod h1:jcHCf+a3vExpo1SKRPrmkspO9VWiDZHC5/ITss/Sz6Y= +github.com/aerogo/aero v1.1.14 h1:qfsVyOYQR5e2A5ceG+lfktmXJdebs0KF7aJ8AVEf+NA= +github.com/aerogo/aero v1.1.14/go.mod h1:/sQny0LFzJnNIiAMpTplD7kBpDQiXSrvcSvQE6fYpBM= github.com/aerogo/api v0.1.7 h1:2cEOUlPvlRnLo6A0xn8+UpmluWqRoYEGn0Ik4kxmUEI= github.com/aerogo/api v0.1.7/go.mod h1:6uPqLd2/VzFiuC7L7hPMtUNjfRjczJQUP6Uks7EiXpw= github.com/aerogo/cluster v0.1.5 h1:mOYQmaYRsvIi1inaGLICmeJgCYycBxiHnjcTFLtC6kc= @@ -31,8 +33,8 @@ github.com/aerogo/codetree v1.2.3 h1:Cig8X93E/8ljprlNjO5VCk7hAQIp8Z957Zdvh9qyBmo github.com/aerogo/codetree v1.2.3/go.mod h1:MhElfskRtfAKGy5ukRIFcLTtHcSCwLRBjDAlsbuFts0= github.com/aerogo/codetree v1.2.4 h1:Gf6JHjzUBEGn0Z+h4EK1pikexqFZc8+b/3LiLkRXhms= github.com/aerogo/codetree v1.2.4/go.mod h1:MhElfskRtfAKGy5ukRIFcLTtHcSCwLRBjDAlsbuFts0= -github.com/aerogo/crawler v0.2.3 h1:OzwOPOr+/ZwKOCsff9ocWl/KHnLukgF2jjkOzQjx63c= -github.com/aerogo/crawler v0.2.3/go.mod h1:tfrcy3XQMgncPyS05scYq8qm/ceNSsMoptjSz3cSwVQ= +github.com/aerogo/crawler v0.2.5 h1:tsaRViwBKNJAotzjEmGOln7quzka4f0goiEZVg4Fdxc= +github.com/aerogo/crawler v0.2.5/go.mod h1:nyFPwxOFm3gy5cvif8rG1ogXO0fTDVrxsQHwicJz1F8= github.com/aerogo/csp v0.1.5 h1:4l8AaMWndSb0t/03onf4lc0th2zoaapmtKgysDIznW4= github.com/aerogo/csp v0.1.5/go.mod h1:KNqnTFffuDwIPJxBEFTl3baBx+x3Vw+9kcMfu5APFJA= github.com/aerogo/csp v0.1.6 h1:C2OpzPZHY1S5H+Dz0Or+YgVSfXT36avJw9e1smrIWUY= @@ -49,8 +51,8 @@ github.com/aerogo/http v1.0.3 h1:vf6A+Igme5OHQPaP3a00uPDS0oxsx3puMA23d1NsWDM= github.com/aerogo/http v1.0.3/go.mod h1:B1igUmMLpE6KabMpc9reHCJJNUOJ2U/PR9s1fF3TpPQ= github.com/aerogo/http v1.0.6 h1:+aswlcWlUxjVcokF8hUjNJmGIEZuhbFbHi8uSadEvtc= github.com/aerogo/http v1.0.6/go.mod h1:LwJ7b+LjrHj60FhYQ586K3/O7aNGxkE2dy/exEkQ6rA= -github.com/aerogo/layout v0.1.6 h1:dLyqJ+vYOo591OTnBjvfTx89f6TynrhyV9MI1sMjOG8= -github.com/aerogo/layout v0.1.6/go.mod h1:VktAbU+PAW0UDHm6E90ZQ6Bk5A+tB3w6gcKBioFS9Nw= +github.com/aerogo/layout v0.1.9 h1:pLGj1RaQgduDdhnRKoc40D5Mq4wINohQe08m7+TxTXA= +github.com/aerogo/layout v0.1.9/go.mod h1:cJ9Gyh0H9xHI2uVyPqSDIlpMDdgAosdYlRArEEh9oME= github.com/aerogo/linter-performance v1.0.1 h1:/1Hak+7sxpO2AkjdMVcpkyurmA4YD77EDi7FRnLqnwM= github.com/aerogo/linter-performance v1.0.1/go.mod h1:3ZXxPgQ0cEo0x6DCGZwXHrwKNYK86XvB5QRJR9s7Z6I= github.com/aerogo/linter-performance v1.0.3 h1:pYsmUd8jp6CVrFx+YNo9Gfdf222CKG2gCVjp8cljZNY= @@ -85,12 +87,16 @@ github.com/aerogo/session v0.1.2 h1:f0X3YJQJcFhtmw47U60jdSsH18/T51SkhkhAuXwnYI8= github.com/aerogo/session v0.1.2/go.mod h1:A4S5dvAhpm+DRdQbno5Rn4Jvj0UVGJmOUKQXataNIDg= github.com/aerogo/session v0.1.3 h1:ABE2DP0Cp92sqZDe/GkcbqjuZbYq+OV9Y9kpmZtchTw= github.com/aerogo/session v0.1.3/go.mod h1:A4S5dvAhpm+DRdQbno5Rn4Jvj0UVGJmOUKQXataNIDg= +github.com/aerogo/session v0.1.4 h1:4OgQyUm3wxSsjNRReZhYdHX8X5lXnFp1W+M3EXr4a3E= +github.com/aerogo/session v0.1.4/go.mod h1:aM3FUclBU+wt8kwSs3leTByuaBu0sXrw4P+HwKVkSSw= github.com/aerogo/session-store-memory v0.1.3 h1:6tPSh4HrJald0akOQIdUc8S1MxmBaOs1eXgC9Yiz2co= github.com/aerogo/session-store-memory v0.1.3/go.mod h1:GYiLJNk8h3pcBB/UwfCJrtTZl1CLxBg8xnzt45wPmIM= github.com/aerogo/session-store-memory v0.1.4 h1:nqeTEUtNZtwExVqo8HWOEUgIJKt5tQlWg1kG/gjtmQE= github.com/aerogo/session-store-memory v0.1.4/go.mod h1:GYiLJNk8h3pcBB/UwfCJrtTZl1CLxBg8xnzt45wPmIM= -github.com/aerogo/session-store-nano v0.1.4 h1:NwqEKLJxrl/mmTXGvkY2lW5tTAsQSCfiJ6qlXuOXo8o= -github.com/aerogo/session-store-nano v0.1.4/go.mod h1:dlVzTAcnwyxPALP+PgbcMwWI/7Gvl30taMDP4qVvP4Y= +github.com/aerogo/session-store-memory v0.1.5 h1:l4uBDs4cVkByTE1N/IVSpU6oIrgx+4abtjztxk13zcI= +github.com/aerogo/session-store-memory v0.1.5/go.mod h1:Agy7YibR8yxUePqcl2rFyIGIwvXJiNsV1yaLtJHnnrI= +github.com/aerogo/session-store-nano v0.1.5 h1:klabo+Hyh1GKhpYJExdGvXDxNCxW7sSJevFGGzIqVCo= +github.com/aerogo/session-store-nano v0.1.5/go.mod h1:HEm80cLszsfh7yUsX1zbddznPhz2sPWhsHRXNLo9tJs= github.com/aerogo/sitemap v0.1.2 h1:0+o/B0IrikZxGdi0yjgwa/jm36OMdOHxe6zChj8zGZA= github.com/aerogo/sitemap v0.1.2/go.mod h1:/1NT13qIsTm/ydlZHEMd8m014E2yyQkI5coimmIfqc0= github.com/akyoto/autoimport v0.6.3 h1:YpO9UqPr0GqHiD4c5qFKicTOA2a+yzudk2gs5yqpzBw=