feat: Make admin recovery to work without emails #1419

docs/docs/.static/api.json

@@ -2258,7 +2258,7 @@
     },
     "/recovery/link": {
       "post": {
-        "description": "This endpoint creates a recovery link which should be given to the user in order for them to recover\n(or activate) their account.",
+        "description": "This endpoint creates a recovery link which should be given to the user in order for them to recover\n(or activate) their account. It's possible to generate a link for an account without a recovery address.",
         "operationId": "adminCreateSelfServiceRecoveryLink",
         "requestBody": {
           "content": {

docs/docs/admin/managing-users-identities.mdx

@@ -61,7 +61,10 @@ to use for this user. Similarly, the trait key/values depend on your schema as
 well. The command shown does not create a password for the identity or any other
 type of credential. Instead, we will use another REST call to create a recovery
 link (here "invite link" is probably more appropriate, but the flow uses an
-account recovery link).
+account recovery link). It's possible to generate a link for an account without
+a recovery address via the admin API, but if the recovery link expires the user
+won't be able to reinitiate the flow by himself as long as the recovery address
+has been added.
 
 To create the account recovery link, use:
 

persistence/sql/migratest/fixtures/recovery_token/1b667e6d-8fda-4194-a765-08185185d7e4.json

@@ -2,5 +2,6 @@
   "id": "1b667e6d-8fda-4194-a765-08185185d7e4",
   "recovery_address": null,
   "expires_at": "2013-10-07T08:23:19Z",
-  "issued_at": "2013-10-07T08:23:19Z"
+  "issued_at": "2013-10-07T08:23:19Z",
+  "identity_id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e"
 }

persistence/sql/migratest/fixtures/recovery_token/5529d454-2946-404e-b681-d950f8657fd0.json

@@ -2,5 +2,6 @@
   "id": "5529d454-2946-404e-b681-d950f8657fd0",
   "recovery_address": null,
   "expires_at": "2000-01-01T00:00:00Z",
-  "issued_at": "2000-01-01T00:00:00Z"
+  "issued_at": "2000-01-01T00:00:00Z",
+  "identity_id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e"
 }

persistence/sql/migratest/fixtures/recovery_token/77ca3f5c-cd39-488b-9f1d-cc7166d14bdc.json

@@ -2,5 +2,6 @@
   "id": "77ca3f5c-cd39-488b-9f1d-cc7166d14bdc",
   "recovery_address": null,
   "expires_at": "2000-01-01T00:00:00Z",
-  "issued_at": "2000-01-01T00:00:00Z"
+  "issued_at": "2000-01-01T00:00:00Z",
+  "identity_id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e"
 }

persistence/sql/migratest/testdata/20210913095309_testdata.sql

@@ -0,0 +1,4 @@
+UPDATE identity_recovery_tokens SET identity_id = 'a251ebc2-880c-4f76-a8f3-38e6940eab0e' WHERE id = '5529d454-2946-404e-b681-d950f8657fd0';
+UPDATE identity_recovery_tokens SET identity_id = 'a251ebc2-880c-4f76-a8f3-38e6940eab0e' WHERE id = '77ca3f5c-cd39-488b-9f1d-cc7166d14bdc';
+UPDATE identity_recovery_tokens SET identity_id = 'a251ebc2-880c-4f76-a8f3-38e6940eab0e' WHERE id = '1b667e6d-8fda-4194-a765-08185185d7e4';
+

persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP COLUMN "identity_id";

persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP CONSTRAINT "identity_recovery_tokens_identity_recovery_addresses_id_fk";

persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.mysql.down.sql

@@ -0,0 +1 @@
+ALTER TABLE `identity_recovery_tokens` DROP COLUMN `identity_id`;

persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.mysql.up.sql

@@ -0,0 +1 @@
+ALTER TABLE `identity_recovery_tokens` MODIFY `identity_recovery_address_id` char(36);

persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.postgres.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP COLUMN "identity_id";

persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.postgres.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ALTER COLUMN "identity_recovery_address_id" TYPE UUID, ALTER COLUMN "identity_recovery_address_id" DROP NOT NULL;

persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "_identity_recovery_tokens_tmp" RENAME TO "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_tokens_nid_idx";

persistence/sql/migrations/sql/20210913095309000001_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP CONSTRAINT "identity_recovery_tokens_identity_id_fk_idx";

