From dcddaab7b58ab2e03e0d0f3f0b771a1e6ec0dbce Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 14 Aug 2021 18:27:29 +0200 Subject: [PATCH] Set todoist migration redirect url to the frontend url by default --- config.yml.sample | 2 +- docs/content/doc/setup/config.md | 13 +++++++++++++ pkg/config/config.go | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/config.yml.sample b/config.yml.sample index efb52651ce..3f02e61ce4 100644 --- a/config.yml.sample +++ b/config.yml.sample @@ -198,7 +198,7 @@ migration: # This is usually the frontend url where the frontend then makes a request to /migration/todoist/migrate # with the code obtained from the todoist api. # Note that the vikunja frontend expects this to be /migrate/todoist - redirecturl: + redirecturl: /migrate/todoist trello: # Wheter to enable the trello migrator or not enable: false diff --git a/docs/content/doc/setup/config.md b/docs/content/doc/setup/config.md index fa35a0f5f9..8a0110c616 100644 --- a/docs/content/doc/setup/config.md +++ b/docs/content/doc/setup/config.md @@ -272,6 +272,19 @@ Full path: `service.enableemailreminders` Environment path: `VIKUNJA_SERVICE_ENABLEEMAILREMINDERS` +### enableuserdeletion + +If true, will allow users to request the complete deletion of their account. When using external authentication methods +it may be required to coordinate with them in order to delete the account. This setting will not affect the cli commands +for user deletion. + +Default: `true` + +Full path: `service.enableuserdeletion` + +Environment path: `VIKUNJA_SERVICE_ENABLEUSERDELETION` + + --- ## database diff --git a/pkg/config/config.go b/pkg/config/config.go index b2e1cc9570..abcff4fb72 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -374,6 +374,10 @@ func InitConfig() { AuthOpenIDRedirectURL.Set(ServiceFrontendurl.GetString() + "auth/openid/") } + if MigrationTodoistRedirectURL.GetString() == "" { + MigrationTodoistRedirectURL.Set(ServiceFrontendurl.GetString() + "migrate/todoist") + } + if MigrationTrelloRedirectURL.GetString() == "" { MigrationTrelloRedirectURL.Set(ServiceFrontendurl.GetString() + "migrate/trello") }