update module version to v3

rokwire · Mar 10, 2023 · 05fc0af · 05fc0af
1 parent 301665c
commit 05fc0af
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Auth library for validation of Core Building Block auth tokens
 ## Installation
 To install this package, use `go get`:
 
-    go get github.com/rokwire/core-auth-library-go/v2
+    go get github.com/rokwire/core-auth-library-go/v3
 
 This will then make the following packages available to you:
 

diff --git a/authorization/authorization.go b/authorization/authorization.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/casbin/casbin/v2"
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
 )
 
 const (

diff --git a/authservice/auth_service.go b/authservice/auth_service.go
@@ -26,8 +26,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
 	"golang.org/x/sync/syncmap"
 	"gopkg.in/go-playground/validator.v9"
 )

diff --git a/authservice/auth_service_test.go b/authservice/auth_service_test.go
@@ -19,10 +19,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
-	"github.com/rokwire/core-auth-library-go/v2/internal/testutils"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/internal/testutils"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
 )
 
 func setupSampleServiceRegSubscriptions() *authservice.ServiceRegSubscriptions {

diff --git a/authservice/mocks/ServiceAccountLoader.go b/authservice/mocks/ServiceAccountLoader.go
diff --git a/authservice/mocks/ServiceRegLoader.go b/authservice/mocks/ServiceRegLoader.go
diff --git a/authutils/utils_test.go b/authutils/utils_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
 )
 
 func TestHashSha256(t *testing.T) {

diff --git a/coreservice/core_service.go b/coreservice/core_service.go
@@ -21,8 +21,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
 	"github.com/rokwire/logging-library-go/v2/logs"
 )
 

diff --git a/example/coreservice/app.go b/example/coreservice/app.go
@@ -17,8 +17,8 @@ package main
 import (
 	"log"
 
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/coreservice"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/coreservice"
 	"github.com/rokwire/logging-library-go/v2/logs"
 )
 

diff --git a/example/envloader/app.go b/example/envloader/app.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/rokwire/core-auth-library-go/v2/envloader"
+	"github.com/rokwire/core-auth-library-go/v3/envloader"
 	"github.com/rokwire/logging-library-go/v2/logs"
 )
 

diff --git a/example/signature/app.go b/example/signature/app.go
@@ -22,10 +22,10 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/internal/testutils"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
-	"github.com/rokwire/core-auth-library-go/v2/sigauth"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/internal/testutils"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
+	"github.com/rokwire/core-auth-library-go/v3/sigauth"
 )
 
 // WebAdapter is the web adapter for signature auth

diff --git a/example/token/app.go b/example/token/app.go
@@ -20,9 +20,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/rokwire/core-auth-library-go/v2/authorization"
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/tokenauth"
+	"github.com/rokwire/core-auth-library-go/v3/authorization"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/tokenauth"
 )
 
 // WebAdapter is the web adapter for token auth

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rokwire/core-auth-library-go/v2
+module github.com/rokwire/core-auth-library-go/v3
 
 go 1.20
 

diff --git a/go.sum b/go.sum
@@ -1,11 +1,7 @@
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-github.com/aws/aws-sdk-go v1.44.215 h1:K3KERfO6MaV349idub2w1u1H0R0KSkED0LshPnaAn3Q=
-github.com/aws/aws-sdk-go v1.44.215/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aws/aws-sdk-go v1.44.218 h1:p707+xOCazWhkSpZOeyhtTcg7Z+asxxvueGgYPSitn4=
 github.com/aws/aws-sdk-go v1.44.218/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/casbin/casbin/v2 v2.65.0 h1:VC/WAX7Aqqx5FZSToGhkC8Mw9veg9K5PThUd71szi5c=
-github.com/casbin/casbin/v2 v2.65.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
 github.com/casbin/casbin/v2 v2.65.1 h1:T4vuP+rQvaBcGM/FqvwnJKvVz6N4nLKmLsvk8E+ZTF4=
 github.com/casbin/casbin/v2 v2.65.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=