persistence/sql/migrations/sql/20210913095309000001_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" RENAME COLUMN "identity_recovery_address_id" TO "_identity_recovery_address_id_tmp";

persistence/sql/migrations/sql/20210913095309000001_identity_recovery_tokens.mysql.down.sql

@@ -0,0 +1 @@
+ALTER TABLE `identity_recovery_tokens` DROP FOREIGN KEY `identity_recovery_tokens_identity_id_fk_idx`;

persistence/sql/migrations/sql/20210913095309000001_identity_recovery_tokens.mysql.up.sql

@@ -0,0 +1 @@
+ALTER TABLE `identity_recovery_tokens` ADD COLUMN `identity_id` char(36);

persistence/sql/migrations/sql/20210913095309000001_identity_recovery_tokens.postgres.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP CONSTRAINT "identity_recovery_tokens_identity_id_fk_idx";

persistence/sql/migrations/sql/20210913095309000001_identity_recovery_tokens.postgres.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD COLUMN "identity_id" UUID;

persistence/sql/migrations/sql/20210913095309000001_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1,2 @@
+
+DROP TABLE "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000001_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_addresses_code_idx";

persistence/sql/migrations/sql/20210913095309000002_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD CONSTRAINT "identity_recovery_tokens_identity_recovery_addresses_id_fk" FOREIGN KEY ("identity_recovery_address_id") REFERENCES "identity_recovery_addresses" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;

persistence/sql/migrations/sql/20210913095309000002_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD COLUMN "identity_recovery_address_id" UUID;

persistence/sql/migrations/sql/20210913095309000002_identity_recovery_tokens.mysql.down.sql

@@ -0,0 +1 @@
+ALTER TABLE `identity_recovery_tokens` MODIFY `identity_recovery_address_id` char(36) NOT NULL;

persistence/sql/migrations/sql/20210913095309000002_identity_recovery_tokens.mysql.up.sql

@@ -0,0 +1 @@
+UPDATE identity_recovery_tokens SET identity_id=(SELECT identity_id FROM identity_recovery_addresses WHERE id=identity_recovery_address_id) WHERE identity_id = '' OR identity_id IS NULL;

persistence/sql/migrations/sql/20210913095309000002_identity_recovery_tokens.postgres.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ALTER COLUMN "identity_recovery_address_id" TYPE UUID, ALTER COLUMN "identity_recovery_address_id" SET NOT NULL;

persistence/sql/migrations/sql/20210913095309000002_identity_recovery_tokens.postgres.up.sql

@@ -0,0 +1 @@
+UPDATE identity_recovery_tokens SET identity_id=(SELECT identity_id FROM identity_recovery_addresses WHERE id=identity_recovery_address_id) WHERE identity_id = '00000000-0000-0000-0000-000000000000' OR identity_id IS NULL;

persistence/sql/migrations/sql/20210913095309000002_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid FROM "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000002_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_addresses_code_uq_idx";

persistence/sql/migrations/sql/20210913095309000003_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP COLUMN "_identity_recovery_address_id_tmp";

persistence/sql/migrations/sql/20210913095309000003_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+UPDATE "identity_recovery_tokens" SET "identity_recovery_address_id" = "_identity_recovery_address_id_tmp";

persistence/sql/migrations/sql/20210913095309000003_identity_recovery_tokens.mysql.down.sql

@@ -0,0 +1 @@
+DELETE FROM identity_recovery_tokens WHERE identity_recovery_address_id IS NULL;

persistence/sql/migrations/sql/20210913095309000003_identity_recovery_tokens.mysql.up.sql

@@ -0,0 +1 @@
+ALTER TABLE `identity_recovery_tokens` MODIFY `identity_id` char(36) NOT NULL;

persistence/sql/migrations/sql/20210913095309000003_identity_recovery_tokens.postgres.down.sql

@@ -0,0 +1 @@
+DELETE FROM identity_recovery_tokens WHERE identity_recovery_address_id IS NULL;

persistence/sql/migrations/sql/20210913095309000003_identity_recovery_tokens.postgres.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ALTER COLUMN "identity_id" TYPE UUID, ALTER COLUMN "identity_id" SET NOT NULL;

persistence/sql/migrations/sql/20210913095309000003_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+CREATE INDEX "identity_recovery_tokens_nid_idx" ON "_identity_recovery_tokens_tmp" (id, nid);

