Typos

doc/sources/admin/exportedvars.rst

@@ -45,15 +45,15 @@ module.
 Extend variables using macros and groups
 ----------------------------------------
 
-Macros and groups are calculated during authentication process by the
-portal:
+Macros and groups are computed during authentication process by the
+Portal:
 
 -  macros are used to extend (or rewrite)
    :doc:`exported variables<exportedvars>`. A macro is stored as
    attributes: it can contain boolean results or any string
 -  macros can also be used for importing environment variables *(these
    variables are in CGI format)*. Example: ``$ENV{HTTP_COOKIE}``
--  groups are stored as a string with values separated by ''; ''
+-  groups are stored as a string with values separated by '; '
    (default multivalues separator) in the special attribute ``groups``: it
    contains names of groups whose rules were returned true for the
    current user. For example:

doc/sources/admin/psgi.rst

@@ -7,7 +7,7 @@ with any compatible server:
 -  `Starman <https://metacpan.org/pod/starman>`__
 -  `Twiggy <https://metacpan.org/pod/twiggy>`__
 -  `Twiggy::Prefork <https://metacpan.org/pod/Twiggy::Prefork>`__
--  `Starman <https://metacpan.org/pod/feersum>`__
+-  `Feersum <https://metacpan.org/pod/feersum>`__
 -  uWSGI using `uWSGI PSGI
    plugin <http://uwsgi-docs.readthedocs.io/en/latest/Perl.html>`__
 -  **Alternative**: :doc:`Node.js handler<nodehandler>` can be used as

lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/StatusConstants.pm

@@ -4,7 +4,7 @@ package Lemonldap::NG::Handler::Lib::StatusConstants;
 use strict;
 use Exporter 'import';
 
-our $VERSION = '2.0.14';
+our $VERSION = '2.0.15';
 
 sub portalConsts {
     return {

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -4488,7 +4488,6 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
         },
         oidcRPMetaDataOptionsBypassConsent => {
             type    => 'bool',
-            help    => 'openidconnectclaims.html',
             default => 0
         },
         oidcRPMetaDataOptionsPostLogoutRedirectUris => { type => 'text', },

lemonldap-ng-manager/site/htdocs/static/js/conftree.js

@@ -483,7 +483,6 @@ function templates(tpl,key) {
                {
                   "default" : 0,
                   "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsBypassConsent",
-                  "help" : "openidconnectclaims.html",
                   "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsBypassConsent",
                   "title" : "oidcRPMetaDataOptionsBypassConsent",
                   "type" : "bool"

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm

@@ -30,7 +30,7 @@ use constant PROFILE => [
     qw/name family_name given_name middle_name nickname preferred_username
       profile picture website gender birthdate zoneinfo locale updated_at/
 ];
-use constant EMAIL => [qw/email email_verified/];
+use constant EMAIL   => [qw/email email_verified/];
 use constant ADDRESS =>
   [qw/formatted street_address locality region postal_code country/];
 use constant PHONE => [qw/phone_number phone_number_verified/];
@@ -2248,18 +2248,11 @@ sub getUserIDForRP {
       ->{oidcRPMetaDataOptionsUserIDAttr}
       || $self->conf->{whatToTrace};
 
-    my $user_id;
-
     # If the main attribute is a SP macro, resolve it
     # else, get it directly from session data
-    if ( $self->spMacros->{$rp}->{$user_id_attribute} ) {
-        $user_id =
-          $self->spMacros->{$rp}->{$user_id_attribute}->( $req, $data );
-    }
-    else {
-        $user_id = $data->{$user_id_attribute};
-    }
-    return $user_id;
+    return $self->spMacros->{$rp}->{$user_id_attribute}
+      ? $self->spMacros->{$rp}->{$user_id_attribute}->( $req, $data )
+      : $data->{$user_id_attribute};
 }
 
 1;