Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

refactoring and logging

goenningfdd63eae08a7
diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.go
index fd6f52268..7c6b6687d 100644
--- a/app/middlewares/jwt.go
+++ b/app/middlewares/jwt.go
@@ -13,20 +13,28 @@ import (
func JwtGetter() web.MiddlewareFunc {
return func(next web.HandlerFunc) web.HandlerFunc {
return func(c web.Context) error {
+ var err error
if cookie, err := c.Cookie("auth"); err == nil {
if claims, err := jwt.Decode(cookie.Value); err == nil {
- users := c.Services().Users
- if user, err := users.GetByID(claims.UserID); err == nil {
+ services := c.Services()
+
+ if user, err := services.Users.GetByID(claims.UserID); err == nil {
if user.Tenant.ID == c.Tenant().ID {
c.SetUser(user)
+ if ids, err := services.Ideas.SupportedBy(user.ID); err == nil {
+ c.AddRenderVar("supportedIdeas", ids)
+ }
}
}
- } else {
- c.Logger().Error(err)
+
}
}
+ if err != nil {
+ return err
+ }
+
return next(c)
}
}
diff --git a/app/models/identity.go b/app/models/identity.go
index c9704e604..d5d71a4b5 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -12,13 +12,12 @@ type Tenant struct {
//User represents an user inside our application
type User struct {
- ID int `json:"id"`
- Name string `json:"name"`
- Email string `json:"email"`
- Tenant *Tenant `json:"tenant"`
- Role int `json:"role"`
- Providers []*UserProvider `json:"providers"`
- SupportedIdeas []int `json:"supportedIdeas"`
+ ID int `json:"id"`
+ Name string `json:"name"`
+ Email string `json:"email"`
+ Tenant *Tenant `json:"tenant"`
+ Role int `json:"role"`
+ Providers []*UserProvider `json:"providers"`
}
var (
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index 50249fb73..ac25459ca 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -36,6 +36,7 @@ func (ctx *Context) Tenant() *models.Tenant {
//SetTenant update HTTP context with current tenant
func (ctx *Context) SetTenant(tenant *models.Tenant) {
+ ctx.Logger().Debugf("Current tenant: %v (ID: %v)", tenant.Name, tenant.ID)
ctx.Set(tenantContextKey, tenant)
}
@@ -69,8 +70,9 @@ func (ctx *Context) User() *models.User {
}
//SetUser update HTTP context with current user
-func (ctx *Context) SetUser(claims *models.User) {
- ctx.Set(userContextKey, claims)
+func (ctx *Context) SetUser(user *models.User) {
+ ctx.Logger().Debugf("Logged as: %v [%v] (ID: %v)", user.Name, user.Email, user.ID)
+ ctx.Set(userContextKey, user)
}
//Services returns current app.Services from context
@@ -124,3 +126,24 @@ func (ctx *Context) ParamAsInt(name string) (int, error) {
}
return int(val), nil
}
+
+//RenderVars returns all registered RenderVar
+func (ctx *Context) RenderVars() echo.Map {
+ vars := ctx.Get("__renderVars")
+ if vars != nil {
+ return vars.(echo.Map)
+ }
+ return nil
+}
+
+//AddRenderVar register given key/value to RenderVar map
+func (ctx *Context) AddRenderVar(name string, value interface{}) {
+ var renderVars = ctx.Get("__renderVars")
+ if renderVars == nil {
+ renderVars = make(echo.Map)
+ ctx.Set("__renderVars", renderVars)
+ }
+
+ ctx.Logger().Debugf("storage.%v: %v", name, value)
+ renderVars.(echo.Map)[name] = value
+}
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index d5a78d350..46e5add44 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -108,6 +108,7 @@ func errorHandler(e error, c echo.Context) {
}
}
+// NewLogger creates a new logger
func NewLogger() echo.Logger {
logger := log.New("")
logger.SetHeader(`${level} [${time_rfc3339}]`)
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
index c55f39535..c8081e53a 100644
--- a/app/pkg/web/renderer.go
+++ b/app/pkg/web/renderer.go
@@ -69,6 +69,12 @@ func (r *HTMLRenderer) Render(w io.Writer, name string, data interface{}, c echo
}
m["settings"] = r.settings
+ if renderVars := ctx.RenderVars(); renderVars != nil {
+ for key, value := range renderVars {
+ m[key] = value
+ }
+ }
+
if ctx.IsAuthenticated() {
m["__User"] = ctx.User()
}
diff --git a/app/storage/idea.go b/app/storage/idea.go
index 42bdca3e7..c68f08d15 100644
--- a/app/storage/idea.go
+++ b/app/storage/idea.go
@@ -13,4 +13,5 @@ type Idea interface {
AddSupporter(number, userID int) error
RemoveSupporter(number, userID int) error
SetResponse(number int, text string, userID, status int) error
+ SupportedBy(userID int) ([]int, error)
}
diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.go
index d362cde8a..a4830982c 100644
--- a/app/storage/inmemory/idea.go
+++ b/app/storage/inmemory/idea.go
@@ -94,3 +94,8 @@ func (s *IdeaStorage) SetResponse(number int, text string, userID, status int) e
}
return nil
}
+
+// SupportedBy returns a list of Idea ID supported by given user
+func (s *IdeaStorage) SupportedBy(userID int) ([]int, error) {
+ return make([]int, 0), nil
+}
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index e2ad72868..126c9793d 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -281,3 +281,8 @@ func (s *IdeaStorage) SetResponse(number int, text string, userID, status int) e
}
return nil
}
+
+// SupportedBy returns a list of Idea ID supported by given user
+func (s *IdeaStorage) SupportedBy(userID int) ([]int, error) {
+ return s.trx.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1", userID)
+}
diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.go
index e38d0278b..fc685d794 100644
--- a/app/storage/postgres/user.go
+++ b/app/storage/postgres/user.go
@@ -11,13 +11,12 @@ import (
)
type dbUser struct {
- ID sql.NullInt64 `db:"id"`
- Name sql.NullString `db:"name"`
- Email sql.NullString `db:"email"`
- Tenant *dbTenant `db:"tenant"`
- Role sql.NullInt64 `db:"role"`
- Providers []*dbUserProvider
- SupportedIdeas []int
+ ID sql.NullInt64 `db:"id"`
+ Name sql.NullString `db:"name"`
+ Email sql.NullString `db:"email"`
+ Tenant *dbTenant `db:"tenant"`
+ Role sql.NullInt64 `db:"role"`
+ Providers []*dbUserProvider
}
type dbUserProvider struct {
@@ -27,13 +26,12 @@ type dbUserProvider struct {
func (u *dbUser) toModel() *models.User {
user := &models.User{
- ID: int(u.ID.Int64),
- Name: u.Name.String,
- Email: u.Email.String,
- Tenant: u.Tenant.toModel(),
- SupportedIdeas: u.SupportedIdeas,
- Role: int(u.Role.Int64),
- Providers: make([]*models.UserProvider, len(u.Providers)),
+ ID: int(u.ID.Int64),
+ Name: u.Name.String,
+ Email: u.Email.String,
+ Tenant: u.Tenant.toModel(),
+ Role: int(u.Role.Int64),
+ Providers: make([]*models.UserProvider, len(u.Providers)),
}
for i, p := range u.Providers {
@@ -103,10 +101,5 @@ func getUser(trx *dbx.Trx, filter string, args ...interface{}) (*models.User, er
return nil, err
}
- user.SupportedIdeas, err = trx.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1", user.ID)
- if err != nil {
- return nil, err
- }
-
return user.toModel(), nil
}
diff --git a/public/models/identity.ts b/public/models/identity.ts
index 8748a0e82..ac38d158b 100644
--- a/public/models/identity.ts
+++ b/public/models/identity.ts
@@ -8,6 +8,5 @@ export interface User {
id: number;
name: string;
email: string;
- supportedIdeas: number[];
role: number;
}
diff --git a/public/shared/ResponseForm.tsx b/public/shared/ResponseForm.tsx
index c1eebdd17..5e8a30e80 100644
--- a/public/shared/ResponseForm.tsx
+++ b/public/shared/ResponseForm.tsx
@@ -50,10 +50,11 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor
}
public render() {
- const respond = <div className="ui blue labeled submit icon button false"
- onClick={() => this.activate()}>
- <i className="icon announcement"></i>Respond
- </div>;
+ const button = <div className="ui blue labeled submit icon button false"
+ onClick={() => this.activate()}>
+ <i className="icon announcement"></i>Respond
+ </div>;
+
const form = <form className="ui reply form">
<DisplayError error={this.state.error} />
<div className="two fields">
@@ -84,6 +85,7 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor
Cancel
</div>
</form>;
- return this.state.active ? form : respond;
+
+ return this.state.active ? form : button;
}
}
diff --git a/public/shared/SupportCounter.tsx b/public/shared/SupportCounter.tsx
index 5ef80611d..502ef8f7e 100644
--- a/public/shared/SupportCounter.tsx
+++ b/public/shared/SupportCounter.tsx
@@ -20,9 +20,10 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support
constructor(props: SupportCounterProps) {
super(props);
+ const supportedIdeas = storage.getArray<number>('supportedIdeas');
this.state = {
- supported: props.user && props.user.supportedIdeas.indexOf(props.idea.id) >= 0,
+ supported: props.user && supportedIdeas && supportedIdeas.indexOf(props.idea.id) >= 0,
total: props.idea.totalSupporters
};
}
diff --git a/public/site/ShowIdeaPage.tsx b/public/site/ShowIdeaPage.tsx
index 68fc5c562..aa3be3dda 100644
--- a/public/site/ShowIdeaPage.tsx
+++ b/public/site/ShowIdeaPage.tsx
@@ -23,7 +23,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
this.user = storage.getCurrentUser();
this.idea = storage.get<Idea>('idea');
- this.comments = storage.get<Comment[]>('comments') || [];
+ this.comments = storage.getArray<Comment>('comments');
}
public render() {
@@ -70,10 +70,14 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
</div>
<MultiLineText text={ this.idea.description } />
-
<ShowIdeaResponse status={ this.idea.status } response={ this.idea.response } />
- <div className="ui hidden divider"></div>
- <ResponseForm idea={ this.idea } />
+
+ {
+ storage.isStaff() &&
+ <div className="ui hidden divider">
+ <ResponseForm idea={ this.idea } />
+ </div>
+ }
<div className="ui comments">
<h3 className="ui dividing header">Comments</h3>
@@ -84,8 +88,4 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
<Footer />
</div>;
}
-
- private isStaff() {
- return this.user.role >= 2;
- }
}
diff --git a/public/storage.ts b/public/storage.ts
index c0f3e7961..ae3f77731 100644
--- a/public/storage.ts
+++ b/public/storage.ts
@@ -18,7 +18,8 @@ export function getCurrentUser(): User {
}
export function isStaff() {
- return getCurrentUser().role >= 2;
+ const user = getCurrentUser();
+ return user && user.role >= 2;
}
export function set<T>(key: string, value: T) {
@@ -28,3 +29,7 @@ export function set<T>(key: string, value: T) {
export function get<T>(key: string): T {
return w[`_${key}`];
}
+
+export function getArray<T>(key: string): T[] {
+ return w[`_${key}`] || [];
+}