From e95a6eeb11b1fc45b0d2ea01ba2539109d7e93dd Mon Sep 17 00:00:00 2001 From: konrad Date: Mon, 17 Feb 2020 17:29:17 +0000 Subject: [PATCH] Explicitly disable wunderlist migration by default (#141) Fix wunderlist callback link in docs Explicitly disable wunderlist migration by default Co-authored-by: kolaente Reviewed-on: https://kolaente.dev/vikunja/api/pulls/141 --- config.yml.sample | 4 ++-- docs/content/doc/setup/config.md | 4 ++-- go.mod | 3 +++ pkg/config/config.go | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config.yml.sample b/config.yml.sample index e2a32cd2032..56512df82cc 100644 --- a/config.yml.sample +++ b/config.yml.sample @@ -138,7 +138,7 @@ migration: # These are the settings for the wunderlist migrator wunderlist: # Wheter to enable the wunderlist migrator or not - enable: true + enable: false # The client id, required for making requests to the wunderlist api # You need to register your vikunja instance at https://developer.wunderlist.com/apps/new to get this clientid: @@ -146,6 +146,6 @@ migration: clientsecret: # The url where clients are redirected after they authorized Vikunja to access their wunderlist stuff. # This needs to match the url you entered when registering your Vikunja instance at wunderlist. - # This is usually the frontend url where the frontend then makes a request to /migration/wunderlist/migrate + # This is usually the frontend url where the frontend then makes a request to /migration/wunderlist # with the code obtained from the wunderlist api. redirecturl: diff --git a/docs/content/doc/setup/config.md b/docs/content/doc/setup/config.md index 18e8f59bc23..944cdc96148 100644 --- a/docs/content/doc/setup/config.md +++ b/docs/content/doc/setup/config.md @@ -181,7 +181,7 @@ migration: # These are the settings for the wunderlist migrator wunderlist: # Wheter to enable the wunderlist migrator or not - enable: true + enable: false # The client id, required for making requests to the wunderlist api # You need to register your vikunja instance at https://developer.wunderlist.com/apps/new to get this clientid: @@ -189,7 +189,7 @@ migration: clientsecret: # The url where clients are redirected after they authorized Vikunja to access their wunderlist stuff. # This needs to match the url you entered when registering your Vikunja instance at wunderlist. - # This is usually the frontend url where the frontend then makes a request to /migration/wunderlist/migrate + # This is usually the frontend url where the frontend then makes a request to /migration/wunderlist # with the code obtained from the wunderlist api. redirecturl: {{< /highlight >}} diff --git a/go.mod b/go.mod index 6a430518541..636aad408aa 100644 --- a/go.mod +++ b/go.mod @@ -38,6 +38,7 @@ require ( github.com/go-testfixtures/testfixtures/v3 v3.1.1 github.com/go-xorm/core v0.6.2 // indirect github.com/go-xorm/xorm v0.7.9 // indirect + github.com/gogo/protobuf v1.2.0 // indirect github.com/golang/protobuf v1.3.2 // indirect github.com/gordonklaus/ineffassign v0.0.0-20180909121442-1003c8bd00dc github.com/imdario/mergo v0.3.7 @@ -53,6 +54,8 @@ require ( github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/olekukonko/tablewriter v0.0.1 + github.com/onsi/ginkgo v1.7.0 // indirect + github.com/onsi/gomega v1.4.3 // indirect github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/pelletier/go-toml v1.4.0 // indirect github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 diff --git a/pkg/config/config.go b/pkg/config/config.go index c24d3a8a38b..92604e8b2ec 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -224,6 +224,8 @@ func InitDefaultConfig() { CorsEnable.setDefault(true) CorsOrigins.setDefault([]string{"*"}) CorsMaxAge.setDefault(0) + // Migration + MigrationWunderlistEnable.setDefault(false) } // InitConfig initializes the config, sets defaults etc.