diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0f6f23e25300b202b65a5ecb34ff62b306ad981..10d37664c6fd300019c224909b52a404bd75f6a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,10 @@ -image: docker:24 +image: docker:latest variables: DOCKER_TLS_CERTDIR: "/certs" services: - - docker:24-dind + - docker:dind before_script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY diff --git a/VERSION b/VERSION index 1817afea416c4a8e4814d22f5f4b2dcf4b0807e6..9f8d8a9164a7ba7a14228a3d2a94931bcfbdf97c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.8.2 +2.8.3 diff --git a/lib/PZ/Controller/Shortcut.pm b/lib/PZ/Controller/Shortcut.pm index 316fcec5677a0cd5d690f473e6274707e9e947a0..e71d6abac5b2056f9d614b15adcbc01450ebad75 100644 --- a/lib/PZ/Controller/Shortcut.pm +++ b/lib/PZ/Controller/Shortcut.pm @@ -68,7 +68,7 @@ sub create ($c) { my $shortcut = $user->add_to_shortcuts({ url => $url, - title => $title, + title => ($title || ''), shortcut => ($custom || $c->schema->resultset('Shortcut')->generate()) }); diff --git a/lib/PZ/Helpers/OIDC.pm b/lib/PZ/Helpers/OIDC.pm index 66d8a4cb75dd6a360d33804da27b34da3efd7949..90ba8eba87824924944be8ecaf59355821d76ee6 100644 --- a/lib/PZ/Helpers/OIDC.pm +++ b/lib/PZ/Helpers/OIDC.pm @@ -23,8 +23,9 @@ sub register { my $res = $tx->result; if ($res->is_success) { + my $key = join "\n", unpack("(A64)*", $res->json->{public_key}); $jwt = Mojo::JWT->new( - public => sprintf( KEY_FORMAT, $res->json->{public_key} ) + public => sprintf( KEY_FORMAT, $key ) ); }