Open platform to collect and prioritize feedback
readonly user settings page (#128)
Guilherme Oenning634c25c7edf9
diff --git a/app/handlers/signin.go b/app/handlers/signin.goindex e918e7423..34af5a1ac 100644--- a/app/handlers/signin.go+++ b/app/handlers/signin.go@@ -61,10 +61,8 @@ func OAuthCallback(provider string) web.HandlerFunc {users := c.Services().Users- var user *models.User- if oauthUser.Email == "" {- user, err = users.GetByProvider(tenant.ID, provider, oauthUser.ID.String())- } else {+ user, err := users.GetByProvider(tenant.ID, provider, oauthUser.ID.String())+ if err == app.ErrNotFound && oauthUser.Email != "" {user, err = users.GetByEmail(tenant.ID, oauthUser.Email)}if err != nil {diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.goindex b6d053863..5b2437baf 100644--- a/app/handlers/signin_test.go+++ b/app/handlers/signin_test.go@@ -7,6 +7,7 @@ import ("net/http"+ "github.com/getfider/fider/app""github.com/getfider/fider/app/handlers""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/jwt"@@ -123,6 +124,30 @@ func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjo0LCJ1c2VyL25hbWUiOiJNYXJrIiwidXNlci9lbWFpbCI6IiJ9.G93ZTFcDuHiIlYbDvMnjhoDebeJZMifWbv9v0rayQOI"))}+func TestCallbackHandler_ExistingUser_WithoutEmail(t *testing.T) {+ RegisterTestingT(t)++ server, services := mock.NewServer()+ services.Users.Register(&models.User{+ Name: "Some Facebook Guy",+ Email: "",+ Tenant: mock.DemoTenant,+ Providers: []*models.UserProvider{+ &models.UserProvider{UID: "FB456", Name: oauth.FacebookProvider},+ },+ })++ code, response := server.+ WithURL("http://login.test.fider.io/oauth/callback?state=http://demo.test.fider.io&code=456").+ Execute(handlers.OAuthCallback(oauth.FacebookProvider))++ _, err := services.Users.GetByID(4)+ Expect(err).To(Equal(app.ErrNotFound))++ Expect(code).To(Equal(http.StatusTemporaryRedirect))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiIifQ.DBcMmKSrGxiXGVCq9QT716xfw3M4kzP-Njazsk6vaFI"))+}+func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {RegisterTestingT(t)diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex ad71ccc24..27b67b5de 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -78,7 +78,8 @@ func (r *HTMLRenderer) Render(w io.Writer, name string, data interface{}, c echo}if ctx.IsAuthenticated() {- m["__User"] = ctx.User()+ m["user"] = ctx.User()+ m["email"] = ctx.User().Email}files, _ := ioutil.ReadDir("dist/js")diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scssindex 01e7f1cb4..28ccd8e79 100644--- a/public/assets/styles/main.scss+++ b/public/assets/styles/main.scss@@ -21,17 +21,9 @@ body {height: 40px;border-radius: 0px;- .fdr-avatar {- margin-right: 5px;- }-div, a {color: textColorFor($menu-color);}-- a::before {- content: none;- }}.info {diff --git a/public/components/CommentInput.tsx b/public/components/CommentInput.tsxindex 3afdaaec2..96f503f8c 100644--- a/public/components/CommentInput.tsx+++ b/public/components/CommentInput.tsx@@ -2,7 +2,7 @@ import * as React from 'react';import * as ReactDOM from 'react-dom';import Textarea from 'react-textarea-autosize';-import { Idea, User } from '@fider/models';+import { Idea, CurrentUser } from '@fider/models';import { Gravatar, UserName, Button, DisplayError, SignInControl } from '@fider/components/common';import { inject, injectables } from '@fider/di';@@ -27,7 +27,7 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpu@inject(injectables.IdeaService)public service: IdeaService;- private user: User;+ private user?: CurrentUser;constructor() {super();@@ -64,9 +64,9 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpuconst user = this.session.getCurrentUser();return <div className={`comment-input ${user && 'authenticated' }`}>- <Gravatar name={ this.user.name } hash={ this.user.gravatar }/>+ { this.user && <Gravatar name={ this.user.name } hash={ this.user.gravatar }/> }<div className="ui form">- <UserName user={ user } />+ { this.user && <UserName user={ this.user } /> }<DisplayError error={this.state.error} /><div className="field"><Textarea onChange={(e) => { this.setState({ content: e.currentTarget.value }); }}diff --git a/public/components/IdeaInput.tsx b/public/components/IdeaInput.tsxindex 1443600d0..3d4d1d97a 100644--- a/public/components/IdeaInput.tsx+++ b/public/components/IdeaInput.tsx@@ -4,7 +4,7 @@ import { DisplayError, Button, Form } from '@fider/components/common';import { inject, injectables } from '@fider/di';import { Session, IdeaService, Failure } from '@fider/services';-import { User } from '@fider/models';+import { CurrentUser } from '@fider/models';import { showSignIn } from '@fider/utils/page';interface IdeaInputProps {@@ -20,7 +20,7 @@ interface IdeaInputState {export class IdeaInput extends React.Component<IdeaInputProps, IdeaInputState> {private title: HTMLInputElement;private form: Form;- private user: User;+ private user?: CurrentUser;@inject(injectables.Session)private session: Session;diff --git a/public/components/SupportCounter.tsx b/public/components/SupportCounter.tsxindex 1a44ab472..1e4ec937a 100644--- a/public/components/SupportCounter.tsx+++ b/public/components/SupportCounter.tsx@@ -7,7 +7,7 @@ import { Session, IdeaService } from '@fider/services';import { showSignIn } from '@fider/utils/page';interface SupportCounterProps {- user: User;+ user?: User;idea: Idea;}@@ -28,7 +28,7 @@ export class SupportCounter extends React.Component<SupportCounterProps, Supportconst supportedIdeas = this.session.getArray<number>('supportedIdeas');this.state = {- supported: props.user && supportedIdeas && supportedIdeas.indexOf(props.idea.id) >= 0,+ supported: props.user && supportedIdeas && supportedIdeas.indexOf(props.idea.id) >= 0 ? true : false,total: props.idea.totalSupporters};}diff --git a/public/components/common/Gravatar.tsx b/public/components/common/Gravatar.tsxindex 82b41f077..5187805b2 100644--- a/public/components/common/Gravatar.tsx+++ b/public/components/common/Gravatar.tsx@@ -13,11 +13,9 @@ export const Gravatar = (props: GravatarProps) => {const hash = props.email ? md5(props.email) : props.hash || '';let element: any;- return (hash && props.name) ?- <img ref={(e) => element = e }- onError={() => { element.src = fallback; }}- className="fdr-avatar"- title={ props.name }- src={ `https://www.gravatar.com/avatar/${hash}?d=${encodeURIComponent(fallback)}` }/> :- <div />;+ return <img ref={(e) => element = e }+ onError={() => { element.src = fallback; }}+ className="fdr-avatar"+ title={ props.name }+ src={ `https://www.gravatar.com/avatar/${hash}?d=${encodeURIComponent(fallback)}` }/>;};diff --git a/public/components/common/Header.tsx b/public/components/common/Header.tsxindex d95ae1685..086975610 100644--- a/public/components/common/Header.tsx+++ b/public/components/common/Header.tsx@@ -7,7 +7,7 @@ import { Session } from '@fider/services/Session';import { showSignIn } from '@fider/utils/page';export class Header extends React.Component<{}, {}> {- private user: User;+ private user?: User;private tenant: Tenant;@inject(injectables.Session)@@ -27,7 +27,13 @@ export class Header extends React.Component<{}, {}> {}public render() {- const items = <div className="menu">+ const items = this.user ? <div className="menu">+ <div className="name header">+ <i className="user icon"></i>+ { this.user.name }+ </div>+ <a href="/settings" className="item">Settings</a>+ <div className="divider"></div>{this.session.isStaff() &&<div className="header">@@ -44,22 +50,22 @@ export class Header extends React.Component<{}, {}> {<div className="divider"></div>}<a href="/signout?redirect=/" className="item signout">Sign out</a>- </div>;+ </div> : <div />;return <div>- <EnvironmentInfo />- <div id="menu" className="ui small borderless menu">- <div className="ui container">- <a href="/" className="header item">- { this.tenant.name }- </a>- <div onClick={ () => this.showModal() } className={`ui right simple dropdown item signin ${!this.user.name && 'subtitle'}`}>- <Gravatar name={this.user.name} hash={this.user.gravatar} />- { this.user.name || 'Sign in' } { this.user.name && <i className="dropdown icon"></i> }- { this.user.name && items }- </div>- </div>+ <EnvironmentInfo />+ <div id="menu" className="ui small borderless menu">+ <div className="ui container">+ <a href="/" className="header item">+ { this.tenant.name }+ </a>+ <div onClick={ () => this.showModal() } className={`ui right simple dropdown item signin ${!this.user && 'subtitle'}`}>+ { this.user && <Gravatar name={this.user.name} hash={this.user.gravatar} /> }+ { !this.user && 'Sign in' } { this.user && <i className="dropdown icon"></i> }+ { items }+ </div></div>+ </div></div>;}}diff --git a/public/components/common/UserName.tsx b/public/components/common/UserName.tsxindex 63a005768..495c5ae35 100644--- a/public/components/common/UserName.tsx+++ b/public/components/common/UserName.tsx@@ -6,6 +6,6 @@ interface UserNameProps {}export const UserName = (props: UserNameProps) => {- const isStaff = props.user && props.user.role >= 2;+ const isStaff = props.user.role >= 2;return <span className={`name ${isStaff ? 'staff' : ''}`}>{ props.user.name }</span>;};diff --git a/public/index.tsx b/public/index.tsxindex da12f5bb4..6659515c5 100644--- a/public/index.tsx+++ b/public/index.tsx@@ -5,7 +5,8 @@ import { SignInModal } from '@fider/components/SignInModal';import { AdminHomePage } from '@fider/pages/admin/AdminHomePage';import { SiteHomePage } from '@fider/pages/site/SiteHomePage';import { ShowIdeaPage } from '@fider/pages/site/ShowIdeaPage';-import { CompleteSignInProfile } from '@fider/pages/site/CompleteSignInProfile';+import { UserSettingsPage } from '@fider/pages/site/UserSettingsPage';+import { CompleteSignInProfilePage } from '@fider/pages/site/CompleteSignInProfilePage';import { SignUpPage } from '@fider/pages/signup/SignUpPage';import { container, injectables } from '@fider/di';import {@@ -34,7 +35,8 @@ const pathRegex = [{ regex: new RegExp('^\/admin$'), component: <AdminHomePage />, id: 'fdr-admin-page' },{ regex: new RegExp('^\/signup$'), component: <SignUpPage />, id: 'fdr-signup-page' },{ regex: new RegExp('^\/ideas\/\\d+.*$'), component: <ShowIdeaPage />, id: 'fdr-show-idea-page' },- { regex: new RegExp('^\/signin\/verify'), component: <CompleteSignInProfile />, id: 'fdr-complete-signin-profile' },+ { regex: new RegExp('^\/signin\/verify'), component: <CompleteSignInProfilePage />, id: 'fdr-complete-signin-profile' },+ { regex: new RegExp('^\/settings$'), component: <UserSettingsPage />, id: 'fdr-user-settings' },];const resolveRootComponent = (path: string): PageConfiguration | undefined => {diff --git a/public/models/identity.ts b/public/models/identity.tsindex e3e81cef0..b14e98407 100644--- a/public/models/identity.ts+++ b/public/models/identity.ts@@ -12,3 +12,11 @@ export interface User {gravatar: string;role: number;}++export interface CurrentUser {+ id: number;+ name: string;+ email: string;+ gravatar: string;+ role: number;+}diff --git a/public/pages/site/CompleteSignInProfile.tsx b/public/pages/site/CompleteSignInProfilePage.tsxsimilarity index 79%rename from public/pages/site/CompleteSignInProfile.tsxrename to public/pages/site/CompleteSignInProfilePage.tsxindex f039a6ffb..c7556e20f 100644--- a/public/pages/site/CompleteSignInProfile.tsx+++ b/public/pages/site/CompleteSignInProfilePage.tsx@@ -7,11 +7,11 @@ import { Form } from '@fider/components/common';import { inject, injectables } from '@fider/di';import { TenantService } from '@fider/services';-interface CompleteSignInProfileState {+interface CompleteSignInProfilePageState {name: string;}-export class CompleteSignInProfile extends React.Component<{}, CompleteSignInProfileState> {+export class CompleteSignInProfilePage extends React.Component<{}, CompleteSignInProfilePageState> {private form: Form;@inject(injectables.TenantService)@@ -47,7 +47,12 @@ export class CompleteSignInProfile extends React.Component<{}, CompleteSignInPro<p>Because this is your first sign in, please input your display name.</p><Form ref={(f) => { this.form = f!; } } onSubmit={() => this.submit() }><div className="ui small action fluid input">- <input onChange={(e) => this.setState({ name: e.currentTarget.value }) } type="text" placeholder="Your display name" className="small" />+ <input+ onChange={(e) => this.setState({ name: e.currentTarget.value }) }+ type="text"+ maxLength={100}+ placeholder="Your display name"+ className="small" /><button onClick={ () => this.form.submit() } className={`ui small positive button ${this.state.name === '' && 'disabled'}`}>Submit</button>diff --git a/public/pages/site/ShowIdeaPage.tsx b/public/pages/site/ShowIdeaPage.tsxindex f2d286f10..71448e58b 100644--- a/public/pages/site/ShowIdeaPage.tsx+++ b/public/pages/site/ShowIdeaPage.tsx@@ -1,6 +1,6 @@import * as React from 'react';-import { User, Comment, Idea } from '@fider/models';+import { CurrentUser, Comment, Idea } from '@fider/models';import { setTitle } from '@fider/utils/page';import { CommentInput } from '@fider/components/CommentInput';@@ -15,7 +15,7 @@ import { Session } from '@fider/services';import './ShowIdeaPage.scss';export class ShowIdeaPage extends React.Component<{}, {}> {- private user: User;+ private user?: CurrentUser;private idea: Idea;private comments: Comment[];@@ -71,7 +71,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {{this.idea.description? <MultiLineText className="description" text={ this.idea.description } style="simple" />- : <p className="description">This idea has no description.</p>+ : <p className="description">This idea doesn't have a description.</p>}<ShowIdeaResponse status={ this.idea.status } response={ this.idea.response } />diff --git a/public/pages/site/SiteHomePage.tsx b/public/pages/site/SiteHomePage.tsxindex 6dacbdf52..936392c26 100644--- a/public/pages/site/SiteHomePage.tsx+++ b/public/pages/site/SiteHomePage.tsx@@ -1,5 +1,5 @@import * as React from 'react';-import { Idea, IdeaStatus, User, Tenant } from '@fider/models';+import { Idea, IdeaStatus, CurrentUser, Tenant } from '@fider/models';import { Gravatar, MultiLineText, Moment, Header, Footer } from '@fider/components/common';import { ShowIdeaResponse } from '@fider/components/ShowIdeaResponse';import { SupportCounter } from '@fider/components/SupportCounter';@@ -16,8 +16,8 @@ interface SiteHomePageState {}export class SiteHomePage extends React.Component<{}, SiteHomePageState> {- private user: User;- private tenant: Tenant;+ private user?: CurrentUser;+ private tenant: Tenant;private allIdeas: Idea[];private filter: HTMLDivElement;private activeFilter: string;diff --git a/public/pages/site/UserSettingsPage.tsx b/public/pages/site/UserSettingsPage.tsxnew file mode 100644index 000000000..2c442d44b--- /dev/null+++ b/public/pages/site/UserSettingsPage.tsx@@ -0,0 +1,79 @@+import * as React from 'react';++import { inject, injectables } from '@fider/di';+import { Footer, Header, Form, DisplayError, Button, Gravatar } from '@fider/components/common';++import { CurrentUser } from '@fider/models';+import { Session, Failure } from '@fider/services';++interface UserSettingsPageState {+ name: string;+ error?: Failure;+}++export class UserSettingsPage extends React.Component<{}, UserSettingsPageState> {+ private user: CurrentUser;++ @inject(injectables.Session)+ private session: Session;++ constructor(props: {}) {+ super(props);+ this.user = this.session.getCurrentUser()!;+ this.state = {+ name: this.user.name+ };+ }++ private async confirm() {+ console.log('Done!');+ }++ public render() {+ return <div>+ <Header />+ <div className="page ui container">+ <h1 className="ui header">Settings</h1>++ <div className="ui grid">+ <div className="eight wide computer sixteen wide mobile column">+ <div className="ui form">+ <div className="field">+ <label htmlFor="email">Avatar</label>+ <p><Gravatar hash={ this.user.gravatar } name={ this.state.name } /></p>+ <p className="info">+ <p>+ We use <a href="https://en.gravatar.com/" target="blank">Gravatar</a> to display profile avatars. <br/>+ A letter avatar based on your name is generated for profiles without e-mail.+ </p>+ </p>+ </div>+ <div className="field">+ <label htmlFor="email">E-mail</label>+ <p><b>{ this.user.email }</b></p>+ <p className="info">+ {+ this.user.email ? <p>Your e-mail is private and will never be displayed to anyone.</p>+ : <p>Your account doesn't have an e-mail.</p>+ }+ </p>+ </div>+ <DisplayError fields={['name']} error={this.state.error} />+ <div className="field">+ <label htmlFor="name">Name</label>+ <input id="name"+ type="text"+ disabled+ maxLength={100}+ value={ this.state.name }+ onChange={(e) => this.setState({ name: e.currentTarget.value })}/>+ </div>+ </div>+ </div>+ </div>++ </div>+ <Footer />+ </div>;+ }+}diff --git a/public/services/Session.ts b/public/services/Session.tsindex b0c26bd88..8bf85ed6a 100644--- a/public/services/Session.ts+++ b/public/services/Session.ts@@ -1,10 +1,9 @@-import { User, AppSettings, Tenant } from '@fider/models';+import { User, CurrentUser, AppSettings, Tenant } from '@fider/models';import { injectable } from '@fider/di';export interface Session {- getCurrentUser(): User;+ getCurrentUser(): CurrentUser | undefined;getCurrentTenant(): Tenant;- setUser(user: User): void;isAdmin(): boolean;isStaff(): boolean;set<T>(key: string, value: T): void;@@ -21,15 +20,17 @@ export class BrowserSession implements Session {constructor(window: Window) {this.w = window;- this.w.setUser = this.setUser.bind(this);this.w.getCurrentUser = this.getCurrentUser.bind(this);this.w.set = this.set.bind(this);this.w.get = this.get.bind(this);}- public getCurrentUser(): User {+ public getCurrentUser(): CurrentUser | undefined {const w: any = window;- return w[`_user`] as User;+ if (`_email` in w) {+ w[`_user`].email = w[`_email`];+ }+ return w[`_user`] as CurrentUser;}public getCurrentTenant(): Tenant {@@ -37,18 +38,14 @@ export class BrowserSession implements Session {return w[`_tenant`] as Tenant;}- public setUser(user: User): void {- this.set<User>('user', user);- }-public isAdmin(): boolean {const user = this.getCurrentUser();- return user && user.role === 3;+ return !!user && user.role === 3;}public isStaff(): boolean {const user = this.getCurrentUser();- return user && user.role >= 2;+ return !!user && user.role >= 2;}public set<T>(key: string, value: T): void {diff --git a/public/services/TenantService.ts b/public/services/TenantService.tsindex cac24f772..60d4d457e 100644--- a/public/services/TenantService.ts+++ b/public/services/TenantService.ts@@ -23,7 +23,7 @@ export class HttpTenantService implements TenantService {}public async updateSettings(title: string, invitation: string, welcomeMessage: string): Promise<Result> {- return await post('/api/settings', {+ return await post('/api/admin/settings', {title, invitation, welcomeMessage,});}diff --git a/router.go b/router.goindex de375f29a..2d4f96d81 100644--- a/router.go+++ b/router.go@@ -97,19 +97,22 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {public.Post("/api/signin", handlers.SignInByEmail())}- private := page.Group("/api")+ private := page.Group(""){private.Use(middlewares.IsAuthenticated())+ private.Get("/settings", func(ctx web.Context) error {+ return ctx.Page(web.Map{})+ })- private.Post("/ideas", handlers.PostIdea())- private.Post("/ideas/:number/comments", handlers.PostComment())- private.Post("/ideas/:number/status", handlers.SetResponse())- private.Post("/ideas/:number/support", handlers.AddSupporter())- private.Post("/ideas/:number/unsupport", handlers.RemoveSupporter())+ private.Post("/api/ideas", handlers.PostIdea())+ private.Post("/api/ideas/:number/comments", handlers.PostComment())+ private.Post("/api/ideas/:number/status", handlers.SetResponse())+ private.Post("/api/ideas/:number/support", handlers.AddSupporter())+ private.Post("/api/ideas/:number/unsupport", handlers.RemoveSupporter())private.Use(middlewares.IsAuthorized(models.RoleMember, models.RoleAdministrator))- private.Post("/settings", handlers.UpdateSettings())+ private.Post("/api/admin/settings", handlers.UpdateSettings())}admin := page.Group("/admin")diff --git a/tests/pages/HomePage.ts b/tests/pages/HomePage.tsindex f870005a1..b35240112 100644--- a/tests/pages/HomePage.ts+++ b/tests/pages/HomePage.ts@@ -23,6 +23,9 @@ export class HomePage extends Page {@findBy('.signin')public UserMenu: WebComponent;+ @findBy('.signin .name')+ public UserName: WebComponent;+@findBy('#signin-modal')public SignInModal: WebComponent;diff --git a/tests/submit-ideas.ts b/tests/submit-ideas.tsindex 78a79669a..42ea24941 100644--- a/tests/submit-ideas.ts+++ b/tests/submit-ideas.ts@@ -17,9 +17,10 @@ describe('Submit ideas', () => {await pages.home.navigate();await pages.home.signInWithFacebook();await pages.facebook.signInAsAryaStark();+ await pages.home.UserMenu.click();// Assert- await ensure(pages.home.UserMenu).textIs('Arya Stark');+ await ensure(pages.home.UserName).textIs('ARYA STARK');// Actionawait pages.home.submitNewIdea('Add support to TypeScript', 'Because the language and community is awesome! :)');@@ -37,9 +38,10 @@ describe('Submit ideas', () => {await pages.home.navigate();await pages.home.signInWithGoogle();await pages.google.signInAsDarthVader();+ await pages.home.UserMenu.click();// Assert- await ensure(pages.home.UserMenu).textIs('Darth Vader');+ await ensure(pages.home.UserName).textIs('DARTH VADER');await pages.home.IdeaList.want(0);await ensure(await pages.home.IdeaList.at(0)).textIs('2');diff --git a/views/base.html b/views/base.htmlindex 4023f9fb9..c83758af1 100644--- a/views/base.html+++ b/views/base.html@@ -35,7 +35,7 @@<script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.9/semantic.min.js" integrity="sha256-mq9Ru97qzOm1x5zeYFfPniWgQP9tEmjo3O4jUEJdjNY=" crossorigin="anonymous"></script><script src="/assets/js/{{ .__JavaScriptBundle }}"></script><script type="text/javascript">- setUser({{ .__User }}); {{template "javascript" .}}+ {{template "javascript" .}}</script></body></html>