local-it/vikunja-api
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Explicitly disable wunderlist migration by default (#141)

Browse source 
Fix wunderlist callback link in docs

Explicitly disable wunderlist migration by default

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/api/pulls/141
This commit is contained in:
konrad 2020-02-17 17:29:17 +00:00
parent f46e9cb64e
commit e95a6eeb11
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.yml.sample
View file

@ -138,7 +138,7 @@ migration:
# These are the settings for the wunderlist migrator # These are the settings for the wunderlist migrator
wunderlist: wunderlist:
# Wheter to enable the wunderlist migrator or not # Wheter to enable the wunderlist migrator or not
enable: true enable: false
# The client id, required for making requests to the wunderlist api # 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 # You need to register your vikunja instance at https://developer.wunderlist.com/apps/new to get this
clientid: clientid:
@ -146,6 +146,6 @@ migration:
clientsecret: clientsecret:
# The url where clients are redirected after they authorized Vikunja to access their wunderlist stuff. # 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 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. # with the code obtained from the wunderlist api.
redirecturl: redirecturl:

4
docs/content/doc/setup/config.md
View file

@ -181,7 +181,7 @@ migration:
# These are the settings for the wunderlist migrator # These are the settings for the wunderlist migrator
wunderlist: wunderlist:
# Wheter to enable the wunderlist migrator or not # Wheter to enable the wunderlist migrator or not
enable: true enable: false
# The client id, required for making requests to the wunderlist api # 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 # You need to register your vikunja instance at https://developer.wunderlist.com/apps/new to get this
clientid: clientid:
@ -189,7 +189,7 @@ migration:
clientsecret: clientsecret:
# The url where clients are redirected after they authorized Vikunja to access their wunderlist stuff. # 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 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. # with the code obtained from the wunderlist api.
redirecturl: redirecturl:
{{< /highlight >}} {{< /highlight >}}

3
go.mod
View file

@ -38,6 +38,7 @@ require (
github.com/go-testfixtures/testfixtures/v3 v3.1.1 github.com/go-testfixtures/testfixtures/v3 v3.1.1
github.com/go-xorm/core v0.6.2 // indirect github.com/go-xorm/core v0.6.2 // indirect
github.com/go-xorm/xorm v0.7.9 // 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/golang/protobuf v1.3.2 // indirect
github.com/gordonklaus/ineffassign v0.0.0-20180909121442-1003c8bd00dc github.com/gordonklaus/ineffassign v0.0.0-20180909121442-1003c8bd00dc
github.com/imdario/mergo v0.3.7 github.com/imdario/mergo v0.3.7
@ -53,6 +54,8 @@ require (
github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/mattn/go-sqlite3 v2.0.3+incompatible
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
github.com/olekukonko/tablewriter v0.0.1 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/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/pelletier/go-toml v1.4.0 // indirect github.com/pelletier/go-toml v1.4.0 // indirect
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829

2
pkg/config/config.go
View file

@ -224,6 +224,8 @@ func InitDefaultConfig() {
CorsEnable.setDefault(true) CorsEnable.setDefault(true)
CorsOrigins.setDefault([]string{"*"}) CorsOrigins.setDefault([]string{"*"})
CorsMaxAge.setDefault(0) CorsMaxAge.setDefault(0)
// Migration
MigrationWunderlistEnable.setDefault(false)
} }
// InitConfig initializes the config, sets defaults etc. // InitConfig initializes the config, sets defaults etc.