From 5b51c37181bef2395ffdd149a98955bc95733cea Mon Sep 17 00:00:00 2001
From: Sadashiv Dalvi <dalvisadashiv@gmail.com>
Date: Sat, 23 May 2020 09:53:00 +0530
Subject: [PATCH] Using core redirect function to redirect
---
src/Controller/Callback.php | 7 ++-----
src/Form/GoogleApiClientDeleteForm.php | 4 +---
src/Form/GoogleApiClientRevokeForm.php | 4 +---
src/Form/GoogleApiServiceClientDeleteForm.php | 4 +---
4 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/Controller/Callback.php b/src/Controller/Callback.php
index 0150034..28c9ba5 100644
--- a/src/Controller/Callback.php
+++ b/src/Controller/Callback.php
@@ -7,7 +7,6 @@ use Drupal\Core\Link;
use Drupal\Core\Routing\TrustedRedirectResponse;
use Drupal\google_api_client\Service\GoogleApiClientService;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -91,9 +90,8 @@ class Callback extends ControllerBase {
$google_api_client->setAuthenticated(TRUE);
$google_api_client->save();
unset($_SESSION['google_api_client_account_id']);
- $response = new RedirectResponse('/admin/config/services/google_api_client');
\Drupal::messenger()->addMessage(t('Api Account saved'));
- return $response;
+ $this->redirect('entity.google_api_client.collection')->send();
}
if ($this->googleApiClient->googleClient) {
$auth_url = $this->googleApiClient->googleClient->createAuthUrl();
@@ -103,8 +101,7 @@ class Callback extends ControllerBase {
}
// Let other modules act of google response.
\Drupal::moduleHandler()->invokeAll('google_api_client_google_response', [$request]);
- $response = new RedirectResponse('/admin/config/services/google_api_client');
- return $response;
+ $this->redirect('entity.google_api_client.collection')->send();
}
}
diff --git a/src/Form/GoogleApiClientDeleteForm.php b/src/Form/GoogleApiClientDeleteForm.php
index 274464b..a161745 100644
--- a/src/Form/GoogleApiClientDeleteForm.php
+++ b/src/Form/GoogleApiClientDeleteForm.php
@@ -5,7 +5,6 @@ namespace Drupal\google_api_client\Form;
use Drupal\Core\Entity\ContentEntityConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
-use Symfony\Component\HttpFoundation\RedirectResponse;
/**
* Provides a form for deleting a google_api_client entity.
@@ -50,8 +49,7 @@ class GoogleApiClientDeleteForm extends ContentEntityConfirmFormBase {
$google_api_client->delete();
parent::submitForm($form, $form_state);
\Drupal::messenger()->addMessage('GoogleApiClient account deleted successfully');
- $response = new RedirectResponse('/admin/config/services/google_api_client');
- $response->send();
+ $this->redirect('entity.google_api_client.collection')->send();
}
}
diff --git a/src/Form/GoogleApiClientRevokeForm.php b/src/Form/GoogleApiClientRevokeForm.php
index c2b6488..8ae7caf 100644
--- a/src/Form/GoogleApiClientRevokeForm.php
+++ b/src/Form/GoogleApiClientRevokeForm.php
@@ -5,7 +5,6 @@ namespace Drupal\google_api_client\Form;
use Drupal\Core\Entity\ContentEntityConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
-use Symfony\Component\HttpFoundation\RedirectResponse;
/**
* Provides a form for revoking a google_api_client entity.
@@ -55,8 +54,7 @@ class GoogleApiClientRevokeForm extends ContentEntityConfirmFormBase {
$google_api_client->save();
parent::submitForm($form, $form_state);
\Drupal::messenger()->addMessage('GoogleApiClient account revoked successfully');
- $response = new RedirectResponse('/admin/config/services/google_api_client');
- $response->send();
+ $this->redirect('entity.google_api_client.collection')->send();
}
}
diff --git a/src/Form/GoogleApiServiceClientDeleteForm.php b/src/Form/GoogleApiServiceClientDeleteForm.php
index c926f0e..16e405c 100644
--- a/src/Form/GoogleApiServiceClientDeleteForm.php
+++ b/src/Form/GoogleApiServiceClientDeleteForm.php
@@ -5,7 +5,6 @@ namespace Drupal\google_api_client\Form;
use Drupal\Core\Entity\EntityConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
-use Symfony\Component\HttpFoundation\RedirectResponse;
/**
* Provides a form for deleting a google_api_service_client entity.
@@ -50,8 +49,7 @@ class GoogleApiServiceClientDeleteForm extends EntityConfirmFormBase {
$google_api_service_client->delete();
parent::submitForm($form, $form_state);
\Drupal::messenger()->addMessage('GoogleApiServiceClient account deleted successfully');
- $response = new RedirectResponse('/admin/config/services/google_api_service_client');
- $response->send();
+ $this->redirect('entity.google_api_client.collection')-send();
}
}
--
GitLab