fix: remove obsolete types (#887)

Closes #716
ory · Dec 8, 2020 · b8bac7a · b8bac7a
1 parent 105181d
commit b8bac7a
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 35 deletions.
diff --git a/selfservice/flow/login/flow.go b/selfservice/flow/login/flow.go
@@ -72,7 +72,7 @@ type Flow struct {
 	Methods map[identity.CredentialsType]*FlowMethod `json:"methods" faker:"login_flow_methods" db:"-"`
 
 	// MethodsRaw is a helper struct field for gobuffalo.pop.
-	MethodsRaw FlowMethodsSlice `json:"-" faker:"-" has_many:"selfservice_login_flow_methods" fk_id:"selfservice_login_flow_id"`
+	MethodsRaw []FlowMethod `json:"-" faker:"-" has_many:"selfservice_login_flow_methods" fk_id:"selfservice_login_flow_id"`
 
 	// CreatedAt is a helper struct field for gobuffalo.pop.
 	CreatedAt time.Time `json:"-" db:"created_at"`

diff --git a/selfservice/flow/login/flow_method.go b/selfservice/flow/login/flow_method.go
@@ -45,14 +45,8 @@ func (u FlowMethod) TableName() string {
 	return "selfservice_login_flow_methods"
 }
 
-type FlowMethodsSlice []FlowMethod // workaround for https://github.com/gobuffalo/pop/pull/478
 type FlowMethods map[identity.CredentialsType]*FlowMethod
 
-func (u FlowMethodsSlice) TableName() string {
-	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
-	return "selfservice_login_flow_methods"
-}
-
 func (u FlowMethods) TableName() string {
 	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
 	return "selfservice_login_flow_methods"

diff --git a/selfservice/flow/recovery/flow.go b/selfservice/flow/recovery/flow.go
@@ -72,7 +72,7 @@ type Flow struct {
 	Methods map[string]*FlowMethod `json:"methods" faker:"recovery_flow_methods" db:"-"`
 
 	// MethodsRaw is a helper struct field for gobuffalo.pop.
-	MethodsRaw FlowMethodsRaw `json:"-" faker:"-" has_many:"selfservice_recovery_flow_methods" fk_id:"selfservice_recovery_flow_id"`
+	MethodsRaw []FlowMethod `json:"-" faker:"-" has_many:"selfservice_recovery_flow_methods" fk_id:"selfservice_recovery_flow_id"`
 
 	// State represents the state of this request:
 	//

diff --git a/selfservice/flow/recovery/flow_method.go b/selfservice/flow/recovery/flow_method.go
@@ -44,19 +44,13 @@ func (u FlowMethod) TableName() string {
 	return "selfservice_recovery_flow_methods"
 }
 
-type FlowMethodsRaw []FlowMethod // workaround for https://github.com/gobuffalo/pop/pull/478
 type FlowMethods map[string]*FlowMethod
 
 func (u FlowMethods) TableName() string {
 	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
 	return "selfservice_recovery_flow_methods"
 }
 
-func (u FlowMethodsRaw) TableName() string {
-	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
-	return "selfservice_recovery_flow_methods"
-}
-
 // swagger:ignore
 type FlowMethodConfigurator interface {
 	form.ErrorParser

diff --git a/selfservice/flow/registration/flow.go b/selfservice/flow/registration/flow.go
@@ -62,7 +62,7 @@ type Flow struct {
 	Methods map[identity.CredentialsType]*FlowMethod `json:"methods" faker:"registration_flow_methods" db:"-"`
 
 	// MethodsRaw is a helper struct field for gobuffalo.pop.
-	MethodsRaw FlowMethodsRaw `json:"-" faker:"-" has_many:"selfservice_registration_flow_methods" fk_id:"selfservice_registration_flow_id"`
+	MethodsRaw []FlowMethod `json:"-" faker:"-" has_many:"selfservice_registration_flow_methods" fk_id:"selfservice_registration_flow_id"`
 
 	// CreatedAt is a helper struct field for gobuffalo.pop.
 	CreatedAt time.Time `json:"-" faker:"-" db:"created_at"`

diff --git a/selfservice/flow/registration/flow_method.go b/selfservice/flow/registration/flow_method.go
@@ -45,19 +45,13 @@ func (u FlowMethod) TableName() string {
 	return "selfservice_registration_flow_methods"
 }
 
-type FlowMethodsRaw []FlowMethod // workaround for https://github.com/gobuffalo/pop/pull/478
 type FlowMethods map[identity.CredentialsType]*FlowMethod
 
 func (u FlowMethods) TableName() string {
 	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
 	return "selfservice_registration_flow_methods"
 }
 
-func (u FlowMethodsRaw) TableName() string {
-	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
-	return "selfservice_registration_flow_methods"
-}
-
 // swagger:ignore
 type FlowMethodConfigurator interface {
 	form.ErrorParser

diff --git a/selfservice/flow/settings/flow.go b/selfservice/flow/settings/flow.go
@@ -76,7 +76,7 @@ type Flow struct {
 	Methods map[string]*FlowMethod `json:"methods" faker:"settings_flow_methods" db:"-"`
 
 	// MethodsRaw is a helper struct field for gobuffalo.pop.
-	MethodsRaw FlowMethodsRaw `json:"-" faker:"-" has_many:"selfservice_settings_flow_methods" fk_id:"selfservice_settings_flow_id"`
+	MethodsRaw []FlowMethod `json:"-" faker:"-" has_many:"selfservice_settings_flow_methods" fk_id:"selfservice_settings_flow_id"`
 
 	// Identity contains all of the identity's data in raw form.
 	//

diff --git a/selfservice/flow/settings/flow_method.go b/selfservice/flow/settings/flow_method.go
@@ -44,19 +44,13 @@ func (u FlowMethod) TableName() string {
 	return "selfservice_settings_flow_methods"
 }
 
-type FlowMethodsRaw []FlowMethod // workaround for https://github.com/gobuffalo/pop/pull/478
 type FlowMethods map[string]*FlowMethod
 
 func (u FlowMethods) TableName() string {
 	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
 	return "selfservice_settings_flow_methods"
 }
 
-func (u FlowMethodsRaw) TableName() string {
-	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
-	return "selfservice_settings_flow_methods"
-}
-
 // swagger:ignore
 type FlowMethodConfigurator interface {
 	form.ErrorParser

diff --git a/selfservice/flow/verification/flow.go b/selfservice/flow/verification/flow.go
@@ -65,7 +65,7 @@ type Flow struct {
 	Methods map[string]*FlowMethod `json:"methods" faker:"verification_flow_methods" db:"-"`
 
 	// MethodsRaw is a helper struct field for gobuffalo.pop.
-	MethodsRaw FlowMethodsRaw `json:"-" faker:"-" has_many:"selfservice_verification_flow_methods" fk_id:"selfservice_verification_flow_id"`
+	MethodsRaw []FlowMethod `json:"-" faker:"-" has_many:"selfservice_verification_flow_methods" fk_id:"selfservice_verification_flow_id"`
 
 	// State represents the state of this request:
 	//

diff --git a/selfservice/flow/verification/flow_method.go b/selfservice/flow/verification/flow_method.go
@@ -44,19 +44,13 @@ func (u FlowMethod) TableName() string {
 	return "selfservice_verification_flow_methods"
 }
 
-type FlowMethodsRaw []FlowMethod // workaround for https://github.com/gobuffalo/pop/pull/478
 type FlowMethods map[string]*FlowMethod
 
 func (u FlowMethods) TableName() string {
 	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
 	return "selfservice_verification_flow_methods"
 }
 
-func (u FlowMethodsRaw) TableName() string {
-	// This must be stay a value receiver, using a pointer receiver will cause issues with pop.
-	return "selfservice_verification_flow_methods"
-}
-
 // swagger:ignore
 type FlowMethodConfigurator interface {
 	form.ErrorParser