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.

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

feat: allow partially failing batch inserts #4083

Merged
merged 27 commits into from
Sep 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4808d9c
feat: partial failures for batch import
hperl Sep 9, 2024
03b6534
chore: regenerate sdk
hperl Sep 9, 2024
db8c7a4
Merge branch 'master' into hperl/improve-batch-patch-identities-error…
hperl Sep 10, 2024
2b7e3e9
fix: implement Unwrap() on partial create error
hperl Sep 10, 2024
e2b7831
bump upload action
hperl Sep 10, 2024
01f199d
fix tests
hperl Sep 10, 2024
447c5d6
fix: mysql
hperl Sep 10, 2024
cec29ca
fix tests
hperl Sep 10, 2024
badcd6e
fix: uploading
hperl Sep 10, 2024
6fec60d
fix: wrapping
hperl Sep 10, 2024
04b302c
fix artifact upload names
hperl Sep 10, 2024
0ed2ed1
test: fix lookup E2E test
hperl Sep 11, 2024
03c127c
test: always use www.example.org as return_to URL in tests
hperl Sep 11, 2024
166302d
Merge branch 'master' into hperl/improve-batch-patch-identities-error…
zepatrik Sep 11, 2024
a2842a0
code review
hperl Sep 12, 2024
50b21ed
code review
hperl Sep 12, 2024
17ed6fe
fix test
hperl Sep 12, 2024
e491329
add batch persister test
hperl Sep 13, 2024
8a892c9
Merge remote-tracking branch 'origin/master' into hperl/improve-batch…
hperl Sep 13, 2024
3777ccf
chore: format
hperl Sep 13, 2024
9484feb
only use partial inserts on batch inserts
hperl Sep 16, 2024
afd8d6a
Merge remote-tracking branch 'origin/master' into hperl/improve-batch…
hperl Sep 16, 2024
b593fc6
code review
hperl Sep 17, 2024
99a010c
fix: usage of rows.Err and rows.Close
hperl Sep 17, 2024
efa05f6
code review
hperl Sep 17, 2024
910c590
Merge remote-tracking branch 'origin/master' into hperl/improve-batch…
hperl Sep 17, 2024
0fc3029
Merge branch 'master' into hperl/improve-batch-patch-identities-error…
hperl Sep 17, 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
Prev Previous commit
Next Next commit
test: always use www.example.org as return_to URL in tests
hperl committed Sep 11, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 03c127c7427f417f23a3f7309d83440fa2df89e8
Original file line number Diff line number Diff line change
@@ -75,12 +75,12 @@ context("Testing logout flows", () => {

cy.visit(settings, {
qs: {
return_to: "https://www.ory.sh",
return_to: "https://www.example.org",
},
})

cy.get("a[href*='logout']").click()
cy.location("host").should("eq", "www.ory.sh")
cy.location("host").should("eq", "www.example.org")
})

it("should be able to sign out on welcome page", () => {
@@ -94,12 +94,12 @@ context("Testing logout flows", () => {

cy.visit(welcome, {
qs: {
return_to: "https://www.ory.sh",
return_to: "https://www.example.org",
},
})

cy.get("a[href*='logout']").click()
cy.location("host").should("eq", "www.ory.sh")
cy.location("host").should("eq", "www.example.org")
})

it("should be able to sign out at 2fa page", () => {
@@ -122,7 +122,7 @@ context("Testing logout flows", () => {
cy.logout()
cy.visit(route, {
qs: {
return_to: "https://www.ory.sh",
return_to: "https://www.example.org",
},
})

@@ -135,7 +135,7 @@ context("Testing logout flows", () => {

cy.get("a[href*='logout']").click()

cy.location("host").should("eq", "www.ory.sh")
cy.location("host").should("eq", "www.example.org")
cy.useLookupSecrets(false)
})
})
Original file line number Diff line number Diff line change
@@ -194,9 +194,9 @@ context("Social Sign Up Successes", () => {
app,
email,
website,
route: registration + "?return_to=https://www.ory.sh/",
route: registration + "?return_to=https://www.example.org/",
})
cy.location("href").should("eq", "https://www.ory.sh/")
cy.location("href").should("eq", "https://www.example.org/")
cy.logout()
})

Original file line number Diff line number Diff line change
@@ -180,7 +180,7 @@ context("Account Recovery With Code Success", () => {

const identity = gen.identityWithWebsite()
cy.registerApi(identity)
cy.visit(express.recovery + "?return_to=https://www.ory.sh/")
cy.visit(express.recovery + "?return_to=https://www.example.org/")
cy.get("input[name='email']").type(identity.email)
cy.get("button[value='code']").click()
cy.get('[data-testid="ui/message/1060003"]').should(
@@ -196,6 +196,6 @@ context("Account Recovery With Code Success", () => {

cy.get('input[name="password"]').clear().type(gen.password())
cy.get('button[value="password"]').click()
cy.url().should("eq", "https://www.ory.sh/")
cy.url().should("eq", "https://www.example.org/")
})
})
Original file line number Diff line number Diff line change
@@ -109,7 +109,10 @@ context("Account Recovery Success", () => {
const identity = gen.identityWithWebsite()
cy.registerApi(identity)

cy.recoverApi({ email: identity.email, returnTo: "https://www.ory.sh/" })
cy.recoverApi({
email: identity.email,
returnTo: "https://www.example.org/",
})

cy.recoverEmail({ expect: identity })

@@ -120,7 +123,7 @@ context("Account Recovery Success", () => {
.clear()
.type(gen.password())
cy.get('button[value="password"]').click()
cy.url().should("eq", "https://www.ory.sh/")
cy.url().should("eq", "https://www.example.org/")
})

it("should recover even if already logged into another account", () => {
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ context("Recovery with `return_to`", () => {
}

it("should return to the `return_to` url after successful account recovery and settings update", () => {
cy.visit(recovery + "?return_to=https://www.ory.sh/")
cy.visit(recovery + "?return_to=https://www.example.org/")
doRecovery()

cy.get('[data-testid="ui/message/1060001"]', { timeout: 30000 }).should(
@@ -80,7 +80,7 @@ context("Recovery with `return_to`", () => {
.type(newPassword)
cy.get('button[value="password"]').click()

cy.location("hostname").should("eq", "www.ory.sh")
cy.location("hostname").should("eq", "www.example.org")
})

it("should return to the `return_to` url even with mfa enabled after successful account recovery and settings update", () => {
@@ -108,7 +108,7 @@ context("Recovery with `return_to`", () => {
cy.logout()
cy.clearAllCookies()

cy.visit(recovery + "?return_to=https://www.ory.sh/")
cy.visit(recovery + "?return_to=https://www.example.org/")
doRecovery()

cy.shouldShow2FAScreen()
@@ -122,7 +122,7 @@ context("Recovery with `return_to`", () => {
.clear()
.type(newPassword)
cy.get('button[value="password"]').click()
cy.location("hostname").should("eq", "www.ory.sh")
cy.location("hostname").should("eq", "www.example.org")
})
})
})
Original file line number Diff line number Diff line change
@@ -194,9 +194,9 @@ context("Social Sign Up Successes", () => {
app,
email,
website,
route: registration + "?return_to=https://www.ory.sh/",
route: registration + "?return_to=https://www.example.org/",
})
cy.location("href").should("eq", "https://www.ory.sh/")
cy.location("href").should("eq", "https://www.example.org/")
cy.logout()
})

Loading