persistence/sql/migrations/sql/20210913095309000003_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1,15 @@
+CREATE TABLE "_identity_recovery_tokens_tmp" (
+"id" TEXT PRIMARY KEY,
+"token" TEXT NOT NULL,
+"used" bool NOT NULL DEFAULT 'false',
+"used_at" DATETIME,
+"identity_recovery_address_id" char(36),
+"selfservice_recovery_flow_id" char(36),
+"created_at" DATETIME NOT NULL,
+"updated_at" DATETIME NOT NULL,
+"expires_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
+"issued_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
+"nid" char(36),
+FOREIGN KEY (selfservice_recovery_flow_id) REFERENCES selfservice_recovery_flows (id) ON UPDATE NO ACTION ON DELETE CASCADE,
+FOREIGN KEY (identity_recovery_address_id) REFERENCES identity_recovery_addresses (id) ON UPDATE NO ACTION ON DELETE CASCADE
+);

persistence/sql/migrations/sql/20210913095309000004_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ALTER COLUMN "identity_recovery_address_id" SET NOT NULL;

persistence/sql/migrations/sql/20210913095309000004_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP COLUMN "_identity_recovery_address_id_tmp";

persistence/sql/migrations/sql/20210913095309000004_identity_recovery_tokens.mysql.up.sql

@@ -0,0 +1 @@
+ALTER TABLE `identity_recovery_tokens` ADD CONSTRAINT `identity_recovery_tokens_identity_id_fk_idx` FOREIGN KEY (`identity_id`) REFERENCES `identities` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE;

persistence/sql/migrations/sql/20210913095309000004_identity_recovery_tokens.postgres.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD CONSTRAINT "identity_recovery_tokens_identity_id_fk_idx" FOREIGN KEY ("identity_id") REFERENCES "identities" ("id") ON UPDATE RESTRICT ON DELETE CASCADE;

persistence/sql/migrations/sql/20210913095309000004_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+CREATE INDEX "identity_recovery_addresses_code_idx" ON "_identity_recovery_tokens_tmp" (token);

persistence/sql/migrations/sql/20210913095309000004_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+CREATE INDEX "identity_recovery_tokens_nid_idx" ON "_identity_recovery_tokens_tmp" (id, nid);

persistence/sql/migrations/sql/20210913095309000005_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+UPDATE "identity_recovery_tokens" SET "identity_recovery_address_id" = "_identity_recovery_address_id_tmp";

persistence/sql/migrations/sql/20210913095309000005_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD CONSTRAINT "identity_recovery_tokens_identity_recovery_addresses_id_fk" FOREIGN KEY ("identity_recovery_address_id") REFERENCES "identity_recovery_addresses" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;

persistence/sql/migrations/sql/20210913095309000005_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX "identity_recovery_addresses_code_uq_idx" ON "_identity_recovery_tokens_tmp" (token);

persistence/sql/migrations/sql/20210913095309000005_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+CREATE INDEX "identity_recovery_addresses_code_idx" ON "_identity_recovery_tokens_tmp" (token);

persistence/sql/migrations/sql/20210913095309000006_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD COLUMN "identity_recovery_address_id" UUID;

persistence/sql/migrations/sql/20210913095309000006_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD COLUMN "identity_id" UUID;

persistence/sql/migrations/sql/20210913095309000006_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1,15 @@
+CREATE TABLE "_identity_recovery_tokens_tmp" (
+"id" TEXT PRIMARY KEY,
+"token" TEXT NOT NULL,
+"used" bool NOT NULL DEFAULT 'false',
+"used_at" DATETIME,
+"identity_recovery_address_id" char(36) NOT NULL,
+"selfservice_recovery_flow_id" char(36),
+"created_at" DATETIME NOT NULL,
+"updated_at" DATETIME NOT NULL,
+"expires_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
+"issued_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
+"nid" char(36),
+FOREIGN KEY (identity_recovery_address_id) REFERENCES identity_recovery_addresses (id) ON UPDATE NO ACTION ON DELETE CASCADE,
+FOREIGN KEY (selfservice_recovery_flow_id) REFERENCES selfservice_recovery_flows (id) ON UPDATE NO ACTION ON DELETE CASCADE
+);

persistence/sql/migrations/sql/20210913095309000006_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX "identity_recovery_addresses_code_uq_idx" ON "_identity_recovery_tokens_tmp" (token);

persistence/sql/migrations/sql/20210913095309000007_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" RENAME COLUMN "identity_recovery_address_id" TO "_identity_recovery_address_id_tmp";

