self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Server: Removed the need for profile controller

Browse Source
This commit is contained in:
Laurent Cozic 2021-01-14 12:50:45 +00:00
parent 80580ba54d
commit 03dc1bbfe1
11 changed files with 24 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/server/src/controllers/factory.ts
View File

@ -4,7 +4,6 @@ import FileController from './api/FileController';
import SessionController from './api/SessionController';
import IndexLoginController from './index/LoginController';
import IndexHomeController from './index/HomeController';
import IndexProfileController from './index/ProfileController';
import IndexUserController from './index/UserController';
import IndexFileController from './index/FileController';
import IndexNotificationController from './index/NotificationController';
@ -37,10 +36,6 @@ export class Controllers {
return new IndexHomeController(this.models_);
}
public indexProfile() {
return new IndexProfileController(this.models_);
}
public indexUser() {
return new IndexUserController(this.models_);
}

18
packages/server/src/controllers/index/ProfileController.ts
View File

@ -1,18 +0,0 @@
import BaseController from '../BaseController';
import { View } from '../../services/MustacheService';
import defaultView from '../../utils/defaultView';
import { User } from '../../db';
export default class ProfileController extends BaseController {
public async getIndex(sessionId: string, user: User = null, error: any = null): Promise<View> {
const owner = await this.initSession(sessionId);
const view: View = defaultView('profile');
view.content.user = user ? user : owner;
view.content.error = error;
view.partials.push('errorBanner');
return view;
}
}

9
packages/server/src/controllers/index/UserController.ts
View File

