diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6685c2fa1586a63fe162b0515e10bfe67b7695e..31a039672851ceaf2c5e0a7d4b390db9fd44cb55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: docker:19.03.12 variables: DOCKER_TLS_CERTDIR: "/certs" - IMAGE_VER: 1.10.1 + IMAGE_VER: 1.10.2 services: - docker:19.03.12-dind diff --git a/lib/CF/Controller/SSO.pm b/lib/CF/Controller/SSO.pm index 7aae982db98160eeef30f3d2ebf2d2aeeb27dd36..95e2af6509bb7785bef43dbbdab4670f5f68c4b1 100644 --- a/lib/CF/Controller/SSO.pm +++ b/lib/CF/Controller/SSO.pm @@ -91,12 +91,19 @@ sub _users ($c, $search) { $user->{priority} = 1 if $user->{lastname} =~ /^$search/i; $user->{priority} = 2 if $user->{username} =~ /^$search/i; $user->{priority} = 3 if $user->{firstname} =~ /^$search/i; + + $user->{priority} +=10 if scalar @{ $user->{groups} }; + + GROUP: + foreach my $group ( @{ $user->{groups}} ) { + $user->{priority} +=100 if $group =~ /^cen:(f|regp)/; #TODO: do cfg + } + push @tmp, $user, } USER: foreach my $user ( sort { - $b->{included} <=> $a->{included} or $b->{priority} <=> $a->{priority} or lc($a->{firstname}) cmp lc($b->{firstname}) or lc($a->{lastname}) cmp lc($b->{lastname}) diff --git a/openapi.yaml b/openapi.yaml index 625cfcb85d1c152f9206eca95ac41467cda31692..dfc73fddf788eaf1cc8ce1dcbab0671a10aa0d64 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: - version: 1.8.0 + version: 1.10.2 title: CF Online description: CF Online license: @@ -13,10 +13,10 @@ info: url: https://pardubicky.pirati.cz/lide/andrej-ramaseuski/ servers: - - url: http://127.0.0.1:3000/api - description: Developement server - url: https://cf2021.pirati.cz/api description: Production server + - url: http://127.0.0.1:3000/api + description: Developement server components: securitySchemes: