Add missing raw&has for post&get

system/rest/request/application.go

@@ -117,27 +117,43 @@ func (r *ApplicationList) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 	if val, ok := get["query"]; ok {
+		r.hasQuery = true
+		r.rawQuery = val
 		r.Query = val
 	}
 	if val, ok := get["deleted"]; ok {
+		r.hasDeleted = true
+		r.rawDeleted = val
 		r.Deleted = parseUint(val)
 	}
 	if val, ok := get["limit"]; ok {
+		r.hasLimit = true
+		r.rawLimit = val
 		r.Limit = parseUint(val)
 	}
 	if val, ok := get["offset"]; ok {
+		r.hasOffset = true
+		r.rawOffset = val
 		r.Offset = parseUint(val)
 	}
 	if val, ok := get["page"]; ok {
+		r.hasPage = true
+		r.rawPage = val
 		r.Page = parseUint(val)
 	}
 	if val, ok := get["perPage"]; ok {
+		r.hasPerPage = true
+		r.rawPerPage = val
 		r.PerPage = parseUint(val)
 	}
 	if val, ok := get["sort"]; ok {
+		r.hasSort = true
+		r.rawSort = val
 		r.Sort = val
 	}
 
@@ -211,18 +227,26 @@ func (r *ApplicationCreate) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 	if val, ok := post["enabled"]; ok {
+		r.hasEnabled = true
+		r.rawEnabled = val
 		r.Enabled = parseBool(val)
 	}
 	if val, ok := post["unify"]; ok {
+		r.hasUnify = true
+		r.rawUnify = val
 
 		if r.Unify, err = parseJSONTextWithErr(val); err != nil {
 			return err
 		}
 	}
 	if val, ok := post["config"]; ok {
+		r.hasConfig = true
+		r.rawConfig = val
 
 		if r.Config, err = parseJSONTextWithErr(val); err != nil {
 			return err
@@ -307,18 +331,26 @@ func (r *ApplicationUpdate) Fill(req *http.Request) (err error) {
 	r.rawApplicationID = chi.URLParam(req, "applicationID")
 	r.ApplicationID = parseUInt64(chi.URLParam(req, "applicationID"))
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 	if val, ok := post["enabled"]; ok {
+		r.hasEnabled = true
+		r.rawEnabled = val
 		r.Enabled = parseBool(val)
 	}
 	if val, ok := post["unify"]; ok {
+		r.hasUnify = true
+		r.rawUnify = val
 
 		if r.Unify, err = parseJSONTextWithErr(val); err != nil {
 			return err
 		}
 	}
 	if val, ok := post["config"]; ok {
+		r.hasConfig = true
+		r.rawConfig = val
 
 		if r.Config, err = parseJSONTextWithErr(val); err != nil {
 			return err
@@ -562,6 +594,8 @@ func (r *ApplicationTriggerScript) Fill(req *http.Request) (err error) {
 	r.rawApplicationID = chi.URLParam(req, "applicationID")
 	r.ApplicationID = parseUInt64(chi.URLParam(req, "applicationID"))
 	if val, ok := post["script"]; ok {
+		r.hasScript = true
+		r.rawScript = val
 		r.Script = val
 	}
 

system/rest/request/auth.go

@@ -178,6 +178,8 @@ func (r *AuthExchangeAuthToken) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["token"]; ok {
+		r.hasToken = true
+		r.rawToken = val
 		r.Token = val
 	}
 

system/rest/request/auth_internal.go

@@ -85,9 +85,13 @@ func (r *AuthInternalLogin) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["email"]; ok {
+		r.hasEmail = true
+		r.rawEmail = val
 		r.Email = val
 	}
 	if val, ok := post["password"]; ok {
+		r.hasPassword = true
+		r.rawPassword = val
 		r.Password = val
 	}
 
@@ -167,18 +171,28 @@ func (r *AuthInternalSignup) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["email"]; ok {
+		r.hasEmail = true
+		r.rawEmail = val
 		r.Email = val
 	}
 	if val, ok := post["username"]; ok {
+		r.hasUsername = true
+		r.rawUsername = val
 		r.Username = val
 	}
 	if val, ok := post["password"]; ok {
+		r.hasPassword = true
+		r.rawPassword = val
 		r.Password = val
 	}
 	if val, ok := post["handle"]; ok {
+		r.hasHandle = true
+		r.rawHandle = val
 		r.Handle = val
 	}
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 
@@ -237,6 +251,8 @@ func (r *AuthInternalRequestPasswordReset) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["email"]; ok {
+		r.hasEmail = true
+		r.rawEmail = val
 		r.Email = val
 	}
 
@@ -295,6 +311,8 @@ func (r *AuthInternalExchangePasswordResetToken) Fill(req *http.Request) (err er
 	}
 
 	if val, ok := post["token"]; ok {
+		r.hasToken = true
+		r.rawToken = val
 		r.Token = val
 	}
 
@@ -358,9 +376,13 @@ func (r *AuthInternalResetPassword) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["token"]; ok {
+		r.hasToken = true
+		r.rawToken = val
 		r.Token = val
 	}
 	if val, ok := post["password"]; ok {
+		r.hasPassword = true
+		r.rawPassword = val
 		r.Password = val
 	}
 
@@ -419,6 +441,8 @@ func (r *AuthInternalConfirmEmail) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["token"]; ok {
+		r.hasToken = true
+		r.rawToken = val
 		r.Token = val
 	}
 
@@ -483,9 +507,13 @@ func (r *AuthInternalChangePassword) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["oldPassword"]; ok {
+		r.hasOldPassword = true
+		r.rawOldPassword = val
 		r.OldPassword = val
 	}
 	if val, ok := post["newPassword"]; ok {
+		r.hasNewPassword = true
+		r.rawNewPassword = val
 		r.NewPassword = val
 	}
 

system/rest/request/automation.go

@@ -135,12 +135,18 @@ func (r *AutomationList) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["excludeInvalid"]; ok {
+		r.hasExcludeInvalid = true
+		r.rawExcludeInvalid = val
 		r.ExcludeInvalid = parseBool(val)
 	}
 	if val, ok := get["excludeClientScripts"]; ok {
+		r.hasExcludeClientScripts = true
+		r.rawExcludeClientScripts = val
 		r.ExcludeClientScripts = parseBool(val)
 	}
 	if val, ok := get["excludeServerScripts"]; ok {
+		r.hasExcludeServerScripts = true
+		r.rawExcludeServerScripts = val
 		r.ExcludeServerScripts = parseBool(val)
 	}
 
@@ -273,6 +279,8 @@ func (r *AutomationTriggerScript) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["script"]; ok {
+		r.hasScript = true
+		r.rawScript = val
 		r.Script = val
 	}
 

system/rest/request/organisation.go

@@ -80,6 +80,8 @@ func (r *OrganisationList) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["query"]; ok {
+		r.hasQuery = true
+		r.rawQuery = val
 		r.Query = val
 	}
 
@@ -138,6 +140,8 @@ func (r *OrganisationCreate) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 
@@ -204,6 +208,8 @@ func (r *OrganisationUpdate) Fill(req *http.Request) (err error) {
 	r.rawID = chi.URLParam(req, "id")
 	r.ID = parseUInt64(chi.URLParam(req, "id"))
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 

system/rest/request/permissions.go

@@ -131,6 +131,8 @@ func (r *PermissionsEffective) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["resource"]; ok {
+		r.hasResource = true
+		r.rawResource = val
 		r.Resource = val
 	}
 

system/rest/request/reminder.go

@@ -148,42 +148,64 @@ func (r *ReminderList) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["resource"]; ok {
+		r.hasResource = true
+		r.rawResource = val
 		r.Resource = val
 	}
 	if val, ok := get["assignedTo"]; ok {
+		r.hasAssignedTo = true
+		r.rawAssignedTo = val
 		r.AssignedTo = parseUInt64(val)
 	}
 	if val, ok := get["scheduledFrom"]; ok {
+		r.hasScheduledFrom = true
+		r.rawScheduledFrom = val
 
 		if r.ScheduledFrom, err = parseISODatePtrWithErr(val); err != nil {
 			return err
 		}
 	}
 	if val, ok := get["scheduledUntil"]; ok {
+		r.hasScheduledUntil = true
+		r.rawScheduledUntil = val
 
 		if r.ScheduledUntil, err = parseISODatePtrWithErr(val); err != nil {
 			return err
 		}
 	}
 	if val, ok := get["scheduledOnly"]; ok {
+		r.hasScheduledOnly = true
+		r.rawScheduledOnly = val
 		r.ScheduledOnly = parseBool(val)
 	}
 	if val, ok := get["excludeDismissed"]; ok {
+		r.hasExcludeDismissed = true
+		r.rawExcludeDismissed = val
 		r.ExcludeDismissed = parseBool(val)
 	}
 	if val, ok := get["limit"]; ok {
+		r.hasLimit = true
+		r.rawLimit = val
 		r.Limit = parseUint(val)
 	}
 	if val, ok := get["offset"]; ok {
+		r.hasOffset = true
+		r.rawOffset = val
 		r.Offset = parseUint(val)
 	}
 	if val, ok := get["page"]; ok {
+		r.hasPage = true
+		r.rawPage = val
 		r.Page = parseUint(val)
 	}
 	if val, ok := get["perPage"]; ok {
+		r.hasPerPage = true
+		r.rawPerPage = val
 		r.PerPage = parseUint(val)
 	}
 	if val, ok := get["sort"]; ok {
+		r.hasSort = true
+		r.rawSort = val
 		r.Sort = val
 	}
 
@@ -257,18 +279,26 @@ func (r *ReminderCreate) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["resource"]; ok {
+		r.hasResource = true
+		r.rawResource = val
 		r.Resource = val
 	}
 	if val, ok := post["assignedTo"]; ok {
+		r.hasAssignedTo = true
+		r.rawAssignedTo = val
 		r.AssignedTo = parseUInt64(val)
 	}
 	if val, ok := post["payload"]; ok {
+		r.hasPayload = true
+		r.rawPayload = val
 
 		if r.Payload, err = parseJSONTextWithErr(val); err != nil {
 			return err
 		}
 	}
 	if val, ok := post["remindAt"]; ok {
+		r.hasRemindAt = true
+		r.rawRemindAt = val
 
 		if r.RemindAt, err = parseISODatePtrWithErr(val); err != nil {
 			return err
@@ -353,18 +383,26 @@ func (r *ReminderUpdate) Fill(req *http.Request) (err error) {
 	r.rawReminderID = chi.URLParam(req, "reminderID")
 	r.ReminderID = parseUInt64(chi.URLParam(req, "reminderID"))
 	if val, ok := post["resource"]; ok {
+		r.hasResource = true
+		r.rawResource = val
 		r.Resource = val
 	}
 	if val, ok := post["assignedTo"]; ok {
+		r.hasAssignedTo = true
+		r.rawAssignedTo = val
 		r.AssignedTo = parseUInt64(val)
 	}
 	if val, ok := post["payload"]; ok {
+		r.hasPayload = true
+		r.rawPayload = val
 
 		if r.Payload, err = parseJSONTextWithErr(val); err != nil {
 			return err
 		}
 	}
 	if val, ok := post["remindAt"]; ok {
+		r.hasRemindAt = true
+		r.rawRemindAt = val
 
 		if r.RemindAt, err = parseISODatePtrWithErr(val); err != nil {
 			return err
@@ -608,6 +646,8 @@ func (r *ReminderSnooze) Fill(req *http.Request) (err error) {
 	r.rawReminderID = chi.URLParam(req, "reminderID")
 	r.ReminderID = parseUInt64(chi.URLParam(req, "reminderID"))
 	if val, ok := post["remindAt"]; ok {
+		r.hasRemindAt = true
+		r.rawRemindAt = val
 
 		if r.RemindAt, err = parseISODatePtrWithErr(val); err != nil {
 			return err

system/rest/request/role.go

@@ -115,27 +115,43 @@ func (r *RoleList) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["query"]; ok {
+		r.hasQuery = true
+		r.rawQuery = val
 		r.Query = val
 	}
 	if val, ok := get["deleted"]; ok {
+		r.hasDeleted = true
+		r.rawDeleted = val
 		r.Deleted = parseUint(val)
 	}
 	if val, ok := get["archived"]; ok {
+		r.hasArchived = true
+		r.rawArchived = val
 		r.Archived = parseUint(val)
 	}
 	if val, ok := get["limit"]; ok {
+		r.hasLimit = true
+		r.rawLimit = val
 		r.Limit = parseUint(val)
 	}
 	if val, ok := get["offset"]; ok {
+		r.hasOffset = true
+		r.rawOffset = val
 		r.Offset = parseUint(val)
 	}
 	if val, ok := get["page"]; ok {
+		r.hasPage = true
+		r.rawPage = val
 		r.Page = parseUint(val)
 	}
 	if val, ok := get["perPage"]; ok {
+		r.hasPerPage = true
+		r.rawPerPage = val
 		r.PerPage = parseUint(val)
 	}
 	if val, ok := get["sort"]; ok {
+		r.hasSort = true
+		r.rawSort = val
 		r.Sort = val
 	}
 
@@ -204,9 +220,13 @@ func (r *RoleCreate) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 	if val, ok := post["handle"]; ok {
+		r.hasHandle = true
+		r.rawHandle = val
 		r.Handle = val
 	}
 
@@ -289,9 +309,13 @@ func (r *RoleUpdate) Fill(req *http.Request) (err error) {
 	r.rawRoleID = chi.URLParam(req, "roleID")
 	r.RoleID = parseUInt64(chi.URLParam(req, "roleID"))
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 	if val, ok := post["handle"]; ok {
+		r.hasHandle = true
+		r.rawHandle = val
 		r.Handle = val
 	}
 
@@ -654,6 +678,8 @@ func (r *RoleMove) Fill(req *http.Request) (err error) {
 	r.rawRoleID = chi.URLParam(req, "roleID")
 	r.RoleID = parseUInt64(chi.URLParam(req, "roleID"))
 	if val, ok := post["organisationID"]; ok {
+		r.hasOrganisationID = true
+		r.rawOrganisationID = val
 		r.OrganisationID = parseUInt64(val)
 	}
 
@@ -720,6 +746,8 @@ func (r *RoleMerge) Fill(req *http.Request) (err error) {
 	r.rawRoleID = chi.URLParam(req, "roleID")
 	r.RoleID = parseUInt64(chi.URLParam(req, "roleID"))
 	if val, ok := post["destination"]; ok {
+		r.hasDestination = true
+		r.rawDestination = val
 		r.Destination = parseUInt64(val)
 	}
 
@@ -976,6 +1004,8 @@ func (r *RoleTriggerScript) Fill(req *http.Request) (err error) {
 	r.rawRoleID = chi.URLParam(req, "roleID")
 	r.RoleID = parseUInt64(chi.URLParam(req, "roleID"))
 	if val, ok := post["script"]; ok {
+		r.hasScript = true
+		r.rawScript = val
 		r.Script = val
 	}
 

system/rest/request/settings.go

@@ -82,6 +82,8 @@ func (r *SettingsList) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["prefix"]; ok {
+		r.hasPrefix = true
+		r.rawPrefix = val
 		r.Prefix = val
 	}
 
@@ -199,6 +201,8 @@ func (r *SettingsGet) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["ownerID"]; ok {
+		r.hasOwnerID = true
+		r.rawOwnerID = val
 		r.OwnerID = parseUInt64(val)
 	}
 	r.hasKey = true

system/rest/request/user.go

@@ -177,45 +177,73 @@ func (r *UserList) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := get["query"]; ok {
+		r.hasQuery = true
+		r.rawQuery = val
 		r.Query = val
 	}
 	if val, ok := get["username"]; ok {
+		r.hasUsername = true
+		r.rawUsername = val
 		r.Username = val
 	}
 	if val, ok := get["email"]; ok {
+		r.hasEmail = true
+		r.rawEmail = val
 		r.Email = val
 	}
 	if val, ok := get["handle"]; ok {
+		r.hasHandle = true
+		r.rawHandle = val
 		r.Handle = val
 	}
 	if val, ok := get["kind"]; ok {
+		r.hasKind = true
+		r.rawKind = val
 		r.Kind = types.UserKind(val)
 	}
 	if val, ok := get["incDeleted"]; ok {
+		r.hasIncDeleted = true
+		r.rawIncDeleted = val
 		r.IncDeleted = parseBool(val)
 	}
 	if val, ok := get["incSuspended"]; ok {
+		r.hasIncSuspended = true
+		r.rawIncSuspended = val
 		r.IncSuspended = parseBool(val)
 	}
 	if val, ok := get["deleted"]; ok {
+		r.hasDeleted = true
+		r.rawDeleted = val
 		r.Deleted = parseUint(val)
 	}
 	if val, ok := get["suspended"]; ok {
+		r.hasSuspended = true
+		r.rawSuspended = val
 		r.Suspended = parseUint(val)
 	}
 	if val, ok := get["limit"]; ok {
+		r.hasLimit = true
+		r.rawLimit = val
 		r.Limit = parseUint(val)
 	}
 	if val, ok := get["offset"]; ok {
+		r.hasOffset = true
+		r.rawOffset = val
 		r.Offset = parseUint(val)
 	}
 	if val, ok := get["page"]; ok {
+		r.hasPage = true
+		r.rawPage = val
 		r.Page = parseUint(val)
 	}
 	if val, ok := get["perPage"]; ok {
+		r.hasPerPage = true
+		r.rawPerPage = val
 		r.PerPage = parseUint(val)
 	}
 	if val, ok := get["sort"]; ok {
+		r.hasSort = true
+		r.rawSort = val
 		r.Sort = val
 	}
 
@@ -289,15 +317,23 @@ func (r *UserCreate) Fill(req *http.Request) (err error) {
 	}
 
 	if val, ok := post["email"]; ok {
+		r.hasEmail = true
+		r.rawEmail = val
 		r.Email = val
 	}
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 	if val, ok := post["handle"]; ok {
+		r.hasHandle = true
+		r.rawHandle = val
 		r.Handle = val
 	}
 	if val, ok := post["kind"]; ok {
+		r.hasKind = true
+		r.rawKind = val
 		r.Kind = types.UserKind(val)
 	}
 
@@ -379,15 +415,23 @@ func (r *UserUpdate) Fill(req *http.Request) (err error) {
 	r.rawUserID = chi.URLParam(req, "userID")
 	r.UserID = parseUInt64(chi.URLParam(req, "userID"))
 	if val, ok := post["email"]; ok {
+		r.hasEmail = true
+		r.rawEmail = val
 		r.Email = val
 	}
 	if val, ok := post["name"]; ok {
+		r.hasName = true
+		r.rawName = val
 		r.Name = val
 	}
 	if val, ok := post["handle"]; ok {
+		r.hasHandle = true
+		r.rawHandle = val
 		r.Handle = val
 	}
 	if val, ok := post["kind"]; ok {
+		r.hasKind = true
+		r.rawKind = val
 		r.Kind = types.UserKind(val)
 	}
 
@@ -744,6 +788,8 @@ func (r *UserSetPassword) Fill(req *http.Request) (err error) {
 	r.rawUserID = chi.URLParam(req, "userID")
 	r.UserID = parseUInt64(chi.URLParam(req, "userID"))
 	if val, ok := post["password"]; ok {
+		r.hasPassword = true
+		r.rawPassword = val
 		r.Password = val
 	}
 
@@ -1000,6 +1046,8 @@ func (r *UserTriggerScript) Fill(req *http.Request) (err error) {
 	r.rawUserID = chi.URLParam(req, "userID")
 	r.UserID = parseUInt64(chi.URLParam(req, "userID"))
 	if val, ok := post["script"]; ok {
+		r.hasScript = true
+		r.rawScript = val
 		r.Script = val
 	}
 

system/rest/user.go

@@ -2,7 +2,6 @@ package rest
 
 import (
 	"context"
-
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory/resputil"
 
@@ -19,6 +18,8 @@ var _ = errors.Wrap
 
 type (
 	User struct {
+		settings *types.Settings
+
 		user service.UserService
 		role service.RoleService
 	}
@@ -31,6 +32,7 @@ type (
 
 func (User) New() *User {
 	ctrl := &User{}
+	ctrl.settings = service.CurrentSettings
 	ctrl.user = service.DefaultUser
 	ctrl.role = service.DefaultRole
 	return ctrl
@@ -71,6 +73,8 @@ func (ctrl User) Create(ctx context.Context, r *request.UserCreate) (interface{}
 		Name:   r.Name,
 		Handle: r.Handle,
 		Kind:   r.Kind,
+
+		EmailConfirmed: r.HasEmailConfirmed() && r.EmailConfirmed,
 	}
 
 	return ctrl.user.With(ctx).Create(user)