From abc15b88c835945ef2f50df7ffc7e0b26887ec57 Mon Sep 17 00:00:00 2001 From: Yi Zhan Date: Mon, 4 Apr 2022 15:58:51 +0800 Subject: [PATCH] fix: change goth version (#644) Signed-off-by: Steve0x2a --- go.mod | 4 ++-- go.sum | 11 ++++------ idp/goth.go | 58 ++++++++++++++++++++++++++--------------------------- 3 files changed, 35 insertions(+), 38 deletions(-) diff --git a/go.mod b/go.mod index 93b4a5d3..4c80ae50 100644 --- a/go.mod +++ b/go.mod @@ -10,16 +10,16 @@ require ( github.com/casbin/casbin/v2 v2.30.1 github.com/casbin/xorm-adapter/v2 v2.5.1 github.com/casdoor/go-sms-sender v0.2.0 + github.com/casdoor/goth v1.69.0-FIX1 github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df github.com/go-ldap/ldap/v3 v3.3.0 github.com/go-pay/gopay v1.5.72 github.com/go-sql-driver/mysql v1.5.0 - github.com/golang-jwt/jwt/v4 v4.1.0 + github.com/golang-jwt/jwt/v4 v4.2.0 github.com/google/uuid v1.2.0 github.com/jinzhu/configor v1.2.1 // indirect github.com/lestrrat-go/jwx v0.9.0 - github.com/markbates/goth v1.68.1-0.20211006204042-9dc8905b41c8 github.com/qiangmzsx/string-adapter/v2 v2.1.0 github.com/qor/oss v0.0.0-20191031055114-aef9ba66bf76 github.com/robfig/cron/v3 v3.0.1 diff --git a/go.sum b/go.sum index 4ae0c7b6..69dfd3af 100644 --- a/go.sum +++ b/go.sum @@ -81,6 +81,8 @@ github.com/casbin/xorm-adapter/v2 v2.5.1 h1:BkpIxRHKa0s3bSMx173PpuU7oTs+Zw7XmD0B github.com/casbin/xorm-adapter/v2 v2.5.1/go.mod h1:AeH4dBKHC9/zYxzdPVHhPDzF8LYLqjDdb767CWJoV54= github.com/casdoor/go-sms-sender v0.2.0 h1:52bin4EBOPzOee64s9UK7jxd22FODvT9/+Y/Z+PSHpg= github.com/casdoor/go-sms-sender v0.2.0/go.mod h1:fsZsNnALvFIo+HFcE1U/oCQv4ZT42FdglXKMsEm3WSk= +github.com/casdoor/goth v1.69.0-FIX1 h1:24Y3tfaJxWGJbxickGe3F9y2c8X1PgsQynhxGXV1f9Q= +github.com/casdoor/goth v1.69.0-FIX1/go.mod h1:Om55nRo8CkeDkPSNBbzXW4G5uI28ZUkSk5S69dPek3s= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -133,10 +135,8 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= -github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= -github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0= -github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU= +github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -256,8 +256,6 @@ github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg= github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/markbates/going v1.0.0 h1:DQw0ZP7NbNlFGcKbcE/IVSOAFzScxRtLpd0rLMzLhq0= github.com/markbates/going v1.0.0/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA= -github.com/markbates/goth v1.68.1-0.20211006204042-9dc8905b41c8 h1:JibQrkJapVsb0pweJ5T14jZuuYZZTjll0PZBw4XfSCI= -github.com/markbates/goth v1.68.1-0.20211006204042-9dc8905b41c8/go.mod h1:V2VcDMzDiMHW+YmqYl7i0cMiAUeCkAe4QE6jRKBhXZw= github.com/mattermost/xml-roundtrip-validator v0.0.0-20201208211235-fe770d50d911 h1:erppMjjp69Rertg1zlgRbLJH1u+eCmRPxKjMZ5I8/Ro= github.com/mattermost/xml-roundtrip-validator v0.0.0-20201208211235-fe770d50d911/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -379,7 +377,6 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20220208233918-bba287dce954 h1:BkypuErRT9A9I/iljuaG3/zdMjd/J6m8tKKJQtGfSdA= diff --git a/idp/goth.go b/idp/goth.go index fb9a4b39..bce99230 100644 --- a/idp/goth.go +++ b/idp/goth.go @@ -22,35 +22,35 @@ import ( "time" "github.com/casdoor/casdoor/util" - "github.com/markbates/goth" - "github.com/markbates/goth/providers/amazon" - "github.com/markbates/goth/providers/apple" - "github.com/markbates/goth/providers/azuread" - "github.com/markbates/goth/providers/bitbucket" - "github.com/markbates/goth/providers/digitalocean" - "github.com/markbates/goth/providers/discord" - "github.com/markbates/goth/providers/dropbox" - "github.com/markbates/goth/providers/facebook" - "github.com/markbates/goth/providers/gitea" - "github.com/markbates/goth/providers/github" - "github.com/markbates/goth/providers/gitlab" - "github.com/markbates/goth/providers/google" - "github.com/markbates/goth/providers/heroku" - "github.com/markbates/goth/providers/instagram" - "github.com/markbates/goth/providers/kakao" - "github.com/markbates/goth/providers/line" - "github.com/markbates/goth/providers/linkedin" - "github.com/markbates/goth/providers/microsoftonline" - "github.com/markbates/goth/providers/paypal" - "github.com/markbates/goth/providers/salesforce" - "github.com/markbates/goth/providers/shopify" - "github.com/markbates/goth/providers/slack" - "github.com/markbates/goth/providers/steam" - "github.com/markbates/goth/providers/tumblr" - "github.com/markbates/goth/providers/twitter" - "github.com/markbates/goth/providers/yahoo" - "github.com/markbates/goth/providers/yandex" - "github.com/markbates/goth/providers/zoom" + "github.com/casdoor/goth" + "github.com/casdoor/goth/providers/amazon" + "github.com/casdoor/goth/providers/apple" + "github.com/casdoor/goth/providers/azuread" + "github.com/casdoor/goth/providers/bitbucket" + "github.com/casdoor/goth/providers/digitalocean" + "github.com/casdoor/goth/providers/discord" + "github.com/casdoor/goth/providers/dropbox" + "github.com/casdoor/goth/providers/facebook" + "github.com/casdoor/goth/providers/gitea" + "github.com/casdoor/goth/providers/github" + "github.com/casdoor/goth/providers/gitlab" + "github.com/casdoor/goth/providers/google" + "github.com/casdoor/goth/providers/heroku" + "github.com/casdoor/goth/providers/instagram" + "github.com/casdoor/goth/providers/kakao" + "github.com/casdoor/goth/providers/line" + "github.com/casdoor/goth/providers/linkedin" + "github.com/casdoor/goth/providers/microsoftonline" + "github.com/casdoor/goth/providers/paypal" + "github.com/casdoor/goth/providers/salesforce" + "github.com/casdoor/goth/providers/shopify" + "github.com/casdoor/goth/providers/slack" + "github.com/casdoor/goth/providers/steam" + "github.com/casdoor/goth/providers/tumblr" + "github.com/casdoor/goth/providers/twitter" + "github.com/casdoor/goth/providers/yahoo" + "github.com/casdoor/goth/providers/yandex" + "github.com/casdoor/goth/providers/zoom" "golang.org/x/oauth2" )