mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-06 05:22:13 +00:00
fix: join on instanceIDs in queries (#4612)
This commit is contained in:
Livio Spring
@@ -14,6 +14,121 @@ import (
|
||||
errs "github.com/zitadel/zitadel/internal/errors"
|
||||
)
|
||||
|
||||
var (
|
||||
idpQuery = `SELECT projections.idps2.id,` +
|
||||
` projections.idps2.resource_owner,` +
|
||||
` projections.idps2.creation_date,` +
|
||||
` projections.idps2.change_date,` +
|
||||
` projections.idps2.sequence,` +
|
||||
` projections.idps2.state,` +
|
||||
` projections.idps2.name,` +
|
||||
` projections.idps2.styling_type,` +
|
||||
` projections.idps2.owner_type,` +
|
||||
` projections.idps2.auto_register,` +
|
||||
` projections.idps2_oidc_config.idp_id,` +
|
||||
` projections.idps2_oidc_config.client_id,` +
|
||||
` projections.idps2_oidc_config.client_secret,` +
|
||||
` projections.idps2_oidc_config.issuer,` +
|
||||
` projections.idps2_oidc_config.scopes,` +
|
||||
` projections.idps2_oidc_config.display_name_mapping,` +
|
||||
` projections.idps2_oidc_config.username_mapping,` +
|
||||
` projections.idps2_oidc_config.authorization_endpoint,` +
|
||||
` projections.idps2_oidc_config.token_endpoint,` +
|
||||
` projections.idps2_jwt_config.idp_id,` +
|
||||
` projections.idps2_jwt_config.issuer,` +
|
||||
` projections.idps2_jwt_config.keys_endpoint,` +
|
||||
` projections.idps2_jwt_config.header_name,` +
|
||||
` projections.idps2_jwt_config.endpoint` +
|
||||
` FROM projections.idps2` +
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id AND projections.idps2.instance_id = projections.idps2_oidc_config.instance_id` +
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id AND projections.idps2.instance_id = projections.idps2_jwt_config.instance_id`
|
||||
idpCols = []string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
// jwt config
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
}
|
||||
idpsQuery = `SELECT projections.idps2.id,` +
|
||||
` projections.idps2.resource_owner,` +
|
||||
` projections.idps2.creation_date,` +
|
||||
` projections.idps2.change_date,` +
|
||||
` projections.idps2.sequence,` +
|
||||
` projections.idps2.state,` +
|
||||
` projections.idps2.name,` +
|
||||
` projections.idps2.styling_type,` +
|
||||
` projections.idps2.owner_type,` +
|
||||
` projections.idps2.auto_register,` +
|
||||
` projections.idps2_oidc_config.idp_id,` +
|
||||
` projections.idps2_oidc_config.client_id,` +
|
||||
` projections.idps2_oidc_config.client_secret,` +
|
||||
` projections.idps2_oidc_config.issuer,` +
|
||||
` projections.idps2_oidc_config.scopes,` +
|
||||
` projections.idps2_oidc_config.display_name_mapping,` +
|
||||
` projections.idps2_oidc_config.username_mapping,` +
|
||||
` projections.idps2_oidc_config.authorization_endpoint,` +
|
||||
` projections.idps2_oidc_config.token_endpoint,` +
|
||||
` projections.idps2_jwt_config.idp_id,` +
|
||||
` projections.idps2_jwt_config.issuer,` +
|
||||
` projections.idps2_jwt_config.keys_endpoint,` +
|
||||
` projections.idps2_jwt_config.header_name,` +
|
||||
` projections.idps2_jwt_config.endpoint,` +
|
||||
` COUNT(*) OVER ()` +
|
||||
` FROM projections.idps2` +
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id AND projections.idps2.instance_id = projections.idps2_oidc_config.instance_id` +
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id AND projections.idps2.instance_id = projections.idps2_jwt_config.instance_id`
|
||||
idpsCols = []string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
// jwt config
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
"count",
|
||||
}
|
||||
)
|
||||
|
||||
func Test_IDPPrepares(t *testing.T) {
|
||||
type want struct {
|
||||
sqlExpectations sqlExpectation
|
||||
@@ -30,33 +145,7 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPByIDQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
regexp.QuoteMeta(idpQuery),
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
@@ -74,61 +163,8 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPByIDQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
[]string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
// jwt config
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
},
|
||||
regexp.QuoteMeta(idpQuery),
|
||||
idpCols,
|
||||
[]driver.Value{
|
||||
"idp-id",
|
||||
"ro",
|
||||
@@ -188,61 +224,8 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPByIDQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
[]string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
// jwt config
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
},
|
||||
regexp.QuoteMeta(idpQuery),
|
||||
idpCols,
|
||||
[]driver.Value{
|
||||
"idp-id",
|
||||
"ro",
|
||||
@@ -298,61 +281,8 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPByIDQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
[]string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
// jwt config
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
},
|
||||
regexp.QuoteMeta(idpQuery),
|
||||
idpCols,
|
||||
[]driver.Value{
|
||||
"idp-id",
|
||||
"ro",
|
||||
@@ -401,33 +331,7 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPByIDQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
regexp.QuoteMeta(idpQuery),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
@@ -444,34 +348,7 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
regexp.QuoteMeta(idpsQuery),
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
@@ -489,63 +366,8 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
[]string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
// jwt config
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
"count",
|
||||
},
|
||||
regexp.QuoteMeta(idpsQuery),
|
||||
idpsCols,
|
||||
[][]driver.Value{
|
||||
{
|
||||
"idp-id",
|
||||
@@ -614,62 +436,8 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
[]string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
"count",
|
||||
},
|
||||
regexp.QuoteMeta(idpsQuery),
|
||||
idpsCols,
|
||||
[][]driver.Value{
|
||||
{
|
||||
"idp-id",
|
||||
@@ -734,62 +502,8 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
[]string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
"count",
|
||||
},
|
||||
regexp.QuoteMeta(idpsQuery),
|
||||
idpsCols,
|
||||
[][]driver.Value{
|
||||
{
|
||||
"idp-id",
|
||||
@@ -847,62 +561,8 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
[]string{
|
||||
"id",
|
||||
"resource_owner",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"state",
|
||||
"name",
|
||||
"styling_type",
|
||||
"owner_type",
|
||||
"auto_register",
|
||||
// oidc config
|
||||
"idp_id",
|
||||
"client_id",
|
||||
"client_secret",
|
||||
"issuer",
|
||||
"scopes",
|
||||
"display_name_mapping",
|
||||
"username_mapping",
|
||||
"authorization_endpoint",
|
||||
"token_endpoint",
|
||||
"idp_id",
|
||||
"issuer",
|
||||
"keys_endpoint",
|
||||
"header_name",
|
||||
"endpoint",
|
||||
"count",
|
||||
},
|
||||
regexp.QuoteMeta(idpsQuery),
|
||||
idpsCols,
|
||||
[][]driver.Value{
|
||||
{
|
||||
"idp-id-1",
|
||||
@@ -1058,34 +718,7 @@ func Test_IDPPrepares(t *testing.T) {
|
||||
prepare: prepareIDPsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT projections.idps2.id,`+
|
||||
` projections.idps2.resource_owner,`+
|
||||
` projections.idps2.creation_date,`+
|
||||
` projections.idps2.change_date,`+
|
||||
` projections.idps2.sequence,`+
|
||||
` projections.idps2.state,`+
|
||||
` projections.idps2.name,`+
|
||||
` projections.idps2.styling_type,`+
|
||||
` projections.idps2.owner_type,`+
|
||||
` projections.idps2.auto_register,`+
|
||||
` projections.idps2_oidc_config.idp_id,`+
|
||||
` projections.idps2_oidc_config.client_id,`+
|
||||
` projections.idps2_oidc_config.client_secret,`+
|
||||
` projections.idps2_oidc_config.issuer,`+
|
||||
` projections.idps2_oidc_config.scopes,`+
|
||||
` projections.idps2_oidc_config.display_name_mapping,`+
|
||||
` projections.idps2_oidc_config.username_mapping,`+
|
||||
` projections.idps2_oidc_config.authorization_endpoint,`+
|
||||
` projections.idps2_oidc_config.token_endpoint,`+
|
||||
` projections.idps2_jwt_config.idp_id,`+
|
||||
` projections.idps2_jwt_config.issuer,`+
|
||||
` projections.idps2_jwt_config.keys_endpoint,`+
|
||||
` projections.idps2_jwt_config.header_name,`+
|
||||
` projections.idps2_jwt_config.endpoint,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM projections.idps2`+
|
||||
` LEFT JOIN projections.idps2_oidc_config ON projections.idps2.id = projections.idps2_oidc_config.idp_id`+
|
||||
` LEFT JOIN projections.idps2_jwt_config ON projections.idps2.id = projections.idps2_jwt_config.idp_id`),
|
||||
regexp.QuoteMeta(idpsQuery),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
|
||||
Reference in New Issue
Block a user