From be3454e40dd743cf32729ecd2facbfa273fd3b02 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 19 Apr 2022 13:18:11 +0200 Subject: [PATCH] Require registration application by default --- api_tests/package.json | 2 +- api_tests/src/shared.ts | 11 +++++++++-- api_tests/yarn.lock | 8 ++++---- .../down.sql | 2 ++ .../up.sql | 2 ++ 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 migrations/2022-04-19-111004_default_require_application/down.sql create mode 100644 migrations/2022-04-19-111004_default_require_application/up.sql diff --git a/api_tests/package.json b/api_tests/package.json index c461ea684..3aa57d49c 100644 --- a/api_tests/package.json +++ b/api_tests/package.json @@ -16,7 +16,7 @@ "eslint": "^7.30.0", "eslint-plugin-jane": "^9.0.3", "jest": "^27.0.6", - "lemmy-js-client": "0.13.1-rc.1", + "lemmy-js-client": "0.16.0-rc.1", "node-fetch": "^2.6.1", "prettier": "^2.3.2", "ts-jest": "^27.0.3", diff --git a/api_tests/src/shared.ts b/api_tests/src/shared.ts index c429a207a..d5be61ac3 100644 --- a/api_tests/src/shared.ts +++ b/api_tests/src/shared.ts @@ -50,7 +50,6 @@ import { ResolveObjectResponse, ResolveObject, CreatePostReport, - PostReport, ListPostReports, PostReportResponse, ListPostReportsResponse, @@ -59,6 +58,7 @@ import { ListCommentReports, ListCommentReportsResponse, DeleteAccount, + DeleteAccountResponse } from 'lemmy-js-client'; export interface API { @@ -132,6 +132,13 @@ export async function setupLogins() { gamma.auth = res[2].jwt; delta.auth = res[3].jwt; epsilon.auth = res[4].jwt; + + // regstration applications are now enabled by default, need to disable them + await alpha.client.editSite({ require_application: false, auth: alpha.auth}); + await beta.client.editSite({ require_application: false, auth: beta.auth}); + await gamma.client.editSite({ require_application: false, auth: gamma.auth}); + await delta.client.editSite({ require_application: false, auth: delta.auth}); + await epsilon.client.editSite({ require_application: false, auth: epsilon.auth}); } export async function createPost( @@ -552,7 +559,7 @@ export async function saveUserSettings( export async function deleteUser( api: API, -): Promise { +): Promise { let form: DeleteAccount = { auth: api.auth, password diff --git a/api_tests/yarn.lock b/api_tests/yarn.lock index 2d9d43b47..c60da9dad 100644 --- a/api_tests/yarn.lock +++ b/api_tests/yarn.lock @@ -3076,10 +3076,10 @@ language-tags@^1.0.5: dependencies: language-subtag-registry "~0.3.2" -lemmy-js-client@0.13.1-rc.1: - version "0.13.1-rc.1" - resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.13.1-rc.1.tgz#e1af4749a5493954a17f87b7b20dcccb8c585f22" - integrity sha512-fncCq6Zu8s6GpeCrkmJS8/rqXcyrJ8p8EyWfXiiuZlWkgzOIi+qZjTRnO63wI6DomYwVOjwk7sry4RbOJSdK5Q== +lemmy-js-client@0.16.0-rc.1: + version "0.16.0-rc.1" + resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.16.0-rc.1.tgz#14c4a526abf4b171c8afe4efbe2a62dcaf6a6f17" + integrity sha512-0hR/gHHsokp46whIHGMBQO2zBKWM7bT6mwKNMZxPvyJo+YW9EbKTO5edjF5E4v8nf3FuIE+gFtm5NFAjCaeWJg== leven@^3.1.0: version "3.1.0" diff --git a/migrations/2022-04-19-111004_default_require_application/down.sql b/migrations/2022-04-19-111004_default_require_application/down.sql new file mode 100644 index 000000000..eaa29a3ca --- /dev/null +++ b/migrations/2022-04-19-111004_default_require_application/down.sql @@ -0,0 +1,2 @@ +alter table site alter column require_application set default false; +alter table site alter column application_question set default null; \ No newline at end of file diff --git a/migrations/2022-04-19-111004_default_require_application/up.sql b/migrations/2022-04-19-111004_default_require_application/up.sql new file mode 100644 index 000000000..1e326f173 --- /dev/null +++ b/migrations/2022-04-19-111004_default_require_application/up.sql @@ -0,0 +1,2 @@ +alter table site alter column require_application set default true; +alter table site alter column application_question set default 'To verify that you are human, please explain why you want to create an account on this site'; \ No newline at end of file