may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve PrijavaZRacuniModalBlock variable caching issue

Browse Source
This commit is contained in:
Tilen Gombac 2022-10-28 13:21:43 +02:00
parent 3da35ee494
commit 15fc49bbab
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
View File

@ -96,9 +96,9 @@ function prijava_1ka_theme()
'prijava_z_racuni_modal_block' => [ 'prijava_z_racuni_modal_block' => [
'variables' => [ 'variables' => [
'rememberMe' => FALSE,
'rememberMe' => (empty($_COOKIE['remember-me']) ? true : false), 'url_google' => $url_google,
'url_google' => $url_google 'lang' => [],
] ]
] ]
]; ];

25
frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
View File

@ -20,10 +20,29 @@ class PrijavaZRacuniModalBlock extends BlockBase {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function build() { public function build() {
//Url linki za preusmeritev
$redirect_url = 'https://www.1ka.si/frontend/api/google-oauth2.php';
$url_google = 'https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=944153399779-m39ehn45vm6b64l0sac7hphtpm0esgqs.apps.googleusercontent.com&redirect_uri='.$redirect_url;
return [ if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
'#theme' => 'prijava_z_racuni_modal_block', include(__DIR__ . '../../../../../../../../../lang/1.php');
];
$url_google .= '&state=';
} else{
include(__DIR__ . '../../../../../../../../../lang/2.php');
$url_google .= '&state=regFromEnglish';
}
$url_google .= '&scope=email&access_type=online&prompt=consent';
$url_google .= '&openid.realm=https://www.1ka.si';
return [
'#theme' => 'prijava_z_racuni_modal_block',
'#rememberMe' => empty($_COOKIE['remember-me']),
'#url_google' => $url_google,
'#lang' => $lang ?? [],
];
} }
} }