feat: ory.com

Makefile

@@ -37,7 +37,7 @@ refresh:
 # Formats the code
 .PHONY: format
 format: .bin/cli node_modules go.mod
-	.bin/cli dev headers copyright --type=open-source
+	.bin/cli dev headers copyright --type=open-source --exclude=.snapshots
 	go tool goimports -w -local github.com/ory .
 	npm exec -- prettier --write "{**/,}*{.js,.md,.ts}"
 

cmd/cloudx/client/sdks.go

@@ -28,10 +28,10 @@ var rateLimitHeader = os.Getenv(RateLimitHeaderKey)
 
 func CloudConsoleURL(prefix string) *url.URL {
 	// we load the URL from the env here instead of init() because the tests might want to change this
-	consoleURL, err := url.ParseRequestURI(cmp.Or(os.Getenv(ConsoleURLKey), "https://console.ory.sh"))
+	consoleURL, err := url.ParseRequestURI(cmp.Or(os.Getenv(ConsoleURLKey), "https://console.ory.com"))
 	if err != nil {
 		fmt.Printf("error parsing console url: %s\n", err)
-		consoleURL = &url.URL{Scheme: "https", Host: "console.ory.sh"}
+		consoleURL = &url.URL{Scheme: "https", Host: "console.ory.com"}
 	}
 	if prefix != "" {
 		consoleURL.Host = prefix + "." + consoleURL.Host

cmd/cloudx/project/create.go

@@ -65,7 +65,7 @@ func NewCreateProjectCmd() *cobra.Command {
 				if err != nil {
 					return cmdx.PrintOpenAPIError(cmd, err)
 				}
-				wsID = new(ws.Id)
+				wsID = &ws.Id
 			}
 
 			for name == "" {

cmd/cloudx/project/patch.go

@@ -35,7 +35,7 @@ specified in the patch will be overwritten. To replace the config use the ` + "`
 
 The format of the patch is a JSON-Patch document. For more details please check:
 
-	https://www.ory.sh/docs/reference/api#operation/patchProject
+	https://www.ory.com/docs/reference/api#operation/patchProject
 	https://jsonpatch.com`,
 		RunE: runPatch(
 			func(s []string) []string {

cmd/cloudx/project/patch_identity_config.go

@@ -46,7 +46,7 @@ when compared to the ` + "`patch project`" + ` command:
 
 The format of the patch is a JSON-Patch document. For more details please check:
 
-	https://www.ory.sh/docs/reference/api#operation/patchProject
+	https://www.ory.com/docs/reference/api#operation/patchProject
 	https://jsonpatch.com`,
 		RunE: runPatch(
 			prefixIdentityConfig,

cmd/cloudx/project/patch_oauth2_config.go

@@ -57,7 +57,7 @@ when compared to the ` + "`patch project`" + ` command:
 
 The format of the patch is a JSON-Patch document. For more details please check:
 
-	https://www.ory.sh/docs/reference/api#operation/patchProject
+	https://www.ory.com/docs/reference/api#operation/patchProject
 	https://jsonpatch.com`,
 		RunE: runPatch(
 			prefixOAuth2Config,

cmd/cloudx/project/patch_permission_config.go

@@ -52,7 +52,7 @@ when compared to the ` + "`patch project`" + ` command:
 
 The format of the patch is a JSON-Patch document. For more details please check:
 
-	https://www.ory.sh/docs/reference/api#operation/patchProject
+	https://www.ory.com/docs/reference/api#operation/patchProject
 	https://jsonpatch.com`,
 		RunE: runPatch(
 			prefixPermissionConfig,

cmd/cloudx/project/update.go

@@ -60,7 +60,7 @@ If the ` + "`--name`" + ` flag is not set, the project's name will not be change
 
 The full configuration payload can be found at
 
-	https://www.ory.sh/docs/reference/api#operation/updateProject
+	https://www.ory.com/docs/reference/api#operation/updateProject
 
 As an example an input could look like:
 

cmd/cloudx/project/update_identity_config.go

@@ -51,7 +51,7 @@ self-hosted Ory Kratos to Ory Network.
 
 The full configuration payload can be found at:
 
-	https://www.ory.sh/docs/reference/api#operation/updateProject.
+	https://www.ory.com/docs/reference/api#operation/updateProject
 
 This command expects the contents of the ` + "`/services/identity/config`" + ` key, so for example:
 

cmd/cloudx/project/update_oauth2_config.go

@@ -53,7 +53,7 @@ from self-hosted Ory Hydra to Ory Network.
 
 The full configuration payload can be found at:
 
-	https://www.ory.sh/docs/reference/api#operation/updateProject.
+	https://www.ory.com/docs/reference/api#operation/updateProject
 
 This command expects the contents of the ` + "`/services/oauth2/config`" + ` key, so for example:
 

cmd/cloudx/project/update_permission_config.go

@@ -52,7 +52,7 @@ self-hosted Ory Keto to Ory Network.
 
 The full configuration payload can be found at:
 
-	https://www.ory.sh/docs/reference/api#operation/updateProject.
+	https://www.ory.com/docs/reference/api#operation/updateProject
 
 This command expects the contents of the ` + "`/services/permission/config`" + ` key, so for example:
 

cmd/dev/newsletter/stub/changelog.html.expected → cmd/dev/newsletter/.snapshots/TestRenderMarkdownLong.html

@@ -1,3 +1,6 @@
+
+
+
 <!DOCTYPE html>
 
 <html lang='en'>
@@ -10,6 +13,14 @@
     #outlook a {
       padding: 0;
     }
+    pre {
+      background-color: #f5f5f5;
+      padding: 8px;
+    }
+    code {
+      background-color: #f5f5f5;
+      padding: 2px 4px;
+    }
     body {
       margin: 0;
       padding: 0;
@@ -56,8 +67,8 @@
         max-width: 3.389830508474576%;
       }
       .xc600 {
-        width: 600px !important;
-        max-width: 600px;
+        width: 1200px !important;
+        max-width: 1200px;
       }
       .xc32 {
         width: 32px !important;
@@ -68,8 +79,8 @@
         max-width: 16px;
       }
       .xc440 {
-        width: 440px !important;
-        max-width: 440px;
+         
+         
       }
     }
   </style>
@@ -87,8 +98,8 @@
       max-width: 3.389830508474576%;
     }
     .moz-text-html .xc600 {
-      width: 600px !important;
-      max-width: 600px;
+      width: 1200px !important;
+      max-width: 1200px;
     }
     .moz-text-html .xc32 {
       width: 32px !important;
@@ -99,8 +110,8 @@
       max-width: 16px;
     }
     .moz-text-html .xc440 {
-      width: 440px !important;
-      max-width: 440px;
+       
+       
     }
   </style>
   <style type="text/css">
@@ -245,7 +256,7 @@
       background-color: #fffffe;
       margin: 0px auto;
       border-radius: 0;
-      max-width: 600px;
+      max-width: 1200px;
     "
   >
     <table
@@ -329,7 +340,7 @@
                             <tr>
                               <td style="width: 80px">
                                 <a
-                                  href="https://www.ory.sh/"
+                                  href="https://www.ory.com/"
                                   target="_blank"
                                 >
                                   <img
@@ -468,7 +479,7 @@
       background-color: #fcfcfc;
       margin: 0px auto;
       border-radius: 0;
-      max-width: 600px;
+      max-width: 1200px;
     "
   >
     <table
@@ -663,7 +674,7 @@
                             "
                             >Ory Kratos v0.1.0</span
                           >   <br>     <span style="font-size: 16px; font-weight: 400;">is here!</span><br>
-                          <span style="font-size: 16px; font-weight: 400;"><a href="https://www.ory.sh/ory/kratos" target="_blank">Website</a>&nbsp;| <a href="https://github.com/ory/ory/kratos" target="_blank">GitHub</a> |&nbsp;<a href="https://github.com/ory/ory/kratos/blob/master/CHANGELOG.md" target="_blank">Changelog</a>&nbsp;|&nbsp;<a href="https://github.com/ory/ory/kratos/blob/master/UPGRADE.md" target="_blank">Upgrade Guide</a><br></span>
+                          <span style="font-size: 16px; font-weight: 400;"><a href="https://www.ory.com/ory/kratos" target="_blank">Website</a>&nbsp;| <a href="https://github.com/ory/ory/kratos" target="_blank">GitHub</a> |&nbsp;<a href="https://github.com/ory/ory/kratos/blob/master/CHANGELOG.md" target="_blank">Changelog</a><br></span>
 
                         </p>
                       </div>
@@ -1094,7 +1105,7 @@ <h2>Breaking Changes</h2>
 The configuration value for <code>hashers.argon2.memory</code> is now a string representation of the memory amount including the unit of measurement. To convert the value divide your current setting (KB) by 1024 to get a result in MB or 1048576 to get a result in GB. Example: <code>131072</code> would now become <code>128MB</code>.</p>
 
 <p>Co-authored-by: aeneasr <a href="mailto:3372410+aeneasr@users.noreply.github.com" target="_blank">3372410+aeneasr@users.noreply.github.com</a>
-Co-authored-by: aeneasr <a href="mailto:aeneas@ory.sh" target="_blank">aeneas@ory.sh</a>
+Co-authored-by: aeneasr <a href="mailto:aeneas@ory.com" target="_blank">aeneas@ory.com</a>
 Please run SQL migrations when applying this patch.
 The following configuration keys were updated:</p>
 
@@ -1595,7 +1606,7 @@ <h2>Breaking Changes</h2>
 
 <li><p>Implement and test domain aliasing (<a href="https://github.com/ory/kratos/commit/1516a54657df485627251de4e7019bc16353c956" target="_blank">1516a54</a>):</p>
 
-<p>This patch adds a feature called domain aliasing. For more information, head over to <a href="http://ory.sh/docs/kratos/next/guides/multi-domain-cookies" target="_blank">http://ory.sh/docs/kratos/next/guides/multi-domain-cookies</a></p></li>
+<p>This patch adds a feature called domain aliasing. For more information, head over to <a href="https://www.ory.com/docs/kratos/guides/multi-domain-cookies" target="_blank">https://www.ory.com/docs/kratos/guides/multi-domain-cookies</a></p></li>
 
 <li><p>Improve oas spec and fix mobile tests (<a href="https://github.com/ory/kratos/commit/4ead2c826a2f1a307e327b9736dd8ac99ef52743" target="_blank">4ead2c8</a>)</p></li>
 
@@ -1642,7 +1653,7 @@ <h2>Breaking Changes</h2>
 
 <p>This feature adds the ability to define web-hooks using a mixture of configuration and JsonNet. This allows integration with services like Mailchimp, Stripe, CRMs, and all other APIs that support REST requests. Additional to these new changes it is now possible to define hooks for verification and recovery as well!</p>
 
-<p>For more information, head over to the <a href="https://www.ory.sh/kratos/docs/self-service/hooks" target="_blank">hooks documentation</a>.</p></li>
+<p>For more information, head over to the <a href="https://www.ory.com/kratos/docs/self-service/hooks" target="_blank">hooks documentation</a>.</p></li>
 
 <li><p><strong>courier:</strong> Allow sending individual messages (<a href="https://github.com/ory/kratos/commit/cbb2c0bef63323a177589e9d2a809c84b4f1acdd" target="_blank">cbb2c0b</a>)</p></li>
 
@@ -1832,7 +1843,6 @@ <h2>Breaking Changes</h2>
   took 486.534204ms with 3 iterations
 Settled on 3 iterations.
 
-
 {
   &quot;memory&quot;: 1048576,
   &quot;iterations&quot;: 3,
@@ -2189,7 +2199,7 @@ <h2>Breaking Changes</h2>
       background-color: #eeeeee;
       margin: 0px auto;
       border-radius: 0;
-      max-width: 600px;
+      max-width: 1200px;
     "
   >
     <table
@@ -2631,7 +2641,7 @@ <h2>Breaking Changes</h2>
       background-color: #171717;
       margin: 0px auto;
       border-radius: 0;
-      max-width: 600px;
+      max-width: 1200px;
     "
   >
     <table
@@ -2717,7 +2727,7 @@ <h2>Breaking Changes</h2>
                             <tr>
                               <td style="width: 80px">
                                 <a
-                                  href="https://www.ory.sh/"
+                                  href="https://www.ory.com/"
                                   target="_blank"
                                 >
                                   <img
@@ -2774,12 +2784,12 @@ <h2>Breaking Changes</h2>
                           "
                               >Copyright © *|CURRENT_YEAR|* *|LIST:COMPANY|*, All rights reserved.<br>*|IFNOT:ARCHIVE_PAGE|* *|LIST:DESCRIPTION|*<br>
                             <br>
-                            You subscribed to this newsletter on <a href="https://www.ory.sh/" target="_blank">www.ory.sh</a>.<br>
+                            You subscribed to this newsletter on <a href="https://www.ory.com/" target="_blank">www.ory.com</a>.<br>
                             <br>
                             Want to change how you receive these emails?<br>
                             You can <a href="*|UPDATE_PROFILE|*">update your preferences</a> or <a href="*|UNSUB|*">unsubscribe from this list</a>.*|END:IF|*<br>
                             <br>*|IF:REWARDS|* *|HTML:REWARDS|* *|END:IF|*</span
-                            > 
+                            >
                           </p>
                           </p>
                           <p style="margin: 0">
@@ -2916,7 +2926,7 @@ <h2>Breaking Changes</h2>
                                         "
                                       >
                                         <a
-                                          href="https://slack.ory.sh/"
+                                          href="https://slack.ory.com/"
                                           target="_blank"
                                         >
                                           <img
@@ -3114,3 +3124,4 @@ <h2>Breaking Changes</h2>
 </div>
 </body>
 </html>
+

cmd/dev/newsletter/draft.go

@@ -164,7 +164,7 @@ func Draft(listID string, segmentID int, tagMessageRaw, changelogRaw []byte, dry
 			Title:        campaignID(),
 			SubjectLine:  fmt.Sprintf("%s %s has been released!", projectName, tag),
 			FromName:     "Ory",
-			ReplyTo:      "office@ory.sh",
+			ReplyTo:      "office@ory.com",
 			Authenticate: true,
 			FbComments:   false,
 			TemplateId:   chimpTemplate.ID,

cmd/dev/newsletter/render_test.go

@@ -10,11 +10,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ory/x/snapshotx"
-
-	"github.com/stretchr/testify/require"
-
+	"github.com/bradleyjkemp/cupaloy/v2"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestRenderMarkdown(t *testing.T) {
@@ -57,6 +55,6 @@ func TestRenderMarkdownLong(t *testing.T) {
 		BrandColor:  "#5528FF",
 	}))
 
-	require.NoError(t, os.WriteFile("stub/changelog.html.tmp", body.Bytes(), 0644))
-	snapshotx.SnapshotT(t, body.String())
+	snapshot := cupaloy.New(cupaloy.SnapshotSubdirectory(".snapshots"), cupaloy.SnapshotFileExtension(".html"))
+	snapshot.SnapshotT(t, body.String())
 }

cmd/dev/newsletter/stub/changelog.md.expected

@@ -240,7 +240,7 @@ Please be also aware that this patch includes SQL migrations which **purge exist
 The configuration value for `hashers.argon2.memory` is now a string representation of the memory amount including the unit of measurement. To convert the value divide your current setting (KB) by 1024 to get a result in MB or 1048576 to get a result in GB. Example: `131072` would now become `128MB`.
 
 Co-authored-by: aeneasr <3372410+aeneasr@users.noreply.github.com>
-Co-authored-by: aeneasr <aeneas@ory.sh>
+Co-authored-by: aeneasr <aeneas@ory.com>
 Please run SQL migrations when applying this patch.
 The following configuration keys were updated:
 
@@ -549,7 +549,7 @@ Please be aware that ORY Kratos might complain about an invalid configuration, b
 * Global docs sidebar ([#1258](https://github.com/ory/kratos/issues/1258)) ([7108262](https://github.com/ory/kratos/commit/71082624e093b8c100e71ae59050f89b35ac20a2))
 * Implement and test domain aliasing ([1516a54](https://github.com/ory/kratos/commit/1516a54657df485627251de4e7019bc16353c956)):
 
-    This patch adds a feature called domain aliasing. For more information, head over to http://ory.sh/docs/kratos/next/guides/multi-domain-cookies
+    This patch adds a feature called domain aliasing. For more information, head over to https://www.ory.com/docs/kratos/guides/multi-domain-cookies
 
 * Improve oas spec and fix mobile tests ([4ead2c8](https://github.com/ory/kratos/commit/4ead2c826a2f1a307e327b9736dd8ac99ef52743))
 * Improve sorting of ui fields ([797b49d](https://github.com/ory/kratos/commit/797b49d0175280f85f568014cf3083e9bc42d354)):
@@ -583,7 +583,7 @@ Please be aware that ORY Kratos might complain about an invalid configuration, b
 
     This feature adds the ability to define web-hooks using a mixture of configuration and JsonNet. This allows integration with services like Mailchimp, Stripe, CRMs, and all other APIs that support REST requests. Additional to these new changes it is now possible to define hooks for verification and recovery as well!
 
-    For more information, head over to the [hooks documentation](https://www.ory.sh/kratos/docs/self-service/hooks).
+    For more information, head over to the [hooks documentation](https://www.ory.com/kratos/docs/self-service/hooks).
 
 * **courier:** Allow sending individual messages ([cbb2c0b](https://github.com/ory/kratos/commit/cbb2c0bef63323a177589e9d2a809c84b4f1acdd))
 * **oidc:** Support google hd claim ([#1097](https://github.com/ory/kratos/issues/1097)) ([1f20a5c](https://github.com/ory/kratos/commit/1f20a5ceba7682719112d24a3b18bf046fb2ac22))
@@ -825,5 +825,3 @@ Please be aware that ORY Kratos might complain about an invalid configuration, b
 * Add tests for csrf behavior ([48993e2](https://github.com/ory/kratos/commit/48993e2c496fb8af7e7b9e2752ba7078a134a75a)), closes [#785](https://github.com/ory/kratos/issues/785)
 * Mark link as enabled in e2e test ([c214b81](https://github.com/ory/kratos/commit/c214b81a7026b06aaca062b2aa77951d01b0e237))
 * Resolve schema test regression ([bb7af1b](https://github.com/ory/kratos/commit/bb7af1b759d6c812755956ef872bcbd31b9c50be))
-
-

go.mod

@@ -7,6 +7,7 @@ replace github.com/gorilla/sessions => github.com/ory/sessions v1.2.2-0.20220110
 require (
 	dario.cat/mergo v1.0.2
 	github.com/Masterminds/semver/v3 v3.5.0
+	github.com/bradleyjkemp/cupaloy/v2 v2.8.0
 	github.com/evanphx/json-patch v5.9.0+incompatible
 	github.com/getkin/kin-openapi v0.131.0
 	github.com/ghodss/yaml v1.0.0
@@ -58,7 +59,6 @@ require (
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/boombuler/barcode v1.1.0 // indirect
-	github.com/bradleyjkemp/cupaloy/v2 v2.8.0 // indirect
 	github.com/bwmarrin/discordgo v0.29.0 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff/v3 v3.2.2 // indirect