From 6941d64b7f9dac9002997af0a316e8549a816283 Mon Sep 17 00:00:00 2001 From: MrMelon54 Date: Fri, 3 Nov 2023 07:39:58 +0000 Subject: [PATCH] Update mjwt library --- cmd/lavender/serve.go | 2 +- go.mod | 3 ++- go.sum | 8 ++++---- server/flow.go | 4 ++-- server/flow_test.go | 2 +- server/server.go | 2 +- server/verify.go | 4 ++-- server/verify_test.go | 6 +++--- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cmd/lavender/serve.go b/cmd/lavender/serve.go index 490feda..b721687 100644 --- a/cmd/lavender/serve.go +++ b/cmd/lavender/serve.go @@ -13,7 +13,7 @@ import ( "github.com/1f349/lavender/server/pages" "github.com/1f349/violet/utils" exit_reload "github.com/MrMelon54/exit-reload" - "github.com/MrMelon54/mjwt" + "github.com/1f349/mjwt" "github.com/google/subcommands" "log" "os" diff --git a/go.mod b/go.mod index 0a3da46..62bedcd 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,10 @@ go 1.21.1 require ( github.com/1f349/cache v0.0.2 + github.com/1f349/mjwt v0.2.0 github.com/1f349/overlapfs v0.0.1 github.com/1f349/violet v0.0.10 github.com/MrMelon54/exit-reload v0.0.1 - github.com/MrMelon54/mjwt v0.1.2 github.com/golang-jwt/jwt/v4 v4.5.0 github.com/google/subcommands v1.2.0 github.com/google/uuid v1.3.1 @@ -18,6 +18,7 @@ require ( require ( github.com/MrMelon54/rescheduler v0.0.2 // indirect + github.com/becheran/wildmatch-go v1.0.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.4.2 // indirect github.com/kr/text v0.2.0 // indirect diff --git a/go.sum b/go.sum index 6428c3e..f3880a6 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,18 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/1f349/cache v0.0.2 h1:27QD6zPd9xYyvh9V1qqWq+EAt5+N+qvyGWKfnjMrhP8= github.com/1f349/cache v0.0.2/go.mod h1:LibAMy13dF0KO1fQA9aEjZPBCB6Y4b5kKYEQJUqc2rQ= +github.com/1f349/mjwt v0.2.0 h1:1c3+J05RRBsClGxA91SzT3I2DkwasGA4OgLcIeXWmq4= +github.com/1f349/mjwt v0.2.0/go.mod h1:KEs6jd9JjWrQW+8feP2pGAU7pdA3aYTqjkT/YQr73PU= github.com/1f349/overlapfs v0.0.1 h1:LAxBolrXFAgU0yqZtXg/C/aaPq3eoQSPpBc49BHuTp0= github.com/1f349/overlapfs v0.0.1/go.mod h1:I6aItQycr7nrzplmfNXp/QF9tTmKRSgY3fXmu/7Ky2o= github.com/1f349/violet v0.0.10 h1:2HuQq7SddV60JZ4Xr7DmmhTOPbjiF+1Uqk+d6O1f18U= github.com/1f349/violet v0.0.10/go.mod h1:Uzu6I1pLBP5UEzcUCTQBbk/NTfI5TAABSrowa8DSpR0= github.com/MrMelon54/exit-reload v0.0.1 h1:sxHa59tNEQMcikwuX2+93lw6Vi1+R7oCRF8a0C3alXc= github.com/MrMelon54/exit-reload v0.0.1/go.mod h1:PLiSfmUzwdpTTQP3BBfUPhkqPwaIZjx0DuXBnM76Bug= -github.com/MrMelon54/mjwt v0.1.1 h1:m+aTpxbhQCrOPKHN170DQMFR5r938LkviU38unob5Jw= -github.com/MrMelon54/mjwt v0.1.1/go.mod h1:oYrDBWK09Hju98xb+bRQ0wy+RuAzacxYvKYOZchR2Tk= -github.com/MrMelon54/mjwt v0.1.2 h1:uYjEWybACH/Kt1lFyfqFaU1QX/Kh1Gn72jtxoxaG1F0= -github.com/MrMelon54/mjwt v0.1.2/go.mod h1:oYrDBWK09Hju98xb+bRQ0wy+RuAzacxYvKYOZchR2Tk= github.com/MrMelon54/rescheduler v0.0.2 h1:efrRwr0BYlkaXFucZDjQqRyIawZiMEAnzjea46Bs9Oc= github.com/MrMelon54/rescheduler v0.0.2/go.mod h1:OQDFtZHdS4/qA/r7rtJUQA22/hbpnZ9MGQCXOPjhC6w= +github.com/becheran/wildmatch-go v1.0.0 h1:mE3dGGkTmpKtT4Z+88t8RStG40yN9T+kFEGj2PZFSzA= +github.com/becheran/wildmatch-go v1.0.0/go.mod h1:gbMvj0NtVdJ15Mg/mH9uxk2R1QCistMyU7d9KFzroX4= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/server/flow.go b/server/flow.go index 6265404..af3f9e1 100644 --- a/server/flow.go +++ b/server/flow.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/1f349/lavender/issuer" "github.com/1f349/lavender/server/pages" - "github.com/MrMelon54/mjwt/auth" - "github.com/MrMelon54/mjwt/claims" + "github.com/1f349/mjwt/auth" + "github.com/1f349/mjwt/claims" "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" "github.com/julienschmidt/httprouter" diff --git a/server/flow_test.go b/server/flow_test.go index ea1b4b4..bb4249e 100644 --- a/server/flow_test.go +++ b/server/flow_test.go @@ -11,7 +11,7 @@ import ( "github.com/1f349/lavender/issuer" "github.com/1f349/lavender/server/pages" "github.com/1f349/lavender/utils" - "github.com/MrMelon54/mjwt" + "github.com/1f349/mjwt" "github.com/google/uuid" "github.com/julienschmidt/httprouter" "github.com/stretchr/testify/assert" diff --git a/server/server.go b/server/server.go index 3d2ad0a..163bb26 100644 --- a/server/server.go +++ b/server/server.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/1f349/cache" "github.com/1f349/lavender/issuer" - "github.com/MrMelon54/mjwt" + "github.com/1f349/mjwt" "github.com/julienschmidt/httprouter" "log" "net/http" diff --git a/server/verify.go b/server/verify.go index a813977..d3eaf74 100644 --- a/server/verify.go +++ b/server/verify.go @@ -2,8 +2,8 @@ package server import ( "github.com/1f349/violet/utils" - "github.com/MrMelon54/mjwt" - "github.com/MrMelon54/mjwt/auth" + "github.com/1f349/mjwt" + "github.com/1f349/mjwt/auth" "github.com/julienschmidt/httprouter" "net/http" ) diff --git a/server/verify_test.go b/server/verify_test.go index 42862bd..1d48bfe 100644 --- a/server/verify_test.go +++ b/server/verify_test.go @@ -3,9 +3,9 @@ package server import ( "crypto/rand" "crypto/rsa" - "github.com/MrMelon54/mjwt" - "github.com/MrMelon54/mjwt/auth" - "github.com/MrMelon54/mjwt/claims" + "github.com/1f349/mjwt" + "github.com/1f349/mjwt/auth" + "github.com/1f349/mjwt/claims" "github.com/julienschmidt/httprouter" "github.com/stretchr/testify/assert" "net/http"