diff --git a/go.mod b/go.mod index 10c02c68abe..9b804bb481c 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ module code.vikunja.io/api require ( cloud.google.com/go v0.30.0 // indirect - code.vikunja.io/web v0.0.0-20181130221802-d23d2a4c1efb + code.vikunja.io/web v0.0.0-20181130231148-b061c20192fb github.com/BurntSushi/toml v0.3.1 // indirect github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf diff --git a/go.sum b/go.sum index b3cc208a960..30d0a35eedc 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ cloud.google.com/go v0.30.0 h1:xKvyLgk56d0nksWq49J0UyGEeUIicTl4+UBiX1NPX9g= cloud.google.com/go v0.30.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= code.vikunja.io/web v0.0.0-20181130221802-d23d2a4c1efb h1:OyXe+z31V3xUUEOv/kVJmkfp/9y/YdlaKjfhGpDAmNQ= code.vikunja.io/web v0.0.0-20181130221802-d23d2a4c1efb/go.mod h1:PmGEu9qI7nbEKDn38H0SWgCoGO4GLdbjdlnWSzFi2PA= +code.vikunja.io/web v0.0.0-20181130231148-b061c20192fb h1:LROmRUOGTxOpOxKy9S6XONDnT+t0v0j8+MZCedssTCc= +code.vikunja.io/web v0.0.0-20181130231148-b061c20192fb/go.mod h1:PmGEu9qI7nbEKDn38H0SWgCoGO4GLdbjdlnWSzFi2PA= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4= @@ -61,8 +63,11 @@ github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/karalabe/xgo v0.0.0-20181007145344-72da7d1d3970 h1:0+1ZURVRim6FxA/jhWhJklsgoWc69q1sxlIu2Ztnhy0= github.com/karalabe/xgo v0.0.0-20181007145344-72da7d1d3970/go.mod h1:iYGcTYIPUvEWhFo6aKUuLchs+AV4ssYdyuBbQJZGcBk= +github.com/labstack/echo v0.0.0-20181130002821-a8de73efbeae h1:NU4N1Ysm6sj4MPMPLhuakxbodt++hg2oFvMVnsk5Oz0= +github.com/labstack/echo v0.0.0-20181130002821-a8de73efbeae/go.mod h1:rS0D1UPvC8/3sXjhSwEq+K1olh7ipbDhjDWATN2KSgA= github.com/labstack/echo v3.3.5+incompatible h1:9PfxPUmasKzeJor9uQTaXLT6WUG/r+vSTmvXxvv3JO4= github.com/labstack/echo v3.3.5+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s= +github.com/labstack/gommon v0.2.7/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4= github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0= github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= @@ -121,6 +126,7 @@ github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QI github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= +golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85 h1:et7+NAX3lLIk5qUCTA9QelBjGE/NkhzYw/mhnr0s7nI= golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3 h1:x/bBzNauLQAlE3fLku/xy92Y8QwKX5HZymrMz2IiKFc= @@ -129,6 +135,7 @@ golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCv golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992 h1:BH3eQWeGbwRU2+wxxuuPOdFBmaiBH81O8BugSjHeTFg= golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 h1:YAFjXN64LMvktoUZH9zgY4lGc/msGN7HQfoSuKCgaDU= golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= diff --git a/vendor/code.vikunja.io/web/LICENSE b/vendor/code.vikunja.io/web/LICENSE new file mode 100644 index 00000000000..0a041280bd0 --- /dev/null +++ b/vendor/code.vikunja.io/web/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/vendor/code.vikunja.io/web/Readme.md b/vendor/code.vikunja.io/web/Readme.md new file mode 100644 index 00000000000..417dc192555 --- /dev/null +++ b/vendor/code.vikunja.io/web/Readme.md @@ -0,0 +1,200 @@ +# Vikunja Web Handler + +[![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](LICENSE) +[![Go Report Card](https://goreportcard.com/badge/code.vikunja.io/web)](https://goreportcard.com/report/code.vikunja.io/web) + +> When I started Vikunja, I started like everyone else, by writing a bunch of functions to do the logic and then a bunch of +handler functions to parse the request data and call the implemented functions to do the logic and eventually return a dataset. +After I implemented some functions, I've decided to save me a lot of hassle and put most of that "parse the request and call a +processing function"-logic to a general interface to facilitate development and not having to have a lot of similar code all over the place. + +This webhandler was built to be used in a REST-API, it takes and returns JSON, but can also be used in combination with own other handler +implementations thus leading to much flexibility. + +## Features + +* Easy to use +* Built for REST-APIs +* Beautiful error handling built in +* Manages rights +* Pluggable authentication mechanisms + +## Table of contents + +* [Installation](#installation) +* [CRUDable](#crudable) +* [Rights](#rights) +* [Handler Config](#handler-config) + * [Auth](#auth) + * [Logging](#logging) + * [Full Example](#full-example) +* [Preprocessing](#preprocessing) + * [Pagination](#pagination) + * [Search](#search) +* [Standard web handler](#standard-web-handler) +* [Errors](#errors) +* [URL param binder](#how-the-url-param-binder-works) + +## Installation + +Using the web handler in your application is pretty straight forward, simply run `go get -u code.vikunja.io/web` and start using it. + +In order to use the common web handler, the struct must implement the `web.CRUDable` and `web.Rights` interface. + +## CRUDable + +This interface defines methods to Create/Read/ReadAll/Update/Delete something. It is defined as followed: + +```go +type CRUDable interface { + Create(Auth) error + ReadOne() error + ReadAll(string, Auth, int) (interface{}, error) + Update() error + Delete() error +} +``` + +Each of these methods is called on an instance of a struct like so: + +```go +func (l *List) ReadOne() (err error) { + *l, err = GetListByID(l.ID) + return +} +``` + +In that case, it takes the `ID` saved in the struct instance, gets the full list object and fills the original object with it. +(See parambinder to understand where that `ID` is coming from). + +All functions should behave like this, if they create or update something, they should return the created/updated struct +instance. The only exception is `ReadAll()` which returns an interface. Usually this is an array, because, well you cannot +make an array of a set type (If you know a way to do this, don't hesitate to drop me a message). + +## Rights + +This interface defines methods to check for rights on structs. They accept an `Auth`-element as parameter and return a `bool`. + +The interface is defined as followed: + +```go +type Rights interface { + IsAdmin(Auth) bool + CanWrite(Auth) bool + CanRead(Auth) bool + CanDelete(Auth) bool + CanUpdate(Auth) bool + CanCreate(Auth) bool +} +``` + +When using the standard web handler, all methods except `CanRead()` are called before their `CRUD` counterparts. `CanRead()` +is called after `ReadOne()` was invoked as this would otherwise mean getting an object from the db to check if the user has the +right to see it and then getting it again if thats the case. Calling the function afterwards means we only have to get the +object once. + +## Handler Config + +The handler has some options which you can (and need to) configure. + +#### Auth + +`Auth` is an interface with some methods to decouple the action of getting the current user from the web handler. +The function defined via `Auths` should return a struct which implements the `Auth` interface. + +To define the thing which gets the appropriate auth object, you need to call a middleware like so (After all auth middlewares were called): + +#### Logging + +You can provide your own instance of `logger.Logger` (using [this package](https://github.com/op/go-logging)) to the handler. +It will use this instance to log errors which are not better specified or things like users trying to do something they're +not allowed to do and so on. + +#### Full Example + +```go +e.Use(func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + c.Set("AuthProvider", &web.Auths{ + AuthObject: func(echo.Context) (web.Auth, error) { + return models.GetCurrentUser(c) // Your functions + }, + }) + c.Set("LoggingProvider", &log.Log) + return next(c) + } +}) +``` + +## Preprocessing + +### Pagination + +When using the `ReadAll`-method, the third parameter contains the requested page. Your function should return only the number of results +corresponding to that page. The number of items per page is definied in the config as `service.pagecount` (Get it with `viper.GetInt("service.pagecount")`). + +These can be calculated in combination with a helper function, `getLimitFromPageIndex(pageIndex)` which returns +SQL-needed `limit` (max-length) and `offset` parameters. You can feed this function directly into xorm's `Limit`-Function like so: + +```go +lists := []List{} +err := x.Limit(getLimitFromPageIndex(pageIndex)).Find(&lists) +``` + +### Search + +When using the `ReadAll`-method, the first parameter is a search term which should be used to search items of your struct. You define the critera. + +Users can then pass the `?s=something` parameter to the url to search. + +As the logic for "give me everything" and "give me everything where the name contains 'something'" is mostly the same, we made the decision to design +the function like this, in order to keep the places with mostly the same logic as few as possible. Also just adding `?s=query` to the url one already +knows and uses is a lot more convenient. + +## Standard web handler + +You can define routes for the standard web handler like so: + +`models.List` needs to implement `web.CRUDable` and `web.Rights`. + +```go +listHandler := &crud.WebHandler{ + EmptyStruct: func() crud.CObject { + return &models.List{} + }, + } + a.GET("/lists", listHandler.ReadAllWeb) + a.GET("/lists/:list", listHandler.ReadOneWeb) + a.POST("/lists/:list", listHandler.UpdateWeb) + a.DELETE("/lists/:list", listHandler.DeleteWeb) + a.PUT("/namespaces/:namespace/lists", listHandler.CreateWeb) +``` + +The handler will take care of everything like parsing the request, checking rights, pretty-print errors and return appropriate responses. + +## Errors + +Error types with their messages and http-codes should be implemented by you somewhere in your application and then returned by +the appropriate function when an error occures. If the error type implements `HTTPError`, the server returns a user-friendly +error message when this error occours. This means it returns a good HTTP status code, a message, and an error code. The error +code should be unique across all error codes and can be used on the client to show a localized error message or do other stuff +based on the exact error the server returns. That way the client won't have to "guess" that the error message remains the same +over multiple versions of your application. + +An `HTTPError` is defined as follows: + +```go +type HTTPError struct { + HTTPCode int `json:"-"` // Can be any valid HTTP status code, I'd reccomend to use the constants of the http package. + Code int `json:"code"` // Must be a uniqe int identifier for this specific error. I'd reccomend defining a constant for this. + Message string `json:"message"` // A user-readable message what went wrong. +} +``` + +## How the url param binder works + +The binder binds all values inside the url to their respective fields in a struct. Those fields need to have a tag +"param" with the name of the url placeholder which must be the same as in routes. + +Whenever one of the standard CRUD methods is invoked, this binder is called, which enables one handler method +to handle all kinds of different urls with different parameters. diff --git a/vendor/code.vikunja.io/web/handler/create.go b/vendor/code.vikunja.io/web/handler/create.go index a09b1381d8b..1ab69e25890 100644 --- a/vendor/code.vikunja.io/web/handler/create.go +++ b/vendor/code.vikunja.io/web/handler/create.go @@ -1,18 +1,17 @@ -// Vikunja is a todo-list application to facilitate your life. -// Copyright 2018 Vikunja and contributors. All rights reserved. +// Copyright (c) 2018 Vikunja and contributors. // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Lesser General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Lesser General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . package handler diff --git a/vendor/code.vikunja.io/web/handler/delete.go b/vendor/code.vikunja.io/web/handler/delete.go index 21790aac3ff..9a4c49a94fa 100644 --- a/vendor/code.vikunja.io/web/handler/delete.go +++ b/vendor/code.vikunja.io/web/handler/delete.go @@ -1,18 +1,17 @@ -// Vikunja is a todo-list application to facilitate your life. -// Copyright 2018 Vikunja and contributors. All rights reserved. +// Copyright (c) 2018 Vikunja and contributors. // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Lesser General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Lesser General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . package handler diff --git a/vendor/code.vikunja.io/web/handler/helper.go b/vendor/code.vikunja.io/web/handler/helper.go index de010ca2874..2e1bf929bb3 100644 --- a/vendor/code.vikunja.io/web/handler/helper.go +++ b/vendor/code.vikunja.io/web/handler/helper.go @@ -1,18 +1,17 @@ -// Vikunja is a todo-list application to facilitate your life. -// Copyright 2018 Vikunja and contributors. All rights reserved. +// Copyright (c) 2018 Vikunja and contributors. // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Lesser General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Lesser General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . package handler diff --git a/vendor/code.vikunja.io/web/handler/paramBinder.go b/vendor/code.vikunja.io/web/handler/paramBinder.go index 7caf4c4338a..b9effd2874c 100644 --- a/vendor/code.vikunja.io/web/handler/paramBinder.go +++ b/vendor/code.vikunja.io/web/handler/paramBinder.go @@ -1,18 +1,17 @@ -// Vikunja is a todo-list application to facilitate your life. -// Copyright 2018 Vikunja and contributors. All rights reserved. +// Copyright (c) 2018 Vikunja and contributors. // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Lesser General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Lesser General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . package handler diff --git a/vendor/code.vikunja.io/web/handler/read_all.go b/vendor/code.vikunja.io/web/handler/read_all.go index 9b28955b5f3..f09a130caf7 100644 --- a/vendor/code.vikunja.io/web/handler/read_all.go +++ b/vendor/code.vikunja.io/web/handler/read_all.go @@ -1,18 +1,17 @@ -// Vikunja is a todo-list application to facilitate your life. -// Copyright 2018 Vikunja and contributors. All rights reserved. +// Copyright (c) 2018 Vikunja and contributors. // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Lesser General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Lesser General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . package handler diff --git a/vendor/code.vikunja.io/web/handler/read_one.go b/vendor/code.vikunja.io/web/handler/read_one.go index e840f2ee619..4bae48a167a 100644 --- a/vendor/code.vikunja.io/web/handler/read_one.go +++ b/vendor/code.vikunja.io/web/handler/read_one.go @@ -1,18 +1,17 @@ -// Vikunja is a todo-list application to facilitate your life. -// Copyright 2018 Vikunja and contributors. All rights reserved. +// Copyright (c) 2018 Vikunja and contributors. // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Lesser General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Lesser General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . package handler diff --git a/vendor/code.vikunja.io/web/handler/update.go b/vendor/code.vikunja.io/web/handler/update.go index 3b265671bdb..504c27eea2a 100644 --- a/vendor/code.vikunja.io/web/handler/update.go +++ b/vendor/code.vikunja.io/web/handler/update.go @@ -1,18 +1,17 @@ -// Vikunja is a todo-list application to facilitate your life. -// Copyright 2018 Vikunja and contributors. All rights reserved. +// Copyright (c) 2018 Vikunja and contributors. // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Lesser General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Lesser General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . package handler diff --git a/vendor/code.vikunja.io/web/web.go b/vendor/code.vikunja.io/web/web.go index a3941e0fbab..e37ee73963b 100644 --- a/vendor/code.vikunja.io/web/web.go +++ b/vendor/code.vikunja.io/web/web.go @@ -1,18 +1,17 @@ -// Vikunja is a todo-list application to facilitate your life. -// Copyright 2018 Vikunja and contributors. All rights reserved. +// Copyright (c) 2018 Vikunja and contributors. // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Lesser General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Lesser General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . package web diff --git a/vendor/modules.txt b/vendor/modules.txt index f44995e7605..5959d1004c9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# code.vikunja.io/web v0.0.0-20181130221802-d23d2a4c1efb +# code.vikunja.io/web v0.0.0-20181130231148-b061c20192fb code.vikunja.io/web code.vikunja.io/web/handler # github.com/PuerkitoBio/purell v1.1.0