xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

fixing sharing password bug

Browse Source
This commit is contained in:
Patrik J. Braun 2018-05-16 17:47:32 -04:00
parent a2c39653e5
commit 1b2e941fa5
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/middlewares/SharingMWs.ts
View File

@ -83,7 +83,7 @@ export class SharingMWs {
id: updateSharing.id, id: updateSharing.id,
path: directoryName, path: directoryName,
sharingKey: '', sharingKey: '',
password: updateSharing.password, password: (updateSharing.password && updateSharing.password !== '') ? updateSharing.password : null,
creator: req.session.user, creator: req.session.user,
expires: Date.now() + updateSharing.valid, expires: Date.now() + updateSharing.valid,
includeSubfolders: updateSharing.includeSubfolders, includeSubfolders: updateSharing.includeSubfolders,

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

@ -93,9 +93,12 @@ export class AuthenticationMWs {
const sharing = await ObjectManagerRepository.getInstance().SharingManager.findOne({ const sharing = await ObjectManagerRepository.getInstance().SharingManager.findOne({
sharingKey: req.query.sk || req.params.sharingKey, sharingKey: req.query.sk || req.params.sharingKey,
}); });
console.log(sharing);
if (!sharing || sharing.expires < Date.now() || if (!sharing || sharing.expires < Date.now() ||
(Config.Client.Sharing.passwordProtected === true (Config.Client.Sharing.passwordProtected === true
&& sharing.password && !PasswordHelper.comparePassword(password, sharing.password))) { && (sharing.password)
&& !PasswordHelper.comparePassword(password, sharing.password))) {
return next(new ErrorDTO(ErrorCodes.CREDENTIAL_NOT_FOUND)); return next(new ErrorDTO(ErrorCodes.CREDENTIAL_NOT_FOUND));
} }
@ -159,7 +162,9 @@ export class AuthenticationMWs {
return null; return null;
} }
if (Config.Client.Sharing.passwordProtected === true && sharing.password) { console.log(sharing);
if (Config.Client.Sharing.passwordProtected === true && (sharing.password)) {
return null; return null;
} }

4
frontend/app/gallery/share/share.gallery.component.ts
View File

@ -87,14 +87,14 @@ export class GalleryShareComponent implements OnInit, OnDestroy {
if (this.sharing == null) { if (this.sharing == null) {
return; return;
} }
this.url = 'loading..'; this.url = this.i18n('loading..');
this.sharing = await this._sharingService.updateSharing(this.currentDir, this.sharing = await this._sharingService.updateSharing(this.currentDir,
this.sharing.id, this.input.includeSubfolders, this.input.password, this.calcValidity()); this.sharing.id, this.input.includeSubfolders, this.input.password, this.calcValidity());
this.url = Config.Client.publicUrl + '/share/' + this.sharing.sharingKey; this.url = Config.Client.publicUrl + '/share/' + this.sharing.sharingKey;
} }
async get() { async get() {
this.url = 'loading..'; this.url = this.i18n('loading..');
this.sharing = await this._sharingService.createSharing(this.currentDir, this.input.includeSubfolders, this.calcValidity()); this.sharing = await this._sharingService.createSharing(this.currentDir, this.input.includeSubfolders, this.calcValidity());
this.url = Config.Client.publicUrl + '/share/' + this.sharing.sharingKey; this.url = Config.Client.publicUrl + '/share/' + this.sharing.sharingKey;
} }

2
package.json
View File

@ -55,7 +55,7 @@
"@angular/core": "5.2.10", "@angular/core": "5.2.10",
"@angular/forms": "5.2.10", "@angular/forms": "5.2.10",
"@angular/http": "5.2.10", "@angular/http": "5.2.10",
"@angular/language-service": "5.2.10", "@angular/language-service": "^5.2.10",
"@angular/platform-browser": "5.2.10", "@angular/platform-browser": "5.2.10",
"@angular/platform-browser-dynamic": "5.2.10", "@angular/platform-browser-dynamic": "5.2.10",
"@angular/router": "5.2.10", "@angular/router": "5.2.10",