persistence/sql/migrations/sql/20210913095309000007_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+UPDATE identity_recovery_tokens SET identity_id=(SELECT identity_id FROM identity_recovery_addresses WHERE id=identity_recovery_address_id) WHERE identity_id = '00000000-0000-0000-0000-000000000000' OR identity_id IS NULL;

persistence/sql/migrations/sql/20210913095309000007_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_tokens_nid_idx";

persistence/sql/migrations/sql/20210913095309000007_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid FROM "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000008_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP CONSTRAINT "identity_recovery_tokens_identity_recovery_addresses_id_fk";

persistence/sql/migrations/sql/20210913095309000008_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" RENAME COLUMN "identity_id" TO "_identity_id_tmp";

persistence/sql/migrations/sql/20210913095309000008_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_addresses_code_idx";

persistence/sql/migrations/sql/20210913095309000008_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+DROP TABLE "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000009_identity_recovery_tokens.cockroach.down.sql

@@ -0,0 +1 @@
+DELETE FROM identity_recovery_tokens WHERE identity_recovery_address_id IS NULL;

persistence/sql/migrations/sql/20210913095309000009_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD COLUMN "identity_id" UUID;

persistence/sql/migrations/sql/20210913095309000009_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_addresses_code_uq_idx";

persistence/sql/migrations/sql/20210913095309000009_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "_identity_recovery_tokens_tmp" RENAME TO "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000010_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+UPDATE "identity_recovery_tokens" SET "identity_id" = "_identity_id_tmp";

persistence/sql/migrations/sql/20210913095309000010_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "_identity_recovery_tokens_tmp" RENAME TO "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000010_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+ALTER TABLE identity_recovery_tokens ADD COLUMN identity_id CHAR(36) NULL REFERENCES identities(id) ON DELETE CASCADE ON UPDATE RESTRICT;

persistence/sql/migrations/sql/20210913095309000011_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ALTER COLUMN "identity_id" SET NOT NULL;

persistence/sql/migrations/sql/20210913095309000011_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+DROP TABLE "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000011_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+UPDATE identity_recovery_tokens SET identity_id=(SELECT identity_id FROM identity_recovery_addresses WHERE id=identity_recovery_address_id) WHERE identity_id = '' OR identity_id IS NULL;

persistence/sql/migrations/sql/20210913095309000012_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" DROP COLUMN "_identity_id_tmp";

persistence/sql/migrations/sql/20210913095309000012_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid, identity_id) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid, identity_id FROM "identity_recovery_tokens";

persistence/sql/migrations/sql/20210913095309000012_identity_recovery_tokens.sqlite3.up.sql

@@ -0,0 +1 @@
+DELETE FROM identity_recovery_tokens WHERE identity_recovery_address_id IS NULL AND identity_id = '';

persistence/sql/migrations/sql/20210913095309000013_identity_recovery_tokens.cockroach.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "identity_recovery_tokens" ADD CONSTRAINT "identity_recovery_tokens_identity_id_fk_idx" FOREIGN KEY ("identity_id") REFERENCES "identities" ("id") ON UPDATE RESTRICT ON DELETE CASCADE;

persistence/sql/migrations/sql/20210913095309000013_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+CREATE INDEX "identity_recovery_tokens_nid_idx" ON "_identity_recovery_tokens_tmp" (id, nid);

persistence/sql/migrations/sql/20210913095309000014_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+CREATE INDEX "identity_recovery_addresses_code_idx" ON "_identity_recovery_tokens_tmp" (token);

persistence/sql/migrations/sql/20210913095309000015_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX "identity_recovery_addresses_code_uq_idx" ON "_identity_recovery_tokens_tmp" (token);

persistence/sql/migrations/sql/20210913095309000016_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1,17 @@
+CREATE TABLE "_identity_recovery_tokens_tmp" (
+"id" TEXT PRIMARY KEY,
+"token" TEXT NOT NULL,
+"used" bool NOT NULL DEFAULT 'false',
+"used_at" DATETIME,
+"identity_recovery_address_id" char(36) NOT NULL,
+"selfservice_recovery_flow_id" char(36),
+"created_at" DATETIME NOT NULL,
+"updated_at" DATETIME NOT NULL,
+"expires_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
+"issued_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
+"nid" char(36),
+"identity_id" CHAR(36),
+FOREIGN KEY (identity_recovery_address_id) REFERENCES identity_recovery_addresses (id) ON UPDATE NO ACTION ON DELETE CASCADE,
+FOREIGN KEY (selfservice_recovery_flow_id) REFERENCES selfservice_recovery_flows (id) ON UPDATE NO ACTION ON DELETE CASCADE,
+FOREIGN KEY (identity_id) REFERENCES identities (id) ON UPDATE RESTRICT ON DELETE CASCADE
+);

persistence/sql/migrations/sql/20210913095309000017_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_tokens_nid_idx";

persistence/sql/migrations/sql/20210913095309000018_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_addresses_code_idx";

persistence/sql/migrations/sql/20210913095309000019_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_recovery_addresses_code_uq_idx";

persistence/sql/migrations/sql/20210913095309000020_identity_recovery_tokens.sqlite3.down.sql

@@ -0,0 +1 @@
+DELETE FROM identity_recovery_tokens WHERE identity_recovery_address_id IS NULL;

persistence/sql/migrations/templates/20210913095309_identity_recovery_tokens.down.fizz

@@ -0,0 +1,6 @@
+sql("DELETE FROM identity_recovery_tokens WHERE identity_recovery_address_id IS NULL")
+change_column("identity_recovery_tokens", "identity_recovery_address_id", "uuid", {"size": 36})
+{{ if not .IsSQLite  }}
+  drop_foreign_key("identity_recovery_tokens", "identity_recovery_tokens_identity_id_fk_idx")
+{{ end }}
+drop_column("identity_recovery_tokens", "identity_id")

persistence/sql/migrations/templates/20210913095309_identity_recovery_tokens.up.fizz

@@ -0,0 +1,20 @@
+change_column("identity_recovery_tokens", "identity_recovery_address_id", "uuid", {"size": 36,"null": true})
+
+{{ if .IsSQLite }}
+  sql("ALTER TABLE identity_recovery_tokens ADD COLUMN identity_id CHAR(36) NULL REFERENCES identities(id) ON DELETE CASCADE ON UPDATE RESTRICT")
+{{ else }}
+  add_column("identity_recovery_tokens", "identity_id", "uuid", {"size": 36,"null": true})
+{{ end }}
+{{ if or .IsPostgreSQL .IsCockroach }}
+  sql("UPDATE identity_recovery_tokens SET identity_id=(SELECT identity_id FROM identity_recovery_addresses WHERE id=identity_recovery_address_id) WHERE identity_id = '00000000-0000-0000-0000-000000000000'")
+{{ else }}
+  sql("UPDATE identity_recovery_tokens SET identity_id=(SELECT identity_id FROM identity_recovery_addresses WHERE id=identity_recovery_address_id) WHERE identity_id = ''")
+{{ end }}
+{{ if not .IsSQLite  }}
+  change_column("identity_recovery_tokens", "identity_id", "uuid", {"size": 36})
+  add_foreign_key("identity_recovery_tokens", "identity_id", {"identities": ["id"]}, {
+        "name": "identity_recovery_tokens_identity_id_fk_idx",
+        "on_delete": "CASCADE",
+        "on_update": "RESTRICT",
+    })
+{{ end }}

persistence/sql/persister_recovery.go

@@ -6,16 +6,14 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ory/kratos/corp"
-	"github.com/ory/kratos/identity"
-
 	"github.com/gobuffalo/pop/v5"
 	"github.com/gofrs/uuid"
 
-	"github.com/ory/x/sqlcon"
-
+	"github.com/ory/kratos/corp"
+	"github.com/ory/kratos/identity"
 	"github.com/ory/kratos/selfservice/flow/recovery"
 	"github.com/ory/kratos/selfservice/strategy/link"
+	"github.com/ory/x/sqlcon"
 )
 
 var _ recovery.FlowPersister = new(Persister)
@@ -76,9 +74,10 @@ func (p *Persister) UseRecoveryToken(ctx context.Context, token string) (*link.R
 
 		var ra identity.RecoveryAddress
 		if err := tx.Where("id = ? AND nid = ?", rt.RecoveryAddressID, nid).First(&ra); err != nil {
-			return sqlcon.HandleError(err)
+			if !errors.Is(sqlcon.HandleError(err), sqlcon.ErrNoRows) {
+				return err
+			}
 		}
-
 		rt.RecoveryAddress = &ra
 
 		/* #nosec G201 TableName is static */