Merge pull request #16 from vgarvardt/patch/go-mod-oauth2-pkg

Updated package to use go-mod compatible oauth2

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    - cron: '0 9 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 2
+
+      # If this run was triggered by a pull request event, then checkout
+      # the head of the pull request instead of the merge commit.
+      - run: git checkout HEAD^2
+        if: ${{ github.event_name == 'pull_request' }}
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: go
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

README.md

@@ -10,7 +10,7 @@
 Storage major version matches [OAuth 2.0](https://github.com/go-oauth2/oauth2) major version,
 so use corresponding version (go modules compliant) 
 
-For `gopkg.in/oauth2.v4`:
+For `github.com/go-oauth2/oauth2/v4`:
 
 ```bash
 $ go get -u github.com/vgarvardt/go-oauth2-pg/v4
@@ -33,10 +33,10 @@ import (
 	"os"
 	"time"
 
+	"github.com/go-oauth2/oauth2/v4/manage"
 	"github.com/jackc/pgx/v4"
 	pg "github.com/vgarvardt/go-oauth2-pg/v4"
 	"github.com/vgarvardt/go-pg-adapter/pgx4adapter"
-	"gopkg.in/oauth2.v4/manage"
 )
 
 func main() {

client_store.go

@@ -7,8 +7,8 @@ import (
 	"log"
 	"os"
 
-	"gopkg.in/oauth2.v4"
-	"gopkg.in/oauth2.v4/models"
+	"github.com/go-oauth2/oauth2/v4"
+	"github.com/go-oauth2/oauth2/v4/models"
 
 	pgAdapter "github.com/vgarvardt/go-pg-adapter"
 )

go.mod

@@ -3,9 +3,9 @@ module github.com/vgarvardt/go-oauth2-pg/v4
 go 1.14
 
 require (
-	github.com/jackc/pgx/v4 v4.6.0
+	github.com/go-oauth2/oauth2/v4 v4.1.0
+	github.com/jackc/pgx/v4 v4.7.1
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/stretchr/testify v1.6.1
 	github.com/vgarvardt/go-pg-adapter v1.0.0
-	gopkg.in/oauth2.v4 v4.0.0
 )

token_store.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"time"
 
-	"gopkg.in/oauth2.v4"
-	"gopkg.in/oauth2.v4/models"
+	"github.com/go-oauth2/oauth2/v4"
+	"github.com/go-oauth2/oauth2/v4/models"
 
 	pgAdapter "github.com/vgarvardt/go-pg-adapter"
 )

token_store_test.go

@@ -9,14 +9,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-oauth2/oauth2/v4/models"
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
 	_ "github.com/jackc/pgx/v4/stdlib"
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/oauth2.v4/models"
 
 	pgAdapter "github.com/vgarvardt/go-pg-adapter"
 	"github.com/vgarvardt/go-pg-adapter/pgx4adapter"