@ -16,7 +16,7 @@ export default class UserController extends BaseController {
return view;
}
public async getOne(sessionId: string, isNew: boolean, userIdOrString: string | User = null, error: any = null): Promise<View> {
public async getOne(sessionId: string, isNew: boolean, isMe: boolean, userIdOrString: string | User = null, error: any = null): Promise<View> {
const owner = await this.initSession(sessionId);
const userModel = this.models.user({ userId: owner.id });
@ -28,12 +28,17 @@ export default class UserController extends BaseController {
user = userIdOrString as User;
}
let postUrl = `${baseUrl()}/users/${user.id}`;
if (isNew) postUrl = `${baseUrl()}/users/new`;
if (isMe) postUrl = `${baseUrl()}/users/me`;
const view: View = defaultView('user');
view.content.user = user;
view.content.isNew = isNew;
view.content.buttonTitle = isNew ? 'Create user' : 'Update profile';
view.content.error = error;
view.content.postUrl = `${baseUrl()}/users${isNew ? '/new' : `/${user.id}`}`;
view.content.postUrl = postUrl;
view.content.showDeleteButton = !!owner.is_admin && owner.id !== user.id;
view.partials.push('errorBanner');
return view;

2
packages/server/src/models/UserModel.ts
View File

@ -72,7 +72,7 @@ export default class UserModel extends BaseModel {
}
public async profileUrl(): Promise<string> {
return `${this.baseUrl}/profile`;
return `${this.baseUrl}/users/me`;
}
private async checkIsOwnerOrAdmin(userId: string): Promise<void> {

48
packages/server/src/routes/index/profile.ts
View File

@ -1,48 +0,0 @@
import { SubPath, Route, redirect } from '../../utils/routeUtils';
import { AppContext } from '../../utils/types';
import { contextSessionId, formParse } from '../../utils/requestUtils';
import { ErrorMethodNotAllowed, ErrorUnprocessableEntity } from '../../utils/errors';
import { User } from '../../db';
import { baseUrl } from '../../config';
import { hashPassword } from '../../utils/auth';
const route: Route = {
exec: async function(_path: SubPath, ctx: AppContext) {
const sessionId = contextSessionId(ctx);
if (ctx.method === 'GET') {
return ctx.controllers.indexProfile().getIndex(sessionId);
}
if (ctx.method === 'POST') {
let user: User = {};
try {
const body = await formParse(ctx.req);
user = {
id: body.fields.id,
email: body.fields.email,
full_name: body.fields.full_name,
};
if (body.fields.password) {
if (body.fields.password !== body.fields.password2) throw new ErrorUnprocessableEntity('Passwords do not match');
user.password = hashPassword(body.fields.password);
}
const userModel = this.models.user({ userId: ctx.owner.id });
await userModel.save(userModel.fromApiInput(user), { isNew: false });
return redirect(ctx, `${baseUrl()}/profile`);
} catch (error) {
return ctx.controllers.indexProfile().getIndex(sessionId, user, error);
}
}
throw new ErrorMethodNotAllowed();
},
};
export default route;

12
packages/server/src/routes/index/users.test.ts
View File

@ -126,14 +126,14 @@ describe('index_users', function() {
const userModel = models().user({ userId: user.id });
await patchUser(session.id, { id: user.id, email: 'test2@example.com' });
let modUser: User = await userModel.load(user.id);
const modUser: User = await userModel.load(user.id);
expect(modUser.email).toBe('test2@example.com');
const previousPassword = modUser.password;
await patchUser(session.id, { id: user.id, password: 'abcdefgh', password2: 'abcdefgh' });
modUser = await userModel.load(user.id);
expect(!!modUser.password).toBe(true);
expect(modUser.password === previousPassword).toBe(false);
// const previousPassword = modUser.password;
// await patchUser(session.id, { id: user.id, password: 'abcdefgh', password2: 'abcdefgh' });
// modUser = await userModel.load(user.id);
// expect(!!modUser.password).toBe(true);
// expect(modUser.password === previousPassword).toBe(false);
});
test('should get a user', async function() {

9
packages/server/src/routes/index/users.ts
View File

@ -26,10 +26,12 @@ const route: Route = {
exec: async function(path: SubPath, ctx: AppContext) {
const sessionId = contextSessionId(ctx);
const isNew = path.id === 'new';
const isMe = path.id === 'me';
const userId = isMe ? ctx.owner.id : path.id;
if (ctx.method === 'GET') {
if (path.id) {
return ctx.controllers.indexUser().getOne(sessionId, isNew, !isNew ? path.id : null);
return ctx.controllers.indexUser().getOne(sessionId, isNew, isMe, !isNew ? userId : null);
} else {
return ctx.controllers.indexUser().getIndex(sessionId);
}
@ -41,6 +43,7 @@ const route: Route = {
try {
const body = await formParse(ctx.req);
const fields = body.fields;
if (isMe) fields.id = userId;
user = makeUser(isNew, fields);
const userModel = ctx.models.user({ userId: ctx.owner.id });
@ -57,9 +60,9 @@ const route: Route = {
throw new Error('Invalid form button');
}
return redirect(ctx, `${baseUrl()}/users`);
return redirect(ctx, `${baseUrl()}/users${isMe ? '/me' : ''}`);
} catch (error) {
return ctx.controllers.indexUser().getOne(sessionId, isNew, user, error);
return ctx.controllers.indexUser().getOne(sessionId, isNew, isMe, user, error);
}
}

4
packages/server/src/routes/routes.ts
View File

@ -6,9 +6,7 @@ import apiFiles from './api/files';
import indexLoginRoute from './index/login';
import indexLogoutRoute from './index/logout';
import indexHomeRoute from './index/home';
import indexProfileRoute from './index/profile';
import indexUsersRoute from './index/users';
// import indexUserRoute from './index/user';
import indexFilesRoute from './index/files';
import indexNotificationsRoute from './index/notifications';
import defaultRoute from './default';
@ -21,9 +19,7 @@ const routes: Routes = {
'login': indexLoginRoute,
'logout': indexLogoutRoute,
'home': indexHomeRoute,
'profile': indexProfileRoute,
'users': indexUsersRoute,
// 'user': indexUserRoute,
'files': indexFilesRoute,
'notifications': indexNotificationsRoute,

31
packages/server/src/views/index/profile.mustache
View File

@ -1,31 +0,0 @@
{{> errorBanner}}
<form action="{{{global.baseUrl}}}/profile" method="POST">
<input type="hidden" name="id" value="{{user.id}}"/>
<div class="field">
<label class="label">Full name</label>
<div class="control">
<input class="input" type="text" name="full_name" value="{{user.full_name}}"/>
</div>
</div>
<div class="field">
<label class="label">Email</label>
<div class="control">
<input class="input" type="email" name="email" value="{{user.email}}"/>
</div>
</div>
<div class="field">
<label class="label">Password</label>
<div class="control">
<input class="input" type="password" name="password" autocomplete="new-password"/>
</div>
</div>
<div class="field">
<label class="label">Repeat password</label>
<div class="control">
<input class="input" type="password" name="password2" autocomplete="new-password"/>
</div>
</div>
<div class="control">
<button class="button is-primary">Update profile</button>
</div>
</form>

8
packages/server/src/views/index/user.mustache
View File

@ -28,11 +28,9 @@
</div>
<div class="control">
<input type="submit" name="post_button" class="button is-primary" value="{{buttonTitle}}" />
{{^isNew}}
{{^user.is_admin}}
<input type="submit" name="delete_button" class="button is-danger" value="Delete" />
{{/user.is_admin}}
{{/isNew}}
{{#showDeleteButton}}
<input type="submit" name="delete_button" class="button is-danger" value="Delete" />
{{/showDeleteButton}}
</div>
</form>

2
packages/server/src/views/partials/navbar.mustache
View File

@ -14,7 +14,7 @@
</div>
<div class="navbar-end">
<div class="navbar-item">{{global.owner.email}}</div>
<a class="navbar-item" href="{{{global.baseUrl}}}/profile">Profile</a>
<a class="navbar-item" href="{{{global.baseUrl}}}/users/me">Profile</a>
<div class="navbar-item">
<form method="post" action="{{{global.baseUrl}}}/logout">
<button class="button is-primary">Logout</button>