chore: regenerate and format

ory · Jul 8, 2021 · 65f2583 · 65f2583
1 parent 5e9089f
commit 65f2583
Show file tree

Hide file tree

Showing 13 changed files with 3,980 additions and 9 deletions.
diff --git a/docs/docs/.static/api.json b/docs/docs/.static/api.json
diff --git a/docs/docs/self-service/flows/code/login/index.js b/docs/docs/self-service/flows/code/login/index.js
@@ -61,7 +61,7 @@ export const initApiFlow = {
   go: {
     label: 'Go',
     language: 'go',
-    code: require('raw-loader!../../../../../../examples/go/selfserviceinit/login/main.go')
+    code: require('raw-loader!../../../../../../examples/go/selfservice/login/main.go')
       .default
   }
 }

diff --git a/docs/docs/self-service/flows/code/logout/index.js b/docs/docs/self-service/flows/code/logout/index.js
@@ -7,7 +7,7 @@ export const apiFlow = {
   go: {
     label: 'Go',
     language: 'go',
-    code: require('raw-loader!../../../../../../examples/go/selfservicesubmit/logout/main.go')
+    code: require('raw-loader!../../../../../../examples/go/selfservice/logout/main.go')
       .default
   }
 }

diff --git a/docs/docs/self-service/flows/code/recovery/index.js b/docs/docs/self-service/flows/code/recovery/index.js
@@ -61,7 +61,7 @@ export const initApiFlow = {
   go: {
     label: 'Go',
     language: 'go',
-    code: require('raw-loader!../../../../../../examples/go/selfserviceinit/recovery/main.go')
+    code: require('raw-loader!../../../../../../examples/go/selfservice/recovery/main.go')
       .default
   }
 }

diff --git a/docs/docs/self-service/flows/code/registration/index.js b/docs/docs/self-service/flows/code/registration/index.js
@@ -61,7 +61,7 @@ export const initApiFlow = {
   go: {
     label: 'Go',
     language: 'go',
-    code: require('raw-loader!../../../../../../examples/go/selfserviceinit/registration/main.go')
+    code: require('raw-loader!../../../../../../examples/go/selfservice/registration/main.go')
       .default
   }
 }

