feat: schemas are now static assets

ory · Aug 6, 2020 · 1776d58 · 1776d58
1 parent 96028d8
commit 1776d58
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 17 deletions.
diff --git a/selfservice/strategy/password/.schema/registration.schema.json b/selfservice/strategy/password/.schema/registration.schema.json
@@ -0,0 +1,16 @@
+{
+  "$id": "https://schemas.ory.sh/kratos/selfservice/strategy/password/registration.schema.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "required": [
+    "password",
+    "traits"
+  ],
+  "properties": {
+    "password": {
+      "type": "string",
+      "minLength": 1
+    },
+    "traits": {}
+  }
+}
diff --git a/selfservice/strategy/password/registration.go b/selfservice/strategy/password/registration.go
@@ -30,22 +30,6 @@ import (
 
 const (
 	RegistrationPath              = "/self-service/browser/flows/registration/strategies/password"
-	registrationFormPayloadSchema = `{
-  "$id": "https://schemas.ory.sh/kratos/selfservice/password/registration/config.schema.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "required": [
-    "password",
-    "traits"
-  ],
-  "properties": {
-    "password": {
-      "type": "string",
-      "minLength": 1
-    },
-    "traits": {}
-  }
-}`
 )
 
 type RegistrationFormPayload struct {
@@ -81,7 +65,7 @@ func (s *Strategy) handleRegistrationError(w http.ResponseWriter, r *http.Reques
 }
 
 func (s *Strategy) decoderRegistration() (decoderx.HTTPDecoderOption, error) {
-	raw, err := sjson.SetBytes([]byte(registrationFormPayloadSchema), "properties.traits.$ref", s.c.DefaultIdentityTraitsSchemaURL().String()+"#/properties/traits")
+	raw, err := sjson.SetBytes(registrationSchema, "properties.traits.$ref", s.c.DefaultIdentityTraitsSchemaURL().String()+"#/properties/traits")
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}

diff --git a/selfservice/strategy/password/schema.go b/selfservice/strategy/password/schema.go
@@ -0,0 +1,10 @@
+package password
+
+import (
+	"github.com/markbates/pkger"
+
+	"github.com/ory/kratos/x/pkgerx"
+)
+
+var loginSchema = pkgerx.MustRead(pkger.Open("/selfservice/strategy/password/.schema/login.schema.json"))
+var registrationSchema = pkgerx.MustRead(pkger.Open("/selfservice/strategy/password/.schema/registration.schema.json"))
diff --git a/x/pkgerx/pkgerx.go b/x/pkgerx/pkgerx.go
@@ -0,0 +1,17 @@
+package pkgerx
+
+import (
+	"io"
+	"io/ioutil"
+)
+
+func MustRead(closer io.ReadCloser, err error) []byte {
+	out, err := ioutil.ReadAll(closer)
+	if err != nil {
+		_ = closer.Close()
+		panic(err)
+	}
+
+	_ = closer.Close()
+	return out
+}