diff --git a/internal/testutils/test_utils.go b/internal/testutils/test_utils.go
@@ -17,9 +17,9 @@ package testutils
 import (
 	"fmt"
 
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/authservice/mocks"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/authservice/mocks"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
 )
 
 // GetSampleRSAPubKeyPem returns a sample RSA public key PEM

diff --git a/keys/keys.go b/keys/keys.go
@@ -29,7 +29,7 @@ import (
 	"io"
 
 	"github.com/golang-jwt/jwt"
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
 )
 
 const (

diff --git a/keys/keys_test.go b/keys/keys_test.go
@@ -18,8 +18,8 @@ import (
 	"encoding/base64"
 	"testing"
 
-	"github.com/rokwire/core-auth-library-go/v2/internal/testutils"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
+	"github.com/rokwire/core-auth-library-go/v3/internal/testutils"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
 )
 
 func setupPubKeyFromPem(pem string) *keys.PubKey {

diff --git a/sigauth/signature.go b/sigauth/signature.go
@@ -28,9 +28,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
 	"gopkg.in/go-playground/validator.v9"
 )
 

diff --git a/sigauth/signature_test.go b/sigauth/signature_test.go
@@ -25,11 +25,11 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/authservice/mocks"
-	"github.com/rokwire/core-auth-library-go/v2/internal/testutils"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
-	"github.com/rokwire/core-auth-library-go/v2/sigauth"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/authservice/mocks"
+	"github.com/rokwire/core-auth-library-go/v3/internal/testutils"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
+	"github.com/rokwire/core-auth-library-go/v3/sigauth"
 )
 
 func setupTestSignatureAuth(authService *authservice.AuthService, mockLoader *mocks.ServiceRegLoader) (*sigauth.SignatureAuth, error) {

diff --git a/tokenauth/token.go b/tokenauth/token.go
@@ -23,10 +23,10 @@ import (
 	"time"
 
 	"github.com/golang-jwt/jwt"
-	"github.com/rokwire/core-auth-library-go/v2/authorization"
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
+	"github.com/rokwire/core-auth-library-go/v3/authorization"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
 )
 
 const (

diff --git a/tokenauth/token_test.go b/tokenauth/token_test.go
@@ -24,13 +24,13 @@ import (
 	"time"
 
 	"github.com/golang-jwt/jwt"
-	"github.com/rokwire/core-auth-library-go/v2/authorization"
-	"github.com/rokwire/core-auth-library-go/v2/authservice"
-	"github.com/rokwire/core-auth-library-go/v2/authservice/mocks"
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
-	"github.com/rokwire/core-auth-library-go/v2/internal/testutils"
-	"github.com/rokwire/core-auth-library-go/v2/keys"
-	"github.com/rokwire/core-auth-library-go/v2/tokenauth"
+	"github.com/rokwire/core-auth-library-go/v3/authorization"
+	"github.com/rokwire/core-auth-library-go/v3/authservice"
+	"github.com/rokwire/core-auth-library-go/v3/authservice/mocks"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/internal/testutils"
+	"github.com/rokwire/core-auth-library-go/v3/keys"
+	"github.com/rokwire/core-auth-library-go/v3/tokenauth"
 )
 
 func setupTestTokenAuth(authService *authservice.AuthService, acceptRokwire bool, mockLoader *mocks.ServiceRegLoader) (*tokenauth.TokenAuth, error) {

diff --git a/webauth/web.go b/webauth/web.go
@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/rokwire/core-auth-library-go/v2/authutils"
+	"github.com/rokwire/core-auth-library-go/v3/authutils"
 	"github.com/rs/cors"
 )
 

diff --git a/webauth/web_test.go b/webauth/web_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rokwire/core-auth-library-go/v2/webauth"
+	"github.com/rokwire/core-auth-library-go/v3/webauth"
 )
 
 func TestCheckOrigin(t *testing.T) {