chore: resolve build and test issues

ory · May 24, 2024 · 43b7000 · 43b7000
1 parent 73dd575
commit 43b7000
Show file tree

Hide file tree

Showing 205 changed files with 39,877 additions and 108 deletions.
diff --git a/.schema/openapi/patches/selfservice.yaml b/.schema/openapi/patches/selfservice.yaml
@@ -52,7 +52,7 @@
     - "$ref": "#/components/schemas/updateLoginFlowWithLookupSecretMethod"
     - "$ref": "#/components/schemas/updateLoginFlowWithCodeMethod"
     - "$ref": "#/components/schemas/updateLoginFlowWithPasskeyMethod"
-    - "$ref": "#/components/schemas/updateLoginFlowWithTwoStepMethod"
+    - "$ref": "#/components/schemas/updateLoginFlowWithIdentifierFirstMethod"
 - op: add
   path: /components/schemas/updateLoginFlowBody/discriminator
   value:

diff --git a/Makefile b/Makefile
@@ -143,7 +143,7 @@ sdk: .bin/swagger .bin/ory node_modules
 		-t .schema/openapi/templates/go \
 		-c .schema/openapi/gen.go.yml
 
-	(cd internal/client-go; go mod edit -module github.com/ory/client-go go.mod; rm -rf test api docs)
+	(cd internal/client-go; go mod edit -module github.com/ory/kratos/internal/httpclient go.mod; rm -rf test api docs)
 
 	make format
 

