Merge pull request #5 from ory/master

Merge upstream to master

.circleci/config.yml

@@ -176,14 +176,14 @@ workflows:
               ignore: /master/
       - docs/cli
       - docs/build:
-          swag-spec-location: spec/openapi.json
+          swag-spec-location: spec/api.json
           filters:
             tags:
               only: /.*/
             branches:
               only: master
       - sdk/release-openapi:
-          swagpath: spec/openapi.json
+          swagpath: spec/api.json
           requires:
             - test
             - test-e2e

Makefile

@@ -87,11 +87,11 @@ sdk: .bin/swagger .bin/ory node_modules
 					-p file://.schema/openapi/patches/schema.yaml \
 					-p file://.schema/openapi/patches/selfservice.yaml \
 					-p file://.schema/openapi/patches/security.yaml \
-					spec/swagger.json spec/openapi.json
+					spec/swagger.json spec/api.json
 
 		rm -rf internal/httpclient/models internal/httpclient/clients
 		mkdir -p internal/httpclient/
-		npm run openapi-generator-cli -- generate -i "spec/openapi.json" \
+		npm run openapi-generator-cli -- generate -i "spec/api.json" \
 				-g go \
 				-o "internal/httpclient" \
 				--git-user-id ory \

README.md

@@ -194,6 +194,12 @@ that your company deserves a spot here, reach out to
             <td>Reyah</td>
             <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/reyah.svg" alt="Reyah"></td>
             <td><a href="https://reyah.eu/">reyah.eu</a></td>
+        </tr>        
+        <tr>
+            <td>Adopter *</td>
+            <td>Zero</td>
+            <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/commitzero.svg" alt="Project Zero by Commit"></td>
+            <td><a href="https://getzero.dev/">getzero.dev</a></td>
         </tr>
         <tr>
             <td>Sponsor</td>

cmd/identities/validate.go

@@ -56,7 +56,7 @@ Identities can be supplied via STD_IN or JSON files containing a single or an ar
 
 var schemas = make(map[string]*jsonschema.Schema)
 
-const createIdentityPath = "openapi.json#/components/schemas/createIdentity"
+const createIdentityPath = "api.json#/components/schemas/createIdentity"
 
 type SchemaGetter = func(ctx context.Context, id string) (map[string]interface{}, *http.Response, error)
 
@@ -68,7 +68,7 @@ func ValidateIdentity(cmd *cobra.Command, src, i string, getRemoteSchema SchemaG
 	if !ok {
 		// add swagger schema
 		schemaCompiler := jsonschema.NewCompiler()
-		err := schemaCompiler.AddResource("openapi.json", bytes.NewReader(spec.API))
+		err := schemaCompiler.AddResource("api.json", bytes.NewReader(spec.API))
 		if err != nil {
 			return errors.Wrap(err, "Could not add swagger schema to the schema compiler. This is an error with the binary you use and should be reported. Thanks ;)")
 		}

docs/contrib/config.js

@@ -16,7 +16,8 @@ let config = {
   updateConfig: {
     src: '.schema/config.schema.json',
     dst: './docs/docs/reference/configuration.md'
-  }
+  },
+  enableRedoc: true
 }
 
 const cn = path.join(__dirname, '..', 'config.js')

docs/contrib/theme.css

@@ -7,7 +7,7 @@
   margin: 32px;
 }
 
-.menu__link[href*="https://"]:after
-{
+.menu__link[href*="https://"] svg,
+svg[class*="iconExternalLink"] {
   display: none !important;
 }