Refactor oauth relying party code

Makefile

@@ -19,6 +19,7 @@ vendor:
 	go install github.com/golang/mock/mockgen
 	go install github.com/google/wire/cmd/wire
 	go install golang.org/x/vuln/cmd/govulncheck@latest
+	go install golang.org/x/tools/cmd/goimports@latest
 	npm --prefix ./scripts/npm ci
 	npm --prefix ./authui ci
 	npm --prefix ./portal ci
@@ -57,7 +58,8 @@ lint:
 
 .PHONY: fmt
 fmt:
-	go fmt ./...
+	# Ignore generated files, such as wire_gen.go and *_mock_test.go
+	find ./pkg ./cmd ./e2e -name '*.go' -not -name 'wire_gen.go' -not -name '*_mock_test.go' | sort | xargs goimports -w -format-only -local github.com/authgear/authgear-server
 
 .PHONY: govulncheck
 govulncheck:

cmd/authgear/background/wire.go

@@ -5,6 +5,7 @@ package background
 
 import (
 	"context"
+
 	"github.com/google/wire"
 
 	"github.com/authgear/authgear-server/pkg/lib/config"

cmd/authgear/main.go

@@ -21,6 +21,15 @@ import (
 	_ "github.com/authgear/authgear-server/cmd/authgear/cmd/cmdstart"
 	_ "github.com/authgear/authgear-server/pkg/latte"
 	_ "github.com/authgear/authgear-server/pkg/lib/authenticationflow/declarative"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/adfs"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/apple"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/azureadb2c"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/azureadv2"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/facebook"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/github"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/google"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/linkedin"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/wechat"
 	"github.com/authgear/authgear-server/pkg/util/debug"
 )
 

cmd/portal/analytic/wire.go

@@ -6,13 +6,14 @@ package analytic
 import (
 	"context"
 
+	"github.com/google/wire"
+
 	"github.com/authgear/authgear-server/pkg/lib/analytic"
 	"github.com/authgear/authgear-server/pkg/lib/config"
 	"github.com/authgear/authgear-server/pkg/lib/infra/db"
 	"github.com/authgear/authgear-server/pkg/lib/infra/redis"
 	"github.com/authgear/authgear-server/pkg/util/clock"
 	"github.com/authgear/authgear-server/pkg/util/periodical"
-	"github.com/google/wire"
 )
 
 func NewUserWeeklyReport(

cmd/portal/cmd/cmdanalytic/posthog.go

@@ -2,6 +2,7 @@ package cmdanalytic
 
 import (
 	"context"
+
 	"github.com/spf13/cobra"
 
 	"github.com/authgear/authgear-server/cmd/portal/analytic"

cmd/portal/cmd/cmdinternal/migrate_resources_remove_is_first_party.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"log"
 
-	portalcmd "github.com/authgear/authgear-server/cmd/portal/cmd"
-	"github.com/authgear/authgear-server/cmd/portal/internal"
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/yaml"
+
+	portalcmd "github.com/authgear/authgear-server/cmd/portal/cmd"
+	"github.com/authgear/authgear-server/cmd/portal/internal"
 )
 
 var cmdInternalMigrateRemoveIsFirstParty = &cobra.Command{

cmd/portal/main.go

@@ -16,6 +16,15 @@ import (
 	_ "github.com/authgear/authgear-server/cmd/portal/cmd/cmdpricing"
 	_ "github.com/authgear/authgear-server/cmd/portal/cmd/cmdstart"
 	_ "github.com/authgear/authgear-server/cmd/portal/cmd/cmdusage"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/adfs"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/apple"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/azureadb2c"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/azureadv2"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/facebook"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/github"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/google"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/linkedin"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/wechat"
 	"github.com/authgear/authgear-server/pkg/util/debug"
 )
 

cmd/portal/server/wire.go

@@ -5,6 +5,7 @@ package server
 
 import (
 	"context"
+
 	"github.com/google/wire"
 
 	"github.com/authgear/authgear-server/pkg/lib/config"

cmd/portal/usage/deps.go

@@ -1,14 +1,15 @@
 package usage
 
 import (
+	"github.com/google/wire"
+
 	"github.com/authgear/authgear-server/pkg/lib/config"
 	"github.com/authgear/authgear-server/pkg/lib/infra/db/auditdb"
 	"github.com/authgear/authgear-server/pkg/lib/infra/db/globaldb"
 	"github.com/authgear/authgear-server/pkg/lib/infra/redis/analyticredis"
 	"github.com/authgear/authgear-server/pkg/lib/meter"
 	"github.com/authgear/authgear-server/pkg/lib/usage"
 	"github.com/authgear/authgear-server/pkg/util/cobrasentry"
-	"github.com/google/wire"
 )
 
 func NewGlobalDatabaseCredentials(dbCredentials *config.DatabaseCredentials) *config.GlobalDatabaseCredentialsEnvironmentConfig {

cmd/portal/usage/wire.go

@@ -8,11 +8,12 @@ import (
 
 	"github.com/getsentry/sentry-go"
 
+	"github.com/google/wire"
+
 	"github.com/authgear/authgear-server/pkg/lib/config"
 	"github.com/authgear/authgear-server/pkg/lib/infra/db"
 	"github.com/authgear/authgear-server/pkg/lib/infra/redis"
 	"github.com/authgear/authgear-server/pkg/lib/usage"
-	"github.com/google/wire"
 )
 
 func NewCountCollector(

e2e/cmd/e2e/cmd/configsource.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	e2e "github.com/authgear/authgear-server/e2e/cmd/e2e/pkg"
 	"github.com/spf13/cobra"
+
+	e2e "github.com/authgear/authgear-server/e2e/cmd/e2e/pkg"
 )
 
 func init() {

e2e/cmd/e2e/cmd/execsql.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	e2e "github.com/authgear/authgear-server/e2e/cmd/e2e/pkg"
 	"github.com/spf13/cobra"
+
+	e2e "github.com/authgear/authgear-server/e2e/cmd/e2e/pkg"
 )
 
 func init() {

e2e/cmd/e2e/cmd/otp.go

@@ -3,8 +3,9 @@ package cmd
 import (
 	"fmt"
 
-	e2e "github.com/authgear/authgear-server/e2e/cmd/e2e/pkg"
 	"github.com/spf13/cobra"
+
+	e2e "github.com/authgear/authgear-server/e2e/cmd/e2e/pkg"
 )
 
 func init() {

e2e/cmd/e2e/cmd/userimport.go

@@ -3,8 +3,9 @@ package cmd
 import (
 	"os"
 
-	e2e "github.com/authgear/authgear-server/e2e/cmd/e2e/pkg"
 	"github.com/spf13/cobra"
+
+	e2e "github.com/authgear/authgear-server/e2e/cmd/e2e/pkg"
 )
 
 func init() {

e2e/cmd/e2e/main.go

@@ -5,10 +5,20 @@ import (
 	"log"
 	"os"
 
-	cmd "github.com/authgear/authgear-server/e2e/cmd/e2e/cmd"
-	"github.com/authgear/authgear-server/pkg/util/debug"
 	"github.com/joho/godotenv"
 	_ "go.uber.org/automaxprocs"
+
+	cmd "github.com/authgear/authgear-server/e2e/cmd/e2e/cmd"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/adfs"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/apple"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/azureadb2c"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/azureadv2"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/facebook"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/github"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/google"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/linkedin"
+	_ "github.com/authgear/authgear-server/pkg/lib/oauthrelyingparty/wechat"
+	"github.com/authgear/authgear-server/pkg/util/debug"
 )
 
 func main() {

e2e/cmd/e2e/pkg/deps.go

@@ -3,9 +3,10 @@ package e2e
 import (
 	"net/http"
 
+	"github.com/google/wire"
+
 	deps "github.com/authgear/authgear-server/pkg/lib/deps"
 	"github.com/authgear/authgear-server/pkg/util/httputil"
-	"github.com/google/wire"
 )
 
 func ProvideEnd2EndHTTPRequest() *http.Request {

e2e/cmd/proxy/main.go

@@ -11,11 +11,12 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/authgear/authgear-server/e2e/cmd/proxy/mockoidc"
-	"github.com/authgear/authgear-server/e2e/cmd/proxy/modifier"
 	"github.com/google/martian"
 	"github.com/google/martian/httpspec"
 	"github.com/google/martian/mitm"
+
+	"github.com/authgear/authgear-server/e2e/cmd/proxy/mockoidc"
+	"github.com/authgear/authgear-server/e2e/cmd/proxy/modifier"
 )
 
 func main() {

e2e/cmd/proxy/modifier/oidc.go

@@ -4,8 +4,9 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/authgear/authgear-server/e2e/cmd/proxy/mockoidc"
 	"github.com/google/martian/parse"
+
+	"github.com/authgear/authgear-server/e2e/cmd/proxy/mockoidc"
 )
 
 func init() {

e2e/pkg/testrunner/testcase.go

@@ -12,6 +12,7 @@ import (
 	texttemplate "text/template"
 
 	"github.com/Masterminds/sprig"
+
 	authflowclient "github.com/authgear/authgear-server/e2e/pkg/e2eclient"
 	"github.com/authgear/authgear-server/pkg/util/httputil"
 )

go.mod

@@ -94,7 +94,10 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 )
 
-require github.com/go-jose/go-jose/v3 v3.0.3
+require (
+	github.com/authgear/oauthrelyingparty v1.0.0
+	github.com/go-jose/go-jose/v3 v3.0.3
+)
 
 require (
 	cloud.google.com/go v0.110.8 // indirect

go.sum

@@ -87,6 +87,8 @@ github.com/alicebob/miniredis/v2 v2.31.0 h1:ObEFUNlJwoIiyjxdrYF0QIDE7qXcLc7D3WpS
 github.com/alicebob/miniredis/v2 v2.31.0/go.mod h1:UB/T2Uztp7MlFSDakaX1sTXUv5CASoprx0wulRT6HBg=
 github.com/authgear/graphql-go-relay v0.0.0-20201016065100-df672205b892 h1:OIPk6DEk51wL35vsCYfLacc7pZ0ev8TKvmcp+EKOnPU=
 github.com/authgear/graphql-go-relay v0.0.0-20201016065100-df672205b892/go.mod h1:SxJGRjo7+1SFr8pfMghiCM17WWFSswRwMvtv6t1aDO8=
+github.com/authgear/oauthrelyingparty v1.0.0 h1:i5F3mjnImWesbdOc7ZcjPcT5918FAwruduRmFTBMtdY=
+github.com/authgear/oauthrelyingparty v1.0.0/go.mod h1:0UcO0p5eS9BPLulX6K7TvkXkuPeTn3QhAJ/UQg4fmiQ=
 github.com/aws/aws-sdk-go v1.47.9 h1:rarTsos0mA16q+huicGx0e560aYRtOucV5z2Mw23JRY=
 github.com/aws/aws-sdk-go v1.47.9/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=

pkg/admin/graphql/group_mutation.go

@@ -3,13 +3,14 @@ package graphql
 import (
 	relay "github.com/authgear/graphql-go-relay"
 
+	"github.com/graphql-go/graphql"
+
 	"github.com/authgear/authgear-server/pkg/api/apierrors"
 	"github.com/authgear/authgear-server/pkg/api/event/nonblocking"
 	"github.com/authgear/authgear-server/pkg/api/model"
 	"github.com/authgear/authgear-server/pkg/lib/rolesgroups"
 	"github.com/authgear/authgear-server/pkg/util/graphqlutil"
 	"github.com/authgear/authgear-server/pkg/util/slice"
-	"github.com/graphql-go/graphql"
 )
 
 var createGroupInput = graphql.NewInputObject(graphql.InputObjectConfig{

pkg/admin/graphql/group_role_mutation.go

@@ -1,12 +1,13 @@
 package graphql
 
 import (
+	"github.com/graphql-go/graphql"
+
 	"github.com/authgear/authgear-server/pkg/api/event/nonblocking"
 	"github.com/authgear/authgear-server/pkg/api/model"
 	"github.com/authgear/authgear-server/pkg/lib/rolesgroups"
 	"github.com/authgear/authgear-server/pkg/util/graphqlutil"
 	"github.com/authgear/authgear-server/pkg/util/slice"
-	"github.com/graphql-go/graphql"
 )
 
 var addRoleToGroupsInput = graphql.NewInputObject(graphql.InputObjectConfig{

pkg/admin/graphql/group_user_mutation.go

@@ -1,14 +1,15 @@
 package graphql
 
 import (
+	relay "github.com/authgear/graphql-go-relay"
+	"github.com/graphql-go/graphql"
+
 	"github.com/authgear/authgear-server/pkg/api/apierrors"
 	"github.com/authgear/authgear-server/pkg/api/event/nonblocking"
 	"github.com/authgear/authgear-server/pkg/api/model"
 	"github.com/authgear/authgear-server/pkg/lib/rolesgroups"
 	"github.com/authgear/authgear-server/pkg/util/graphqlutil"
 	"github.com/authgear/authgear-server/pkg/util/slice"
-	relay "github.com/authgear/graphql-go-relay"
-	"github.com/graphql-go/graphql"
 )
 
 var addGroupToUsersInput = graphql.NewInputObject(graphql.InputObjectConfig{

pkg/admin/graphql/role_mutation.go

@@ -3,13 +3,14 @@ package graphql
 import (
 	relay "github.com/authgear/graphql-go-relay"
 
+	"github.com/graphql-go/graphql"
+
 	"github.com/authgear/authgear-server/pkg/api/apierrors"
 	"github.com/authgear/authgear-server/pkg/api/event/nonblocking"
 	"github.com/authgear/authgear-server/pkg/api/model"
 	"github.com/authgear/authgear-server/pkg/lib/rolesgroups"
 	"github.com/authgear/authgear-server/pkg/util/graphqlutil"
 	"github.com/authgear/authgear-server/pkg/util/slice"
-	"github.com/graphql-go/graphql"
 )
 
 var createRoleInput = graphql.NewInputObject(graphql.InputObjectConfig{

pkg/admin/graphql/role_user_mutation.go

@@ -1,14 +1,15 @@
 package graphql
 
 import (
+	relay "github.com/authgear/graphql-go-relay"
+	"github.com/graphql-go/graphql"
+
 	"github.com/authgear/authgear-server/pkg/api/apierrors"
 	"github.com/authgear/authgear-server/pkg/api/event/nonblocking"
 	"github.com/authgear/authgear-server/pkg/api/model"
 	"github.com/authgear/authgear-server/pkg/lib/rolesgroups"
 	"github.com/authgear/authgear-server/pkg/util/graphqlutil"
 	"github.com/authgear/authgear-server/pkg/util/slice"
-	relay "github.com/authgear/graphql-go-relay"
-	"github.com/graphql-go/graphql"
 )
 
 var addRoleToUsersInput = graphql.NewInputObject(graphql.InputObjectConfig{

pkg/api/internalinterface/loginid_normalizer.go

@@ -0,0 +1,6 @@
+package internalinterface
+
+type LoginIDNormalizer interface {
+	Normalize(loginID string) (string, error)
+	ComputeUniqueKey(normalizeLoginID string) (string, error)
+}

pkg/api/model/siwe.go

@@ -5,8 +5,9 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/authgear/authgear-server/pkg/util/web3"
 	"github.com/ethereum/go-ethereum/crypto"
+
+	"github.com/authgear/authgear-server/pkg/util/web3"
 )
 
 type SIWEPublicKey string

pkg/api/model/siwe_test.go

@@ -6,9 +6,10 @@ import (
 	"crypto/rand"
 	"testing"
 
-	"github.com/authgear/authgear-server/pkg/api/model"
 	. "github.com/smartystreets/goconvey/convey"
 
+	"github.com/authgear/authgear-server/pkg/api/model"
+
 	"github.com/ethereum/go-ethereum/crypto"
 )
 

pkg/auth/handler/api/authenticationflow_v1_create.go

@@ -6,6 +6,8 @@ import (
 	"net/http"
 	"net/url"
 
+	"github.com/iawaknahc/jsonschema/pkg/jsonpointer"
+
 	"github.com/authgear/authgear-server/pkg/api"
 	authflow "github.com/authgear/authgear-server/pkg/lib/authenticationflow"
 	"github.com/authgear/authgear-server/pkg/lib/infra/redis/appredis"
@@ -17,7 +19,6 @@ import (
 	"github.com/authgear/authgear-server/pkg/util/log"
 	"github.com/authgear/authgear-server/pkg/util/slice"
 	"github.com/authgear/authgear-server/pkg/util/validation"
-	"github.com/iawaknahc/jsonschema/pkg/jsonpointer"
 )
 
 func ConfigureAuthenticationFlowV1CreateRoute(route httproute.Route) httproute.Route {