diff --git a/cmd/cliclient/client.go b/cmd/cliclient/client.go
@@ -18,7 +18,7 @@ import (
 
 	"github.com/spf13/pflag"
 
-	kratos "github.com/ory/client-go"
+	kratos "github.com/ory/kratos/internal/httpclient"
 )
 
 const (

diff --git a/cmd/identities/definitions.go b/cmd/identities/definitions.go
@@ -6,7 +6,7 @@ package identities
 import (
 	"strings"
 
-	kratos "github.com/ory/client-go"
+	kratos "github.com/ory/kratos/internal/httpclient"
 
 	"github.com/ory/x/cmdx"
 )

diff --git a/cmd/identities/get.go b/cmd/identities/get.go
@@ -6,7 +6,7 @@ package identities
 import (
 	"fmt"
 
-	kratos "github.com/ory/client-go"
+	kratos "github.com/ory/kratos/internal/httpclient"
 	"github.com/ory/kratos/x"
 	"github.com/ory/x/cmdx"
 	"github.com/ory/x/stringsx"

diff --git a/cmd/identities/import.go b/cmd/identities/import.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	kratos "github.com/ory/client-go"
+	kratos "github.com/ory/kratos/internal/httpclient"
 
 	"github.com/ory/x/cmdx"
 

diff --git a/cmd/identities/import_test.go b/cmd/identities/import_test.go
@@ -19,8 +19,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tidwall/gjson"
 
-	kratos "github.com/ory/client-go"
 	"github.com/ory/kratos/driver/config"
+	kratos "github.com/ory/kratos/internal/httpclient"
 )
 
 func TestImportCmd(t *testing.T) {

diff --git a/driver/config/config.go b/driver/config/config.go
@@ -776,7 +776,7 @@ func (p *Config) SelfServiceStrategy(ctx context.Context, strategy string) *Self
 	// we need to forcibly set these values here:
 	defaultEnabled := false
 	switch strategy {
-	case "identity_discovery":
+	case "two_step":
 		defaultEnabled = p.SelfServiceLoginFlowTwoStepEnabled(ctx)
 		break
 	case "code", "password", "profile":

diff --git a/driver/registry_default.go b/driver/registry_default.go
@@ -6,13 +6,14 @@ package driver
 import (
 	"context"
 	"crypto/sha256"
-	"github.com/ory/kratos/selfservice/strategy/multistep"
 	"net/http"
 	"strings"
 	"sync"
 	"testing"
 	"time"
 
+	"github.com/ory/kratos/selfservice/strategy/multistep"
+
 	"github.com/cenkalti/backoff"
 	"github.com/dgraph-io/ristretto"
 	"github.com/gobuffalo/pop/v6"

diff --git a/examples/go/identity/create/main.go b/examples/go/identity/create/main.go
@@ -6,8 +6,8 @@ package main
 import (
 	"context"
 
-	ory "github.com/ory/client-go"
 	"github.com/ory/kratos/examples/go/pkg"
+	ory "github.com/ory/kratos/internal/httpclient"
 	"github.com/ory/kratos/x"
 )
 

diff --git a/examples/go/identity/get/main.go b/examples/go/identity/get/main.go
@@ -6,8 +6,8 @@ package main
 import (
 	"context"
 
-	ory "github.com/ory/client-go"
 	"github.com/ory/kratos/examples/go/pkg"
+	ory "github.com/ory/kratos/internal/httpclient"
 )
 
 // If you use Open Source this would be:

diff --git a/examples/go/identity/update/main.go b/examples/go/identity/update/main.go
@@ -6,8 +6,8 @@ package main
 import (
 	"context"
 
-	ory "github.com/ory/client-go"
 	"github.com/ory/kratos/examples/go/pkg"
+	ory "github.com/ory/kratos/internal/httpclient"
 	"github.com/ory/kratos/x"
 )
 

diff --git a/examples/go/pkg/common.go b/examples/go/pkg/common.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/ory/kratos/internal/testhelpers"
 
-	ory "github.com/ory/client-go"
+	ory "github.com/ory/kratos/internal/httpclient"
 )
 
 func PrintJSONPretty(v interface{}) {

diff --git a/examples/go/pkg/resources.go b/examples/go/pkg/resources.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/gofrs/uuid"
 
-	ory "github.com/ory/client-go"
+	ory "github.com/ory/kratos/internal/httpclient"
 )
 
 func RandomCredentials() (email, password string) {

diff --git a/examples/go/selfservice/recovery/main_test.go b/examples/go/selfservice/recovery/main_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	ory "github.com/ory/client-go"
 	"github.com/ory/kratos/examples/go/pkg"
+	ory "github.com/ory/kratos/internal/httpclient"
 	"github.com/ory/kratos/internal/testhelpers"
 )
 

diff --git a/examples/go/selfservice/settings/main_test.go b/examples/go/selfservice/settings/main_test.go
@@ -6,7 +6,7 @@ package main
 import (
 	"testing"
 
-	ory "github.com/ory/client-go"
+	ory "github.com/ory/kratos/internal/httpclient"
 
 	"github.com/stretchr/testify/assert"
 

diff --git a/examples/go/selfservice/verification/main_test.go b/examples/go/selfservice/verification/main_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	ory "github.com/ory/client-go"
 	"github.com/ory/kratos/examples/go/pkg"
+	ory "github.com/ory/kratos/internal/httpclient"
 	"github.com/ory/kratos/internal/testhelpers"
 )
 

diff --git a/identity/credentials.go b/identity/credentials.go
@@ -89,7 +89,7 @@ const (
 	CredentialsTypePasskey  CredentialsType = "passkey"
 	CredentialsTypeProfile  CredentialsType = "profile"
 
-	TwoStep CredentialsType = "identity_discovery" // TODO move this somewhere else
+	TwoStep CredentialsType = "two_step" // TODO move this somewhere else
 )
 
 func (c CredentialsType) String() string {

diff --git a/internal/client-go/.openapi-generator/FILES b/internal/client-go/.openapi-generator/FILES
@@ -100,6 +100,7 @@ docs/UiText.md
 docs/UpdateIdentityBody.md
 docs/UpdateLoginFlowBody.md
 docs/UpdateLoginFlowWithCodeMethod.md
+docs/UpdateLoginFlowWithIdentifierFirstMethod.md
 docs/UpdateLoginFlowWithLookupSecretMethod.md
 docs/UpdateLoginFlowWithOidcMethod.md
 docs/UpdateLoginFlowWithPasskeyMethod.md
@@ -221,6 +222,7 @@ model_ui_text.go
 model_update_identity_body.go
 model_update_login_flow_body.go
 model_update_login_flow_with_code_method.go
+model_update_login_flow_with_identifier_first_method.go
 model_update_login_flow_with_lookup_secret_method.go
 model_update_login_flow_with_oidc_method.go
 model_update_login_flow_with_passkey_method.go

diff --git a/internal/client-go/README.md b/internal/client-go/README.md
@@ -223,6 +223,7 @@ Class | Method | HTTP request | Description
  - [UpdateIdentityBody](docs/UpdateIdentityBody.md)
  - [UpdateLoginFlowBody](docs/UpdateLoginFlowBody.md)
  - [UpdateLoginFlowWithCodeMethod](docs/UpdateLoginFlowWithCodeMethod.md)
+ - [UpdateLoginFlowWithIdentifierFirstMethod](docs/UpdateLoginFlowWithIdentifierFirstMethod.md)
  - [UpdateLoginFlowWithLookupSecretMethod](docs/UpdateLoginFlowWithLookupSecretMethod.md)
  - [UpdateLoginFlowWithOidcMethod](docs/UpdateLoginFlowWithOidcMethod.md)
  - [UpdateLoginFlowWithPasskeyMethod](docs/UpdateLoginFlowWithPasskeyMethod.md)

diff --git a/internal/client-go/api_identity.go b/internal/client-go/api_identity.go
diff --git a/internal/client-go/go.mod b/internal/client-go/go.mod
@@ -1,4 +1,4 @@
-module github.com/ory/client-go
+module github.com/ory/kratos/internal/httpclient
 
 go 1.13
 

diff --git a/internal/client-go/model_identity_credentials.go b/internal/client-go/model_identity_credentials.go
diff --git a/internal/client-go/model_login_flow.go b/internal/client-go/model_login_flow.go
diff --git a/internal/client-go/model_registration_flow.go b/internal/client-go/model_registration_flow.go
diff --git a/internal/client-go/model_ui_node.go b/internal/client-go/model_ui_node.go
diff --git a/internal/client-go/model_update_login_flow_body.go b/internal/client-go/model_update_login_flow_body.go