Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: enable b2b_sso hook in more places #4168

Merged
merged 9 commits into from
Oct 29, 2024
Merged

fix: enable b2b_sso hook in more places #4168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0e09ca5
fix: enable b2b_sso hook in more places
hperl Oct 23, 2024
c1940c1
allow b2b hook in settings after
hperl Oct 24, 2024
a76b374
increase coverage
hperl Oct 24, 2024
f3c6dbb
revert OrgID in duplicate credentials data
hperl Oct 24, 2024
9366bd8
Revert "revert OrgID in duplicate credentials data"
hperl Oct 24, 2024
da73ad0
fix: passing org ID in linking flows
hperl Oct 25, 2024
2dd3d5d
test coverage
hperl Oct 25, 2024
b26ed21
Merge remote-tracking branch 'origin/master' into hperl/allow-b2b_sso…
zepatrik Oct 29, 2024
7dedd77
Merge branch 'master' into hperl/allow-b2b_sso-hook-in-more-places
hperl Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions embedx/config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,9 @@
"anyOf": [
{
"$ref": "#/definitions/selfServiceWebHook"
},
{
"$ref": "#/definitions/b2bSSOHook"
}
]
},
Expand Down Expand Up @@ -766,6 +769,9 @@
},
{
"$ref": "#/definitions/selfServiceShowVerificationUIHook"
},
{
"$ref": "#/definitions/b2bSSOHook"
}
]
},
Expand Down
2 changes: 2 additions & 0 deletions selfservice/flow/duplicate_credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package flow
import (
"encoding/json"

"github.com/gofrs/uuid"
"github.com/tidwall/gjson"
"github.com/tidwall/sjson"

Expand All @@ -19,6 +20,7 @@ type DuplicateCredentialsData struct {
CredentialsType identity.CredentialsType
CredentialsConfig sqlxx.JSONRawMessage
DuplicateIdentifier string
OrganizationID uuid.UUID
}

type InternalContexter interface {
Expand Down
2 changes: 2 additions & 0 deletions selfservice/flow/login/flow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/ory/x/jsonx"
"github.com/ory/x/sqlxx"
"github.com/ory/x/uuidx"

"github.com/ory/kratos/driver/config"
"github.com/ory/kratos/identity"
Expand Down Expand Up @@ -224,6 +225,7 @@ func TestDuplicateCredentials(t *testing.T) {
CredentialsType: "foo",
CredentialsConfig: sqlxx.JSONRawMessage(`{"bar":"baz"}`),
DuplicateIdentifier: "bar",
OrganizationID: uuidx.NewV4(),
}

require.NoError(t, flow.SetDuplicateCredentials(f, dc))
Expand Down
3 changes: 3 additions & 0 deletions selfservice/flow/registration/hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ func (e *HookExecutor) PostRegistrationHook(w http.ResponseWriter, r *http.Reque
CredentialsConfig: i.Credentials[ct].Config,
DuplicateIdentifier: duplicateIdentifier,
}
if registrationFlow.OrganizationID.Valid {
registrationDuplicateCredentials.OrganizationID = registrationFlow.OrganizationID.UUID
}

if err := flow.SetDuplicateCredentials(registrationFlow, registrationDuplicateCredentials); err != nil {
return err
Expand Down
1 change: 1 addition & 0 deletions selfservice/strategy/oidc/strategy_registration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ func (s *Strategy) registrationToLogin(ctx context.Context, w http.ResponseWrite
}
lf.TransientPayload = rf.TransientPayload
lf.Active = s.ID()
lf.OrganizationID = rf.OrganizationID

return lf, nil
}
Expand Down
5 changes: 5 additions & 0 deletions selfservice/strategy/oidc/strategy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

"github.com/ory/kratos/selfservice/hook/hooktest"
"github.com/ory/x/sqlxx"
"github.com/ory/x/uuidx"

"github.com/ory/kratos/hydra"
"github.com/ory/kratos/selfservice/sessiontokenexchange"
Expand Down Expand Up @@ -1531,6 +1532,7 @@ func TestStrategy(t *testing.T) {
subject2 := "new-login-subject2@ory.sh"
scope = []string{"openid"}
password := "lwkj52sdkjf"
orgID := uuidx.NewV4()

var i *identity.Identity
t.Run("step=create password identity", func(t *testing.T) {
Expand All @@ -1555,6 +1557,8 @@ func TestStrategy(t *testing.T) {

client := testhelpers.NewClientWithCookieJar(t, nil, nil)
loginFlow := newLoginFlow(t, returnTS.URL, time.Minute, flow.TypeBrowser)
loginFlow.OrganizationID = uuid.NullUUID{orgID, true}
require.NoError(t, reg.LoginFlowPersister().UpdateLoginFlow(context.Background(), loginFlow))

var linkingLoginFlow struct {
ID string
Expand All @@ -1572,6 +1576,7 @@ func TestStrategy(t *testing.T) {
assert.True(t, gjson.GetBytes(body, "ui.nodes.#(attributes.name==identifier)").Exists(), "%s", body)
assert.True(t, gjson.GetBytes(body, "ui.nodes.#(attributes.name==password)").Exists(), "%s", body)
assert.Equal(t, "new-login-if-email-exist-with-password-strategy@ory.sh", gjson.GetBytes(body, "ui.messages.#(id==1010016).context.duplicateIdentifier").String())
assert.Equal(t, gjson.GetBytes(body, "organization_id").String(), orgID.String())
linkingLoginFlow.ID = gjson.GetBytes(body, "id").String()
linkingLoginFlow.UIAction = gjson.GetBytes(body, "ui.action").String()
linkingLoginFlow.CSRFToken = gjson.GetBytes(body, `ui.nodes.#(attributes.name=="csrf_token").attributes.value`).String()
Expand Down
Loading