Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cern-drupal-distribution
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
drupal
paas
cern-drupal-distribution
Commits
5ce285af
Commit
5ce285af
authored
4 years ago
by
Francisco Borges Aurindo Barros
Browse files
Options
Downloads
Patches
Plain Diff
new patch test
parent
e2f3ecf8
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
composer.json
+3
-1
3 additions, 1 deletion
composer.json
patches/new_autologin.patch
+31
-0
31 additions, 0 deletions
patches/new_autologin.patch
with
34 additions
and
1 deletion
composer.json
+
3
−
1
View file @
5ce285af
...
...
@@ -361,7 +361,9 @@
},
"drupal/openid_connect"
:
{
"OIDC roles mapping from JWT https://www.drupal.org/project/openid_connect/issues/3166508"
:
"patches/openid_connect-3166508-role-mapping.patch"
,
"OIDC autologin (skip Drupal login page) https://www.drupal.org/project/openid_connect/issues/3011413"
:
"patches/openid_connect-3011413-autologin.patch"
"OIDC autologin (skip Drupal login page) https://www.drupal.org/project/openid_connect/issues/3011413"
:
"patches/openid_connect-3011413-autologin.patch"
,
"OIDC redirect URL after login"
:
"patches/openid_connect-redirect-url.2921477-25.patch"
,
"OIDC repatch "
:
"patches/new_autologin.patch"
},
"__comments__"
:
{
}
...
...
This diff is collapsed.
Click to expand it.
patches/new_autologin.patch
0 → 100644
+
31
−
0
View file @
5ce285af
--- openid_connect_orig/src/EventSubscriber/OpenIDConnectAutoLogin.php 2021-07-12 17:35:12.000000001 +0200
+++ openid_connect/src/EventSubscriber/OpenIDConnectAutoLogin.php 2021-07-12 18:12:14.000000001 +0200
@@ -91,17 +91,21 @@
*/
public function login(GetResponseEvent $event) {
// Get current request.
+ Drupal::logger('oidc_debug')->warning("Starting Login AutoLogin...");
$request = $event->getRequest();
// Check if user is anonymous and login or register page was requested.
if ($this->isAutostartEnabled() && $this->currentUser->isAnonymous() && $this->isLoginRequested($request)) {
+ Drupal::logger('oidc_debug')->warning("Login Autologin, user anonymous and login is requested");
// If there is no login errors and login process is not in progress
// and openid_connect_bypass is not provided, then start login process.
if (!$this->hasErrors() && !$this->bypassAutoLogin($request)) {
+ Drupal::logger('oidc_debug')->warning("Login Autologin, no errors and no bypassAutoLogin");
// Start OpenID Connect login process.
Drupal::service('openid_connect.session')->saveDestination();
$_SESSION['openid_connect_op'] = 'login';
$client = $this->getClient();
if ($client) {
+ Drupal::logger('oidc_debug')->warning("Login Autologin, client exists");
$response = $client->authorize();
// Redirect to given response.
$event->setResponse($response);
@@ -229,6 +233,7 @@
* TRUE if regular Drupal login process should start, FALSE otherwise.
*/
protected function bypassAutoLogin(Request $request) {
+ Drupal::logger('oidc_debug')->warning("bypassAutoLogin : " . $request->query->has('showcore'));
return $request->query->has('showcore');
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment