@contember/engine-tenant-api 1.2.1 → 1.3.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-tenant-api",
-  "version": "1.2.1",
+  "version": "1.3.0-alpha.2",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -9,25 +9,26 @@
     "test": "vitest --no-threads"
   },
   "dependencies": {
-    "@contember/authorization": "^1.2.1",
-    "@contember/config-loader": "^1.2.1",
-    "@contember/database": "^1.2.1",
-    "@contember/database-migrations": "^1.2.1",
-    "@contember/dic": "^1.2.1",
-    "@contember/logger": "^1.2.1",
-    "@contember/typesafe": "^1.2.1",
-    "@contember/graphql-utils": "^1.2.1",
-    "@contember/schema": "^1.2.1",
-    "@contember/schema-utils": "^1.2.1",
+    "@contember/authorization": "^1.3.0-alpha.2",
+    "@contember/config-loader": "^1.3.0-alpha.2",
+    "@contember/database": "^1.3.0-alpha.2",
+    "@contember/database-migrations": "^1.3.0-alpha.2",
+    "@contember/dic": "^1.3.0-alpha.2",
+    "@contember/graphql-utils": "^1.3.0-alpha.2",
+    "@contember/logger": "^1.3.0-alpha.2",
+    "@contember/schema": "^1.3.0-alpha.2",
+    "@contember/schema-utils": "^1.3.0-alpha.2",
+    "@contember/typesafe": "^1.3.0-alpha.2",
     "@graphql-tools/utils": "^8.6.13",
     "graphql-tag": "^2.12.5",
+    "jose": "^4.10",
     "mustache": "^4.0.0",
     "nodemailer": "^6.4.2",
-    "openid-client": "^4.2.1",
+    "openid-client": "^5.3.1",
     "otpauth": "^7.0.6"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.2.1",
+    "@contember/database-tester": "^1.3.0-alpha.2",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/TenantContainer.ts

@@ -4,9 +4,9 @@ import { Builder } from '@contember/dic'
 import {
 	AclSchemaAccessNodeFactory,
 	ApiKeyManager,
-	ApiKeyService,
+	ApiKeyService, AppleProvider,
 	DatabaseContext,
-	DatabaseContextFactory,
+	DatabaseContextFactory, FacebookProvider,
 	Identity,
 	IdentityFactory,
 	IDPHandlerRegistry,
@@ -158,6 +158,8 @@ export class TenantContainerFactory {
 			.addService('idpRegistry', () => {
 				const idpRegistry = new IDPHandlerRegistry()
 				idpRegistry.registerHandler('oidc', new OIDCProvider())
+				idpRegistry.registerHandler('facebook', new FacebookProvider())
+				idpRegistry.registerHandler('apple', new AppleProvider())
 				return idpRegistry
 			})
 			.addService('idpSignInManager', ({ apiKeyManager, idpRegistry }) =>

package/src/bin/runMigrations.ts

@@ -0,0 +1,32 @@
+import { TenantMigrationsRunner } from '../migrations'
+import { createLogger, PrettyPrintLoggerHandler } from '@contember/logger'
+
+let uuidNum = 0
+const dummyUuid = () => '123e4567-e89b-12d3-a456-' + (uuidNum++).toString().padStart(12, '0')
+
+;(async () => {
+	const migrationsRunner = new TenantMigrationsRunner(
+		{
+			database: process.env.PGDATABASE as string,
+			host: process.env.PGHOST as string,
+			password: process.env.PGPASSWORD as string,
+			user: process.env.PGUSER as string,
+			port: process.env.PGPORT ? Number(process.env.PGPORT) : 5432,
+		},
+		'tenant',
+		{
+			rootToken: '0',
+		},
+		{
+			bcrypt: () => {
+				throw new Error()
+			},
+			uuid: dummyUuid,
+		},
+	)
+	await migrationsRunner.run(createLogger(new PrettyPrintLoggerHandler(process.stderr)))
+})().catch(e => {
+	// eslint-disable-next-line no-console
+	console.error(e)
+	process.exit(1)
+})

package/src/migrations/{2018-08-02-174310-init.sql → 2018-08-02-174310-init.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 CREATE TABLE "identity" (
 	"id" uuid NOT NULL,
 	"parent_id" uuid,
@@ -53,4 +56,8 @@ CREATE TABLE "project_member" (
 );
 
 CREATE UNIQUE INDEX project_member_project_id_person_id ON "project_member" ("project_id", "person_id");
-CREATE INDEX "project_member_person_id" ON "project_member" ("person_id");
+CREATE INDEX "project_member_person_id" ON "project_member" ("person_id");`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2018-09-03-140621-identity-project.sql → 2018-09-03-140621-identity-project.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 ALTER TABLE "project_member"
   ADD COLUMN "identity_id" UUID DEFAULT NULL,
   ADD COLUMN "roles" jsonb NOT NULL DEFAULT '[]' :: jsonb;
@@ -22,3 +25,8 @@ ALTER TABLE "project_member"
   ALTER "roles" DROP DEFAULT,
   ALTER "identity_id" DROP DEFAULT,
   ALTER "identity_id" SET NOT NULL;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2018-10-26-165450-setup-api-key.sql → 2018-10-26-165450-setup-api-key.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 DO
 $BLOCK$
     BEGIN
@@ -16,3 +19,8 @@ $BLOCK$
             END IF;
     END
 $BLOCK$;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2018-10-26-175155-variables.sql → 2018-10-26-175155-variables.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 CREATE TABLE "project_member_variable" (
   "id"          uuid    NOT NULL,
   "project_id"  uuid    NOT NULL,
@@ -12,3 +15,7 @@ CREATE TABLE "project_member_variable" (
   ON DELETE CASCADE,
   CONSTRAINT project_member_variable_unique UNIQUE ("project_id", "identity_id", "variable")
 );
+`
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2019-02-18-110949-project-slug.sql → 2019-02-18-110949-project-slug.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 ALTER TABLE "project"
 	ADD COLUMN slug TEXT DEFAULT NULL;
 
@@ -7,3 +10,8 @@ SET slug = name;
 ALTER TABLE "project"
 	ALTER slug DROP DEFAULT,
 	ALTER slug SET NOT NULL;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2019-02-18-160155-session-expiration.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE "api_key"
+	ADD COLUMN expiration INT DEFAULT NULL;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2019-05-03-163729-api-key-disabled-at.sql → 2019-05-03-163729-api-key-disabled-at.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 ALTER TABLE "api_key"
     ADD COLUMN "disabled_at" TIMESTAMP;
 
@@ -7,3 +10,8 @@ WHERE "enabled" = FALSE;
 
 ALTER TABLE "api_key"
     DROP COLUMN "enabled";
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2019-08-14-153300-project-slug-unique.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+CREATE UNIQUE INDEX "project_slug"
+	ON "project"("slug");
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2019-09-06-111000-membership.sql → 2019-09-06-111000-membership.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 CREATE TABLE project_membership (
     id          UUID NOT NULL PRIMARY KEY,
     project_id  UUID NOT NULL,
@@ -40,3 +43,8 @@ INSERT
 INTO project_membership_variable(id, membership_id, variable, value)
     SELECT public.uuid_generate_v4(), data.id, data.variable, data.value
     FROM data;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2019-09-06-111001-drop-old-member.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+DROP TABLE project_member;
+DROP TABLE project_member_variable;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2020-01-29-idenity-note.ts

@@ -0,0 +1,18 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE identity
+	ADD COLUMN description TEXT,
+	ADD COLUMN created_at  TIMESTAMP;
+
+UPDATE identity
+SET created_at = NOW();
+
+ALTER TABLE identity
+	ALTER created_at SET NOT NULL;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+

package/src/migrations/2020-04-17-fix-person-index.ts

@@ -0,0 +1,12 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+DROP INDEX "person_identity_id";
+
+CREATE INDEX "person_identity_id" ON "person" USING btree ("identity_id");
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+

package/src/migrations/2020-05-01-170000-api-key-index.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+CREATE UNIQUE INDEX api_key_token_hash ON api_key(token_hash)
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+

package/src/migrations/2020-06-08-134000-tenant-credentials.ts

@@ -1,58 +1,7 @@
-import { escapeValue, MigrationBuilder } from '@contember/database-migrations'
+import { MigrationBuilder } from '@contember/database-migrations'
 import { TenantMigrationArgs } from './types'
+import { createCredentials } from './tenantCredentials'
 
 export default async function (builder: MigrationBuilder, args: TenantMigrationArgs) {
-	const credentials = await args.getCredentials()
-	if (credentials.loginTokenHash) {
-		const tokenHash = credentials.loginTokenHash
-		builder.sql(`
-			WITH identity AS (
-			    INSERT INTO identity(id, parent_id, roles, description, created_at)
-				VALUES (public."uuid_generate_v4"(), NULL, '["login"]'::JSONB, 'Login key', now()) RETURNING id
-			)
-			INSERT INTO api_key (id, token_hash, type, identity_id, disabled_at, expires_at, expiration, created_at)
-			SELECT public."uuid_generate_v4"(), ${escapeValue(tokenHash)}, 'permanent', identity.id, NULL, NULL, NULL, now()
-			FROM identity
-			`)
-	}
-
-	if (!credentials.rootTokenHash) {
-		throw 'Please specify a root token using CONTEMBER_ROOT_TOKEN env variable.'
-	}
-
-	if (credentials.rootEmail && !credentials.rootPasswordBcrypted) {
-		throw 'Please specify a root password using CONTEMBER_ROOT_PASSWORD env variable.'
-	}
-	const rootEmail = credentials.rootPasswordBcrypted ? credentials.rootEmail || 'root@localhost' : null
-	const rootPasswordHash = credentials.rootPasswordBcrypted || null
-
-	const rootTokenHash = credentials.rootTokenHash
-
-	builder.sql(`
-			WITH identity AS (
-				INSERT INTO identity(id, parent_id, roles, description, created_at)
-				VALUES (
-						public."uuid_generate_v4"(),
-						NULL,
-						'["super_admin"]'::JSONB
-							|| (CASE WHEN ${escapeValue(rootEmail)} IS NOT NULL THEN '["person"]'::JSONB ELSE '[]'::JSONB END),
-						'Superadmin',
-						now()
-					) RETURNING id
-			),
-			person AS (
-				INSERT INTO person(id, email, password_hash, identity_id)
-				SELECT public."uuid_generate_v4"(), ${escapeValue(rootEmail)}, ${escapeValue(rootPasswordHash)}, identity.id
-				FROM identity
-				WHERE ${escapeValue(rootEmail)} IS NOT NULL
-			    RETURNING id
-			),
-			api_key AS (
-				INSERT INTO api_key (id, token_hash, type, identity_id, disabled_at, expires_at, expiration, created_at)
-				SELECT public."uuid_generate_v4"(), ${escapeValue(rootTokenHash)}, 'permanent', identity.id, NULL, NULL, NULL, now()
-				FROM identity WHERE ${escapeValue(rootTokenHash)} IS NOT NULL
-			    RETURNING id
-			)
-			SELECT * FROM person, api_key
-		`)
+	await createCredentials(builder, args)
 }

package/src/migrations/2020-08-07-110000-person-otp.ts

@@ -0,0 +1,12 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE "person"
+	ADD COLUMN otp_uri          TEXT      DEFAULT NULL,
+	ADD COLUMN otp_activated_at TIMESTAMP DEFAULT NULL
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+

package/src/migrations/{2020-08-17-162200-mail-templates.sql → 2020-08-17-162200-mail-templates.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 CREATE TABLE mail_template (
 	id         UUID NOT NULL PRIMARY KEY,
 	project_id UUID NOT NULL,
@@ -12,3 +15,8 @@ CREATE TABLE mail_template (
 CREATE UNIQUE INDEX mail_template_identifier ON mail_template(project_id, mail_type, variant);
 CREATE INDEX mail_template_project_index
 	ON mail_template(project_id);
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2020-08-21-143400-person-password-reset.sql → 2020-08-21-143400-person-password-reset.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 CREATE TABLE person_password_reset (
 	id         UUID      NOT NULL,
 	token_hash TEXT      NOT NULL,
@@ -12,4 +15,9 @@ CREATE TABLE person_password_reset (
 
 CREATE UNIQUE INDEX person_password_reset_token
 	ON person_password_reset(token_hash);
+`
+
 
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2020-09-07-094200-identity-provider.sql → 2020-09-07-094200-identity-provider.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 CREATE TABLE identity_provider (
 	id            UUID        NOT NULL,
 	slug          TEXT UNIQUE NOT NULL,
@@ -6,3 +9,8 @@ CREATE TABLE identity_provider (
 	disabled_at   TIMESTAMP DEFAULT NULL,
 	CONSTRAINT identity_provider_id PRIMARY KEY ("id")
 );
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2021-03-28-134000-timestamp.sql → 2021-03-28-134000-timestamp.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 ALTER TABLE identity_provider
     ALTER disabled_at TYPE TIMESTAMPTZ;
 
@@ -16,4 +19,10 @@ ALTER TABLE person_password_reset
 	ALTER expires_at TYPE TIMESTAMPTZ,
 	ALTER created_at TYPE TIMESTAMPTZ,
 	ALTER used_at TYPE TIMESTAMPTZ;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+
 

package/src/migrations/2021-07-26-105000-project-config.ts

@@ -0,0 +1,12 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE project
+	ADD COLUMN config JSONB NOT NULL DEFAULT '{}'::JSONB,
+    add column updated_at timestamptz not null DEFAULT now();
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+

package/src/migrations/{2021-07-26-132000-project-secrets.sql → 2021-07-26-132000-project-secrets.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 CREATE TABLE project_secret
 (
 	id              UUID        NOT NULL PRIMARY KEY,
@@ -13,3 +16,8 @@ CREATE TABLE project_secret
 CREATE UNIQUE INDEX project_secret_unique ON project_secret (project_id, key);
 CREATE INDEX project_secret_project_index
 	ON project_secret (project_id);
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2021-07-27-174000-project-alias-index.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+CREATE INDEX project_alias ON project USING gin ((config -> 'alias'));
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+

package/src/migrations/2021-11-24-130000-person-password-null.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE person ALTER COLUMN password_hash DROP NOT NULL;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+

package/src/migrations/{2021-11-24-161500-mail-template-project-null.sql → 2021-11-24-161500-mail-template-project-null.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 ALTER TABLE "mail_template" ALTER COLUMN "project_id" DROP NOT NULL;
 
 DROP INDEX mail_template_identifier;
@@ -7,3 +10,8 @@ CREATE UNIQUE INDEX mail_template_identifier
 
 CREATE UNIQUE INDEX mail_template_identifier_global
 	ON mail_template (mail_type, variant) WHERE project_id IS NULL;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2022-01-04-144000-person-unique-identity.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE person
+	ADD UNIQUE (identity_id);
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2022-02-09-111800-fix-crypted.sql → 2022-02-09-111800-fix-crypted.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 ALTER TABLE project_secret
 	ADD COLUMN value   BYTEA,
 	ADD COLUMN version SMALLINT;
@@ -11,3 +14,8 @@ ALTER TABLE project_secret
     ALTER version SET NOT NULL,
     DROP value_encrypted,
     DROP iv;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2022-02-11-153000-idp-auto-sign-up.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE identity_provider
+	ADD COLUMN auto_sign_up BOOLEAN NOT NULL DEFAULT FALSE;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/{2022-06-29-105000-person-idp.sql → 2022-06-29-105000-person-idp.ts}

@@ -1,3 +1,6 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 CREATE TABLE person_identity_provider
 (
 	id                   UUID        NOT NULL PRIMARY KEY,
@@ -12,3 +15,8 @@ CREATE TABLE person_identity_provider
 CREATE INDEX person_identity_provider_person_id ON person_identity_provider (person_id);
 CREATE UNIQUE INDEX person_identity_provider_identifier
 	ON person_identity_provider (identity_provider_id, external_identifier);
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2022-07-07-135000-person-email-opt-uniq.ts

@@ -0,0 +1,11 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE person
+	ALTER email DROP NOT NULL,
+	ADD CONSTRAINT email_unique UNIQUE (email);
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/2022-07-07-141000-person-display-name.ts

@@ -0,0 +1,13 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE person
+	ADD name TEXT;
+UPDATE person
+SET name = SPLIT_PART(email, '@', 1);
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+

package/src/migrations/{2022-07-14-145000-person-login-options.sql → 2022-07-14-145000-person-login-options.ts}

@@ -1,6 +1,15 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
 ALTER TABLE person
 	ADD idp_only BOOLEAN NOT NULL DEFAULT FALSE,
 	ADD CONSTRAINT idp_only_no_email CHECK ( idp_only = FALSE OR (idp_only = TRUE AND email IS NULL));
 
 ALTER TABLE identity_provider
 	ADD exclusive BOOLEAN DEFAULT FALSE;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}
+