diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 073b10f697e635b4c6f3fe02be1366aea7542836..e9e74a6c0c445ff6521fe760bbc46f6d611055d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: docker:latest variables: DOCKER_TLS_CERTDIR: "/certs" - IMAGE_VER: 0.21.4 + IMAGE_VER: 0.21.5 services: - docker:dind diff --git a/lib/CF2022/Helpers/Auth.pm b/lib/CF2022/Helpers/Auth.pm index 1a70b95cbfffdd0808a780628414af127e10fdd4..45b0cb2ffc0eabcc5d948cf1f2ca66eede5e2aa0 100644 --- a/lib/CF2022/Helpers/Auth.pm +++ b/lib/CF2022/Helpers/Auth.pm @@ -76,6 +76,7 @@ sub register ( $class, $self, $conf) { $self->helper( oauth_main_group => sub ( $c ) { my $claims = $c->oauth_claims // return; + my $cen_regp; GROUP: foreach my $group ( sort @{ $claims->{groups} } ) { @@ -90,13 +91,18 @@ sub register ( $class, $self, $conf) { role => $role, }; } - elsif ( $group =~ /cen:regp/ ) { - return { - region => '', - role => 'regp', - }; + if ( $group =~ /cen:regp/ ) { + $cen_regp = 1; } } + + if ( $cen_regp ) { + return { + region => 'Praha', + role => 'regp', + }; + } + }); $self->helper( user => sub ( $c ) {