From 820025ae98fa7cf6bfe5864c04dd57f50751595d Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 28 Apr 2020 09:41:27 +0200
Subject: [PATCH] rename update-password to reset-password (to close with
password-modification)
---
src/app/user/controllers/UserController.php | 2 +-
src/core/controllers/AuthenticationController.php | 2 +-
src/frontend/app/app-routing.module.ts | 4 ++--
src/frontend/app/app.module.ts | 4 ++--
.../reset-password.component.html} | 0
.../reset-password.component.scss} | 0
.../reset-password.component.ts} | 6 +++---
7 files changed, 9 insertions(+), 9 deletions(-)
rename src/frontend/app/login/{updatePassword/updatePassword.component.html => resetPassword/reset-password.component.html} (100%)
rename src/frontend/app/login/{updatePassword/updatePassword.component.scss => resetPassword/reset-password.component.scss} (100%)
rename src/frontend/app/login/{updatePassword/updatePassword.component.ts => resetPassword/reset-password.component.ts} (97%)
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index c0cf5896427..2f14d1f1ddb 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -1647,7 +1647,7 @@ class UserController
$resetToken = AuthenticationController::getResetJWT(['id' => $user['id'], 'expirationTime' => 3600]); // 1 hour
UserModel::update(['set' => ['reset_token' => $resetToken], 'where' => ['id = ?'], 'data' => [$user['id']]]);
- $url = UrlController::getCoreUrl() . 'dist/index.html#/update-password?token=' . $resetToken;
+ $url = UrlController::getCoreUrl() . 'dist/index.html#/reset-password?token=' . $resetToken;
$configuration = ConfigurationModel::getByService(['service' => 'admin_email_server', 'select' => ['value']]);
$configuration = json_decode($configuration['value'], true);
if (!empty($configuration['from'])) {
diff --git a/src/core/controllers/AuthenticationController.php b/src/core/controllers/AuthenticationController.php
index 8a792796106..95c7d9d63af 100755
--- a/src/core/controllers/AuthenticationController.php
+++ b/src/core/controllers/AuthenticationController.php
@@ -359,7 +359,7 @@ class AuthenticationController
$resetToken = AuthenticationController::getResetJWT(['id' => $args['userId'], 'expirationTime' => 1209600]); // 14 days
UserModel::update(['set' => ['reset_token' => $resetToken], 'where' => ['id = ?'], 'data' => [$args['userId']]]);
- $url = UrlController::getCoreUrl() . 'dist/index.html#/update-password?token=' . $resetToken;
+ $url = UrlController::getCoreUrl() . 'dist/index.html#/reset-password?token=' . $resetToken;
$configuration = ConfigurationModel::getByService(['service' => 'admin_email_server', 'select' => ['value']]);
$configuration = json_decode($configuration['value'], true);
diff --git a/src/frontend/app/app-routing.module.ts b/src/frontend/app/app-routing.module.ts
index 7c3c7c6a34d..4dfabf04783 100755
--- a/src/frontend/app/app-routing.module.ts
+++ b/src/frontend/app/app-routing.module.ts
@@ -14,7 +14,7 @@ import { AppGuard, AfterProcessGuard } from '../service/app.guard';
import { FolderDocumentListComponent } from './folder/document-list/folder-document-list.component';
import { IndexationComponent } from './indexation/indexation.component';
import { ForgotPasswordComponent } from './login/forgotPassword/forgotPassword.component';
-import { UpdatePasswordComponent } from './login/updatePassword/updatePassword.component';
+import { ResetPasswordComponent } from './login/resetPassword/reset-password.component';
import { ProcessComponent } from './process/process.component';
import { FollowedDocumentListComponent } from './home/followed-list/followed-document-list.component';
import { LoginComponent } from './login/login.component';
@@ -37,7 +37,7 @@ import { DocumentViewerPageComponent } from './viewer/page/document-viewer-page.
{ path: 'signatureBook/users/:userId/groups/:groupId/baskets/:basketId/resources/:resId', canActivate: [AppGuard], component: SignatureBookComponent },
{ path: 'indexing/:groupId', canActivate: [AppGuard], component: IndexationComponent },
{ path: 'forgot-password', component: ForgotPasswordComponent },
- { path: 'update-password', component: UpdatePasswordComponent },
+ { path: 'reset-password', component: ResetPasswordComponent },
{ path: 'followed', canActivate: [AppGuard], component: FollowedDocumentListComponent },
{ path: 'resources/:detailResId', canActivate: [AppGuard], canDeactivate: [AfterProcessGuard], component: ProcessComponent },
{ path: 'resources/:resId/content', canActivate: [AppGuard], component: DocumentViewerPageComponent },
diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts
index 1dc1dbfc204..8da84943ec7 100755
--- a/src/frontend/app/app.module.ts
+++ b/src/frontend/app/app.module.ts
@@ -86,7 +86,7 @@ import { PrintSeparatorComponent } from './separator/print-separator/print-separ
import { IndexationComponent } from './indexation/indexation.component';
import { ForgotPasswordComponent } from './login/forgotPassword/forgotPassword.component';
-import { UpdatePasswordComponent } from './login/updatePassword/updatePassword.component';
+import { ResetPasswordComponent } from './login/resetPassword/reset-password.component';
import { HistoryWorkflowResumeComponent } from './history/history-workflow-resume/history-workflow-resume.component';
import { NoteResumeComponent } from './notes/note-resume/note-resume.component';
import { AttachmentsResumeComponent } from './attachments/attachments-resume/attachments-resume.component';
@@ -191,7 +191,7 @@ import { DocumentViewerPageComponent } from './viewer/page/document-viewer-page.
FolderActionListComponent,
IndexationComponent,
ForgotPasswordComponent,
- UpdatePasswordComponent,
+ ResetPasswordComponent,
HistoryWorkflowResumeComponent,
NoteResumeComponent,
AttachmentsResumeComponent,
diff --git a/src/frontend/app/login/updatePassword/updatePassword.component.html b/src/frontend/app/login/resetPassword/reset-password.component.html
similarity index 100%
rename from src/frontend/app/login/updatePassword/updatePassword.component.html
rename to src/frontend/app/login/resetPassword/reset-password.component.html
diff --git a/src/frontend/app/login/updatePassword/updatePassword.component.scss b/src/frontend/app/login/resetPassword/reset-password.component.scss
similarity index 100%
rename from src/frontend/app/login/updatePassword/updatePassword.component.scss
rename to src/frontend/app/login/resetPassword/reset-password.component.scss
diff --git a/src/frontend/app/login/updatePassword/updatePassword.component.ts b/src/frontend/app/login/resetPassword/reset-password.component.ts
similarity index 97%
rename from src/frontend/app/login/updatePassword/updatePassword.component.ts
rename to src/frontend/app/login/resetPassword/reset-password.component.ts
index 2f711572d82..e50d52e5ed1 100644
--- a/src/frontend/app/login/updatePassword/updatePassword.component.ts
+++ b/src/frontend/app/login/resetPassword/reset-password.component.ts
@@ -7,10 +7,10 @@ import { finalize } from 'rxjs/operators';
import { AuthService } from '../../../service/auth.service';
@Component({
- templateUrl: 'updatePassword.component.html',
- styleUrls: ['updatePassword.component.scss'],
+ templateUrl: 'reset-password.component.html',
+ styleUrls: ['reset-password.component.scss'],
})
-export class UpdatePasswordComponent implements OnInit {
+export class ResetPasswordComponent implements OnInit {
lang: any = LANG;
loadingForm: boolean = false;
--
GitLab