chore: update swagger files

ory · Aug 25, 2020 · a491824 · a491824
1 parent 83adecc
commit a491824
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 58 deletions.
diff --git a/.schema/api.swagger.json b/.schema/api.swagger.json
@@ -1184,9 +1184,9 @@
         ],
         "responses": {
           "200": {
-            "description": "sessionTokenContainer",
+            "description": "loginViaApiResponse",
             "schema": {
-              "$ref": "#/definitions/sessionTokenContainer"
+              "$ref": "#/definitions/loginViaApiResponse"
             }
           },
           "302": {
@@ -1891,6 +1891,23 @@
         }
       }
     },
+    "loginViaApiResponse": {
+      "description": "The Response for Login Flows via API",
+      "type": "object",
+      "required": [
+        "session_token",
+        "session"
+      ],
+      "properties": {
+        "session": {
+          "$ref": "#/definitions/session"
+        },
+        "session_token": {
+          "description": "The Session Token\n\nA session token is equivalent to a session cookie, but it can be sent in the HTTP Authorization\nHeader:\n\nAuthorization: bearer \u003csession-token\u003e\n\nThe session token is only issued for API flows, not for Browser flows!",
+          "type": "string"
+        }
+      }
+    },
     "recoveryRequest": {
       "description": "This request is used when an identity wants to recover their account.\n\nWe recommend reading the [Account Recovery Documentation](../self-service/flows/password-reset-account-recovery)",
       "type": "object",
@@ -2072,23 +2089,6 @@
         }
       }
     },
-    "sessionTokenContainer": {
-      "description": "Contains the Session and Session Token for API Based Authentication",
-      "type": "object",
-      "required": [
-        "session_token",
-        "session"
-      ],
-      "properties": {
-        "session": {
-          "$ref": "#/definitions/session"
-        },
-        "session_token": {
-          "description": "The Session Token\n\nA session token is equivalent to a session cookie, but it can be sent in the HTTP Authorization\nHeader:\n\nAuthorization: bearer \u003csession-token\u003e\n\nThe session token is only issued for API flows, not for Browser flows!",
-          "type": "string"
-        }
-      }
-    },
     "settingsRequest": {
       "description": "This request is used when an identity wants to update settings\n(e.g. profile data, passwords, ...) in a selfservice manner.\n\nWe recommend reading the [User Settings Documentation](../self-service/flows/user-settings)",
       "type": "object",
@@ -2139,6 +2139,9 @@
         },
         "state": {
           "$ref": "#/definitions/State"
+        },
+        "type": {
+          "$ref": "#/definitions/Type"
         }
       }
     },
@@ -2210,4 +2213,4 @@
   },
   "x-forwarded-proto": "string",
   "x-request-id": "string"
-}
+}
diff --git a/...tpclient/client/public/complete_self_service_login_flow_with_password_method_responses.go b/...tpclient/client/public/complete_self_service_login_flow_with_password_method_responses.go
diff --git a/...pclient/models/session_token_container.go → ...tpclient/models/login_via_api_response.go b/...pclient/models/session_token_container.go → ...tpclient/models/login_via_api_response.go
diff --git a/internal/httpclient/models/settings_request.go b/internal/httpclient/models/settings_request.go
diff --git a/internal/testhelpers/errorx.go b/internal/testhelpers/errorx.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/ory/kratos/driver/configuration"
 	"github.com/ory/kratos/selfservice/errorx"
+	"github.com/ory/kratos/session"
 	"github.com/ory/kratos/x"
 )
 
@@ -45,3 +46,17 @@ func NewRedirTS(t *testing.T, body string) *httptest.Server {
 	viper.Set(configuration.ViperKeySelfServiceBrowserDefaultReturnTo, ts.URL)
 	return ts
 }
+
+func NewRedirSessionEchoTS(t *testing.T, reg interface {
+	x.WriterProvider
+	session.ManagementProvider
+}) *httptest.Server {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		sess, err := reg.SessionManager().FetchFromRequest(r.Context(), r)
+		require.NoError(t, err, "Headers: %+v", r.Header)
+		reg.Writer().Write(w, r, sess)
+	}))
+	t.Cleanup(ts.Close)
+	viper.Set(configuration.ViperKeySelfServiceBrowserDefaultReturnTo, ts.URL+"/return-ts")
+	return ts
+}
diff --git a/internal/testhelpers/selfservice_settings.go b/internal/testhelpers/selfservice_settings.go
@@ -2,10 +2,8 @@
 package testhelpers
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -32,28 +30,6 @@ import (
 	"github.com/ory/kratos/x"
 )
 
-func HookConfigRedirectTo(t *testing.T, u string) (m []map[string]interface{}) {
-	var b bytes.Buffer
-	_, err := fmt.Fprintf(&b, `[
-	{
-		"hook": "redirect",
-		"config": {
-          "default_redirect_url": "%s",
-          "allow_user_defined_redirect": true
-		}
-	}
-]`, u)
-	require.NoError(t, err)
-	require.NoError(t, json.NewDecoder(&b).Decode(&m))
-
-	return m
-}
-
-func HookVerify(t *testing.T) (m []map[string]interface{}) {
-	require.NoError(t, json.NewDecoder(bytes.NewBufferString(`[{"job": "verify"}]`)).Decode(&m))
-	return m
-}
-
 func GetSettingsRequest(t *testing.T, primaryUser *http.Client, ts *httptest.Server) *common.GetSelfServiceBrowserSettingsRequestOK {
 	publicClient := NewSDKClient(ts)