gemma: controllers/user.go annotate

annotate controllers/user.go @ 257:dfc2b035e055

Slimming down the signature of the JSONHandler type to not take the http.ResponseWriter. Idea of this handler is to simply transform JSON to JSON. The input is already parsed. The output is generated from JSONResult. So there is no need to pass the ResponseWriter to the handler function.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Fri, 27 Jul 2018 13:03:56 +0200
parents	de6fdb316b8f
children	ab9859981ee3

rev	line source
226 63dd5216eee4 Refactored gemma server to be more REST-like. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 218 diff changeset	1 package controllers
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	2
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	3 import (
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	4 "database/sql"
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	5 "database/sql/driver"
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	6 "encoding/json"
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	7 "errors"
254 de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	8 "fmt"
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	9 "net/http"
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	10 "regexp"
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	11 "strings"
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	12
241 3b688fe04c39 No omitempty if JSON serialising PostgreSQL errors. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 240 diff changeset	13 "github.com/gorilla/mux"
3b688fe04c39 No omitempty if JSON serialising PostgreSQL errors. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 240 diff changeset	14
240 9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	15 "gemma.intevation.de/gemma/auth"
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	16 )
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	17
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	18 type (
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	19 Email string
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	20 Country string
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	21 Role string
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	22
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	23 BoundingBox struct {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	24 X1 float64 `json:"x1"`
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	25 Y1 float64 `json:"y1"`
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	26 X2 float64 `json:"x2"`
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	27 Y2 float64 `json:"y2"`
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	28 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	29
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	30 User struct {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	31 User string `json:"user"`
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	32 Role Role `json:"role"`
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	33 Password string `json:"password,omitempty"`
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	34 Email Email `json:"email"`
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	35 Country Country `json:"country"`
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	36 Extent *BoundingBox `json:"extent"`
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	37 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	38 )
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	39
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	40 const (
216 494a257e7715 Called schema prefixed sys_admin.create_user instead of create_user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 206 diff changeset	41 createUserSQL = `SELECT sys_admin.create_user($1, $2, $3, $4, NULL, $5)`
494a257e7715 Called schema prefixed sys_admin.create_user instead of create_user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 206 diff changeset	42 createUserExtentSQL = `SELECT sys_admin.create_user($1, $2, $3, $4,
188 ee3093966a6d ST_SetSRID should be not need as the map extent column does not have any SRID code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 187 diff changeset	43 ST_MakeBox2D(ST_Point($5, $6), ST_Point($7, $8)), $9)`
235 7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	44
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	45 updateUserSQL = `SELECT sys_admin.update_user($1, $2, $3, $4, $5, NULL, $6)`
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	46 updateUserExtentSQL = `SELECT sys_admin.update_user($1, $2, $3, $4, $5,
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	47 ST_MakeBox2D(ST_Point($6, $7), ST_Point($8, $9)), $10)`
240 9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	48
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	49 deleteUserSQL = `SELECT sys_admin.delete_user($1)`
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	50
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	51 listUsersSQL = `SELECT
253 322c3d0e05ef The column in sys_admin.list_users is called rolname not rolename. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 250 diff changeset	52 rolname,
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	53 username,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	54 country,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	55 email_address,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	56 ST_XMin(map_extent), ST_YMin(map_extent),
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	57 ST_XMax(map_extent), ST_YMax(map_extent)
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	58 FROM sys_admin.list_users`
254 de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	59
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	60 listUserSQL = `SELECT
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	61 rolname,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	62 country,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	63 email_address,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	64 ST_XMin(map_extent), ST_YMin(map_extent),
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	65 ST_XMax(map_extent), ST_YMax(map_extent)
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	66 FROM sys_admin.list_users
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	67 WHERE username = $1`
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	68 )
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	69
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	70 var errNoString = errors.New("Not a string")
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	71
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	72 var (
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	73 // https://stackoverflow.com/questions/201323/how-to-validate-an-email-address-using-a-regular-expression
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	74 emailRe = regexp.MustCompile(
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	75 `(?:[a-z0-9!#$%&'*+/=?^_` + "`" +
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	76 `{\|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_` + "`" +
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	77 `{\|}~-]+)*\|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]` +
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	78 `\|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")` +
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	79 `@(?:(?:[a-z0-9](?:[a-z0-9-][a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-][a-z0-9])?` +
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	80 `\|\[(?:(?:(2(5[0-5]\|[0-4][0-9])\|1[0-9][0-9]\|[1-9]?[0-9]))\.){3}` +
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	81 `(?:(2(5[0-5]\|[0-4][0-9])\|1[0-9][0-9]\|[1-9]?[0-9])\|[a-z0-9-]*[a-z0-9]` +
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	82 `:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]` +
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	83 `\|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])`)
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	84 errNoEmailAddress = errors.New("Not a valid email address")
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	85 )
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	86
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	87 func (e *Email) UnmarshalJSON(data []byte) error {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	88 var s string
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	89 if err := json.Unmarshal(data, &s); err != nil {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	90 return err
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	91 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	92 if !emailRe.MatchString(s) {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	93 return errNoEmailAddress
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	94 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	95 *e = Email(s)
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	96 return nil
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	97 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	98
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	99 func (e Email) Value() (driver.Value, error) {
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	100 return string(e), nil
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	101 }
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	102
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	103 func (e *Email) Scan(src interface{}) (err error) {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	104 if s, ok := src.(string); ok {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	105 *e = Email(s)
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	106 } else {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	107 err = errNoString
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	108 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	109 return
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	110 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	111
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	112 var (
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	113 validCountries = []string{
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	114 "AT", "BG", "DE", "HU", "HR",
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	115 "MD", "RO", "RS", "SK", "UA",
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	116 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	117 errNoValidCountry = errors.New("Not a valid country")
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	118 )
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	119
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	120 func (c *Country) UnmarshalJSON(data []byte) error {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	121 var s string
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	122 if err := json.Unmarshal(data, &s); err != nil {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	123 return err
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	124 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	125 s = strings.ToUpper(s)
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	126 for _, v := range validCountries {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	127 if v == s {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	128 *c = Country(v)
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	129 return nil
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	130 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	131 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	132 return errNoValidCountry
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	133 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	134
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	135 func (c Country) Value() (driver.Value, error) {
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	136 return string(c), nil
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	137 }
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	138
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	139 func (c *Country) Scan(src interface{}) (err error) {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	140 if s, ok := src.(string); ok {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	141 *c = Country(s)
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	142 } else {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	143 err = errNoString
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	144 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	145 return
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	146 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	147
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	148 var (
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	149 validRoles = []string{
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	150 "waterway_user",
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	151 "waterway_admin",
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	152 "sys_admin",
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	153 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	154 errNoValidRole = errors.New("Not a valid role")
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	155 )
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	156
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	157 func (r Role) Value() (driver.Value, error) {
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	158 return string(r), nil
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	159 }
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	160
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	161 func (r *Role) Scan(src interface{}) (err error) {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	162 if s, ok := src.(string); ok {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	163 *r = Role(s)
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	164 } else {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	165 err = errNoString
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	166 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	167 return
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	168 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	169
189 96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	170 func (r *Role) UnmarshalJSON(data []byte) error {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	171 var s string
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	172 if err := json.Unmarshal(data, &s); err != nil {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	173 return err
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	174 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	175 s = strings.ToLower(s)
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	176 for _, v := range validRoles {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	177 if v == s {
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	178 *r = Role(v)
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	179 return nil
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	180 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	181 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	182 return errNoValidRole
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	183 }
96bb671cdd98 Some input checking for email, roles and valid countries. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 188 diff changeset	184
240 9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	185 func deleteUser(
257 dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	186 input interface{}, req *http.Request,
dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	187 db *sql.DB,
240 9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	188 ) (jr JSONResult, err error) {
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	189
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	190 user := mux.Vars(req)["user"]
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	191 if user == "" {
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	192 err = JSONError{http.StatusBadRequest, "error: user empty"}
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	193 return
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	194 }
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	195
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	196 session, _ := auth.GetSession(req)
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	197 if session.User == user {
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	198 err = JSONError{http.StatusBadRequest, "error: cannot delete yourself"}
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	199 return
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	200 }
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	201
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	202 if _, err = db.Exec(deleteUserSQL, user); err != nil {
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	203 return
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	204 }
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	205
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	206 // Running in a go routine should not be necessary.
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	207 go func() { auth.ConnPool.Logout(user) }()
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	208
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	209 jr = JSONResult{Code: http.StatusNoContent}
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	210 return
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	211 }
9012e4045da4 Implemented /user delete controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 237 diff changeset	212
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	213 func updateUser(
257 dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	214 input interface{}, req *http.Request,
dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	215 db *sql.DB,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	216 ) (jr JSONResult, err error) {
235 7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	217
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	218 user := mux.Vars(req)["user"]
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	219 if user == "" {
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	220 err = JSONError{http.StatusBadRequest, "error: user empty"}
235 7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	221 return
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	222 }
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	223
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	224 newUser := input.(*User)
235 7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	225
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	226 if newUser.Extent == nil {
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	227 _, err = db.Exec(
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	228 updateUserSQL,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	229 user,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	230 newUser.Role,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	231 newUser.User,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	232 newUser.Password,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	233 newUser.Country,
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	234 newUser.Email,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	235 )
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	236 } else {
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	237 _, err = db.Exec(
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	238 updateUserExtentSQL,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	239 user,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	240 newUser.Role,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	241 newUser.User,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	242 newUser.Password,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	243 newUser.Country,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	244 newUser.Extent.X1, newUser.Extent.Y1,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	245 newUser.Extent.X2, newUser.Extent.Y2,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	246 newUser.Email,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	247 )
235 7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	248 }
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	249
7d1f0ffdfa41 Implemented /users update controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 226 diff changeset	250 if err != nil {
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	251 return
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	252 }
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	253
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	254 jr = JSONResult{
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	255 Code: http.StatusCreated,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	256 Result: struct {
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	257 Result string `json:"result"`
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	258 }{
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	259 Result: "success",
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	260 },
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	261 }
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	262 return
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	263 }
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	264
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	265 func createUser(
257 dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	266 input interface{}, req *http.Request,
dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	267 db *sql.DB,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	268 ) (jr JSONResult, err error) {
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	269
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	270 user := input.(*User)
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	271
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	272 if user.Extent == nil {
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	273 _, err = db.Exec(
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	274 createUserSQL,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	275 user.Role,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	276 user.User,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	277 user.Password,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	278 user.Country,
d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	279 user.Email,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	280 )
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	281 } else {
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	282 _, err = db.Exec(
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	283 createUserExtentSQL,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	284 user.Role,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	285 user.User,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	286 user.Password,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	287 user.Country,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	288 user.Extent.X1, user.Extent.Y1,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	289 user.Extent.X2, user.Extent.Y2,
243 d39f897fae16 Made models for email, user and country driver.Valuer to get rid of some conversions. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 241 diff changeset	290 user.Email,
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	291 )
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	292 }
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	293
187 51addc0533fe More complete show case for creating users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 186 diff changeset	294 if err != nil {
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	295 return
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	296 }
fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	297
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	298 jr = JSONResult{
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	299 Code: http.StatusCreated,
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	300 Result: struct {
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	301 Result string `json:"result"`
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	302 }{
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	303 Result: "success",
3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	304 },
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	305 }
237 3771788d3dae Reduce boilerplate code when writing JSON parsing/generating endpoints. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 235 diff changeset	306 return
186 fe3a88f00b0a Experimental user creation support. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	307 }
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	308
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	309 func listUsers(
257 dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	310 input interface{}, req *http.Request,
dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	311 db *sql.DB,
250 deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	312 ) (jr JSONResult, err error) {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	313
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	314 var rows *sql.Rows
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	315
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	316 rows, err = db.Query(listUsersSQL)
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	317 if err != nil {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	318 return
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	319 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	320 defer rows.Close()
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	321
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	322 var users []*User
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	323
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	324 for rows.Next() {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	325 user := &User{Extent: &BoundingBox{}}
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	326 if err = rows.Scan(
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	327 &user.Role,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	328 &user.User,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	329 &user.Country,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	330 &user.Email,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	331 &user.Extent.X1, &user.Extent.Y1,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	332 &user.Extent.X2, &user.Extent.Y2,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	333 ); err != nil {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	334 return
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	335 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	336 users = append(users, user)
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	337 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	338
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	339 jr = JSONResult{
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	340 Result: struct {
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	341 Users []*User `json:"users"`
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	342 }{
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	343 Users: users,
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	344 },
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	345 }
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	346 return
deabc2712634 Implemented /users GET as list of users. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 243 diff changeset	347 }
254 de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	348
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	349 func listUser(
257 dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	350 input interface{}, req *http.Request,
dfc2b035e055 Slimming down the signature of the JSONHandler type to Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 254 diff changeset	351 db *sql.DB,
254 de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	352 ) (jr JSONResult, err error) {
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	353
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	354 user := mux.Vars(req)["user"]
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	355 if user == "" {
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	356 err = JSONError{http.StatusBadRequest, "error: user empty"}
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	357 return
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	358 }
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	359
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	360 result := &User{
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	361 User: user,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	362 Extent: &BoundingBox{},
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	363 }
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	364
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	365 err = db.QueryRow(listUserSQL, user).Scan(
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	366 &result.Role,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	367 &result.Country,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	368 &result.Email,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	369 &result.Extent.X1, &result.Extent.Y1,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	370 &result.Extent.X2, &result.Extent.Y2,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	371 )
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	372
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	373 switch {
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	374 case err == sql.ErrNoRows:
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	375 err = JSONError{
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	376 Code: http.StatusNotFound,
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	377 Message: fmt.Sprintf("Cannot find user %s.", user),
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	378 }
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	379 return
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	380 case err != nil:
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	381 return
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	382 }
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	383
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	384 jr.Result = result
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	385 return
de6fdb316b8f Implemented /users/{user} GET a listing of given user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 253 diff changeset	386 }

Mercurial > gemma

annotate controllers/user.go @ 257:dfc2b035e055