diff --git a/docs/docs/self-service/flows/code/settings/index.js b/docs/docs/self-service/flows/code/settings/index.js
@@ -69,7 +69,7 @@ export const initApiFlow = {
   go: {
     label: 'Go',
     language: 'go',
-    code: require('raw-loader!../../../../../../examples/go/selfserviceinit/settings/main.go')
+    code: require('raw-loader!../../../../../../examples/go/selfservice/settings/main.go')
       .default
   },
   curlUnauth: {

diff --git a/docs/docs/self-service/flows/code/verification/index.js b/docs/docs/self-service/flows/code/verification/index.js
@@ -61,7 +61,7 @@ export const initApiFlow = {
   go: {
     label: 'Go',
     language: 'go',
-    code: require('raw-loader!../../../../../../examples/go/selfserviceinit/verification/main.go')
+    code: require('raw-loader!../../../../../../examples/go/selfservice/verification/main.go')
       .default
   }
 }

diff --git a/schema/handler.go b/schema/handler.go
@@ -7,6 +7,8 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/ory/kratos/driver/config"
+
 	"github.com/julienschmidt/httprouter"
 	"github.com/pkg/errors"
 
@@ -20,6 +22,8 @@ type (
 		x.WriterProvider
 		x.LoggingProvider
 		IdentityTraitsProvider
+		x.CSRFProvider
+		config.Provider
 	}
 	Handler struct {
 		r handlerDependencies
@@ -36,11 +40,12 @@ func NewHandler(r handlerDependencies) *Handler {
 const SchemasPath string = "schemas"
 
 func (h *Handler) RegisterPublicRoutes(public *x.RouterPublic) {
+	h.r.CSRFHandler().IgnoreGlobs(fmt.Sprintf("/%s/*", SchemasPath))
 	public.GET(fmt.Sprintf("/%s/:id", SchemasPath), h.get)
 }
 
 func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) {
-	admin.GET(fmt.Sprintf("/%s/:id", SchemasPath), h.get)
+	admin.GET(fmt.Sprintf("/%s/:id", SchemasPath), x.RedirectToPublicRoute(h.r))
 }
 
 // Raw JSON Schema

diff --git a/selfservice/flow/recovery/handler.go b/selfservice/flow/recovery/handler.go
@@ -83,6 +83,11 @@ func (h *Handler) RegisterPublicRoutes(public *x.RouterPublic) {
 }
 
 func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) {
+	admin.GET(RouteInitBrowserFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteInitAPIFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteGetFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteSubmitFlow, x.RedirectToPublicRoute(h.d))
+	admin.POST(RouteSubmitFlow, x.RedirectToPublicRoute(h.d))
 }
 
 // swagger:route GET /self-service/recovery/api v0alpha1 initializeSelfServiceRecoveryFlowWithoutBrowser

diff --git a/selfservice/flow/registration/handler.go b/selfservice/flow/registration/handler.go
@@ -81,7 +81,13 @@ func (h *Handler) onAuthenticated(w http.ResponseWriter, r *http.Request, ps htt
 	handler(w, r, ps)
 }
 
-func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) {}
+func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) {
+	admin.GET(RouteInitBrowserFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteInitAPIFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteGetFlow, x.RedirectToPublicRoute(h.d))
+	admin.POST(RouteSubmitFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteSubmitFlow, x.RedirectToPublicRoute(h.d))
+}
 
 func (h *Handler) NewRegistrationFlow(w http.ResponseWriter, r *http.Request, ft flow.Type) (*Flow, error) {
 	f := NewFlow(h.d.Config(r.Context()), h.d.Config(r.Context()).SelfServiceFlowRegistrationRequestLifespan(), h.d.GenerateCSRFToken(r), r, ft)

diff --git a/selfservice/flow/settings/handler.go b/selfservice/flow/settings/handler.go
@@ -96,6 +96,13 @@ func (h *Handler) RegisterPublicRoutes(public *x.RouterPublic) {
 }
 
 func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) {
+	admin.GET(RouteInitBrowserFlow, x.RedirectToPublicRoute(h.d))
+
+	admin.GET(RouteInitAPIFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteGetFlow, x.RedirectToPublicRoute(h.d))
+
+	admin.POST(RouteSubmitFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteSubmitFlow, x.RedirectToPublicRoute(h.d))
 }
 
 func (h *Handler) NewFlow(w http.ResponseWriter, r *http.Request, i *identity.Identity, ft flow.Type) (*Flow, error) {

diff --git a/selfservice/flow/verification/handler.go b/selfservice/flow/verification/handler.go
@@ -71,7 +71,14 @@ func (h *Handler) RegisterPublicRoutes(public *x.RouterPublic) {
 	public.GET(RouteSubmitFlow, h.submitFlow)
 }
 
-func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) {}
+func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) {
+	admin.GET(RouteInitBrowserFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteInitAPIFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteGetFlow, x.RedirectToPublicRoute(h.d))
+
+	admin.POST(RouteSubmitFlow, x.RedirectToPublicRoute(h.d))
+	admin.GET(RouteSubmitFlow, x.RedirectToPublicRoute(h.d))
+}
 
 // swagger:route GET /self-service/verification/api v0alpha1 initializeSelfServiceVerificationFlowWithoutBrowser
 //

diff --git a/selfservice/strategy/link/strategy_recovery.go b/selfservice/strategy/link/strategy_recovery.go
@@ -34,6 +34,9 @@ func (s *Strategy) RecoveryStrategyID() string {
 }
 
 func (s *Strategy) RegisterPublicRecoveryRoutes(public *x.RouterPublic) {
+	s.d.CSRFHandler().IgnorePath(RouteAdminCreateRecoveryLink)
+	public.POST(RouteAdminCreateRecoveryLink, x.RedirectToAdminRoute(s.d))
+
 }
 
 func (s *Strategy) RegisterAdminRecoveryRoutes(admin *x.RouterAdmin) {