Fix usage of initial state

Signed-off-by: Vitor Mattos <vitor@php.rio>
LibreSign · Apr 10, 2023 · afba20b · afba20b
1 parent 741ac2e
commit afba20b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -49,12 +49,12 @@ public function __construct(
 	 * @return TemplateResponse
 	 */
 	public function index(): TemplateResponse {
-		$this->initialState->provideInitialState('config', json_encode($this->accountService->getConfig(
+		$this->initialState->provideInitialState('config', $this->accountService->getConfig(
 			'file_user_uuid',
 			$this->request->getParam('uuid'),
 			$this->userSession->getUser(),
 			'url'
-		)));
+		));
 
 		Util::addScript(Application::APP_ID, 'libresign-main');
 
@@ -72,12 +72,12 @@ public function index(): TemplateResponse {
 	 * @return TemplateResponse
 	 */
 	public function sign($uuid): TemplateResponse {
-		$this->initialState->provideInitialState('config', json_encode($this->accountService->getConfig(
+		$this->initialState->provideInitialState('config', $this->accountService->getConfig(
 			'file_user_uuid',
 			$uuid,
 			$this->userSession->getUser(),
 			'url'
-		)));
+		));
 
 		Util::addScript(Application::APP_ID, 'libresign-external');
 		$response = new TemplateResponse(Application::APP_ID, 'external', [], TemplateResponse::RENDER_AS_BASE);
@@ -97,12 +97,12 @@ public function sign($uuid): TemplateResponse {
 	 * @return TemplateResponse
 	 */
 	public function signAccountFile($uuid): TemplateResponse {
-		$this->initialState->provideInitialState('config', json_encode($this->accountService->getConfig(
+		$this->initialState->provideInitialState('config', $this->accountService->getConfig(
 			'file_uuid',
 			$uuid,
 			$this->userSession->getUser(),
 			'url'
-		)));
+		));
 
 		Util::addScript(Application::APP_ID, 'libresign-external');
 		$response = new TemplateResponse(Application::APP_ID, 'external', [], TemplateResponse::RENDER_AS_BASE);
@@ -175,12 +175,12 @@ public function getPdfUser($uuid) {
 	 * @return TemplateResponse
 	 */
 	public function validation(): TemplateResponse {
-		$this->initialState->provideInitialState('config', json_encode($this->accountService->getConfig(
+		$this->initialState->provideInitialState('config', $this->accountService->getConfig(
 			'file_user_uuid',
 			$this->request->getParam('uuid'),
 			$this->userSession->getUser(),
 			'url'
-		)));
+		));
 
 		Util::addScript(Application::APP_ID, 'libresign-validation');
 		$response = new TemplateResponse(Application::APP_ID, 'validation', [], TemplateResponse::RENDER_AS_BASE);
@@ -209,12 +209,12 @@ public function validationFileWithShortUrl(): RedirectResponse {
 	 * @return TemplateResponse
 	 */
 	public function resetPassword(): TemplateResponse {
-		$this->initialState->provideInitialState('config', json_encode($this->accountService->getConfig(
+		$this->initialState->provideInitialState('config', $this->accountService->getConfig(
 			'file_user_uuid',
 			$this->request->getParam('uuid'),
 			$this->userSession->getUser(),
 			'url'
-		)));
+		));
 
 		Util::addScript(Application::APP_ID, 'libresign-main');
 		$response = new TemplateResponse(Application::APP_ID, 'reset_password');
@@ -230,12 +230,12 @@ public function resetPassword(): TemplateResponse {
 	 * @PublicPage
 	 */
 	public function validationFile(string $uuid): TemplateResponse {
-		$this->initialState->provideInitialState('config', json_encode($this->accountService->getConfig(
+		$this->initialState->provideInitialState('config', $this->accountService->getConfig(
 			'file_user_uuid',
 			$uuid,
 			$this->userSession->getUser(),
 			'url'
-		)));
+		));
 
 		Util::addScript(Application::APP_ID, 'libresign-validation');
 		$response = new TemplateResponse(Application::APP_ID, 'validation', [], TemplateResponse::RENDER_AS_BASE);

diff --git a/src/services/InitialStateService.js b/src/services/InitialStateService.js
@@ -2,7 +2,7 @@ import { loadState } from '@nextcloud/initial-state'
 
 export const getInitialState = () => {
 	try {
-		const initialState = JSON.parse(loadState('libresign', 'config'))
+		const initialState = loadState('libresign', 'config')
 		return initialState
 	} catch (err) {
 		return console.error('error in loadState: ', err)