self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2024-11-28 08:58:49 +02:00
Code Issues Releases Activity

implementing switchable userManagement

Browse Source
This commit is contained in:
Braun Patrik 2016-07-07 12:26:36 +02:00
parent ca0de09881
commit a68159cfea
6 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/middlewares/user/AuthenticationMWs.ts
View File

@ -3,13 +3,17 @@
import {NextFunction, Request, Response} from "express";
import {Error, ErrorCodes} from "../../../common/entities/Error";
import {UserRoles} from "../../../common/entities/User";
import {UserRoles, User} from "../../../common/entities/User";
import {ObjectManagerRepository} from "../../model/ObjectManagerRepository";
import {Config} from "../../config/Config";
export class AuthenticationMWs {
public static authenticate(req:Request, res:Response, next:NextFunction) {
if (Config.Client.authenticationRequired === false) {
req.session.user = new User("", "", UserRoles.Admin);
return next();
}
if (typeof req.session.user === 'undefined') {
return next(new Error(ErrorCodes.NOT_AUTHENTICATED));
}

16
backend/middlewares/user/UserMWs.ts
View File

@ -2,10 +2,14 @@ import {NextFunction, Request, Response} from "express";
import {Error, ErrorCodes} from "../../../common/entities/Error";
import {ObjectManagerRepository} from "../../model/ObjectManagerRepository";
import {User} from "../../../common/entities/User";
import {Config} from "../../config/Config";
export class UserMWs {
public static changePassword(req:Request, res:Response, next:NextFunction) {
if (Config.Client.authenticationRequired === false) {
return next(new Error(ErrorCodes.USER_MANAGEMENT_DISABLED));
}
if ((typeof req.body === 'undefined') || (typeof req.body.userModReq === 'undefined')
|| (typeof req.body.userModReq.id === 'undefined')
|| (typeof req.body.userModReq.oldPassword === 'undefined')
@ -24,6 +28,9 @@ export class UserMWs {
public static createUser(req:Request, res:Response, next:NextFunction) {
if (Config.Client.authenticationRequired === false) {
return next(new Error(ErrorCodes.USER_MANAGEMENT_DISABLED));
}
if ((typeof req.body === 'undefined') || (typeof req.body.newUser === 'undefined')) {
return next();
}
@ -39,6 +46,9 @@ export class UserMWs {
}
public static deleteUser(req:Request, res:Response, next:NextFunction) {
if (Config.Client.authenticationRequired === false) {
return next(new Error(ErrorCodes.USER_MANAGEMENT_DISABLED));
}
if ((typeof req.params === 'undefined') || (typeof req.params.id === 'undefined')) {
return next();
}
@ -55,6 +65,9 @@ export class UserMWs {
}
public static changeRole(req:Request, res:Response, next:NextFunction) {
if (Config.Client.authenticationRequired === false) {
return next(new Error(ErrorCodes.USER_MANAGEMENT_DISABLED));
}
if ((typeof req.params === 'undefined') || (typeof req.params.id === 'undefined')
|| (typeof req.body === 'undefined') || (typeof req.body.newRole === 'undefined')) {
return next();
@ -71,6 +84,9 @@ export class UserMWs {
public static listUsers(req:Request, res:Response, next:NextFunction) {
if (Config.Client.authenticationRequired === false) {
return next(new Error(ErrorCodes.USER_MANAGEMENT_DISABLED));
}
ObjectManagerRepository.getInstance().getUserManager().find({}, (err, result:Array<User>) => {
if ((err) || (!result)) {
return next(new Error(ErrorCodes.GENERAL_ERROR));

2
common/config/Config.ts
View File

@ -39,7 +39,7 @@ export class ConfigClass {
enableCache: false,
enableOnScrollRendering: true,
enableOnScrollThumbnailPrioritising: true,
authenticationRequired: true
authenticationRequired: false
};
public setDatabaseType(type:DatabaseType) {

4
common/entities/Error.ts
View File

@ -9,7 +9,9 @@ export enum ErrorCodes{
GENERAL_ERROR,
SERVER_ERROR
SERVER_ERROR,
USER_MANAGEMENT_DISABLED
}

2
frontend/app/admin/admin.component.html
View File

@ -1,6 +1,6 @@
<app-frame>
<div body class="container">
<div class="panel panel-default">
<div class="panel panel-default" *ngIf="userManagementEnable">
<div class="panel-heading">
<h3 class="panel-title">User management</h3>
</div>

10
frontend/app/admin/admin.component.ts
View File

@ -10,6 +10,7 @@ import {Utils} from "../../../common/Utils";
import {AdminService} from "./admin.service";
import {Message} from "../../../common/entities/Message";
import {StringifyRole} from "./../pipes/StringifyRolePipe";
import {Config} from "../config/Config";
@Component({
selector: 'admin',
@ -24,8 +25,11 @@ export class AdminComponent implements OnInit {
private newUser = new User();
private userRoles:Array<any> = [];
private users:Array<User> = [];
userManagementEnable:boolean = false;
constructor(private _authService:AuthenticationService, private _router:Router, private _adminService:AdminService) {
this.userManagementEnable = Config.Client.authenticationRequired;
}
ngOnInit() {
@ -33,8 +37,10 @@ export class AdminComponent implements OnInit {
this._router.navigate(['Login']);
return;
}
this.userRoles = Utils.enumToArray(UserRoles).filter(r => r.key <= this._authService.getUser().role);
this.getUsersList();
if (Config.Client.authenticationRequired === true) {
this.userRoles = Utils.enumToArray(UserRoles).filter(r => r.key <= this._authService.getUser().role);
this.getUsersList();
}
}
private getUsersList() {