Attachment 143197 Details for Bug 31378 – Bug 31378: Add STAFF support for authentication providers

[patch] Bug 31378: Add STAFF support for authentication providers

Bug-31378-Add-STAFF-support-for-authentication-pro.patch (text/plain), 2.92 KB, created by Agustín Moyano on 2022-11-04 12:50:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Agustín Moyano

Created: 2022-11-04 12:50:29 UTC

Size: 2.92 KB

patch

obsolete

>From 3aeaa4c511e758f6819de87cfceac9d8e97e0c57 Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Tue, 27 Sep 2022 09:20:49 -0300
>Subject: [PATCH] Bug 31378: Add STAFF support for authentication providers
>
>---
> .../intranet-tmpl/prog/en/modules/auth.tt     | 29 ++++++++++++++++++-
> 1 file changed, 28 insertions(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>index 8f8affb01f..164ed907fb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>@@ -5,6 +5,7 @@
> [% USE Desks %]
> [% USE Categories %]
> [% USE Registers %]
>+[% USE AuthClient %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>@@ -15,7 +16,8 @@
>     [% ELSIF invalid_username_or_password %]Invalid username or password[% END %]
>     [% IF ( different_ip ) %]IP address change[% END %]
>     [% IF ( timed_out ) %]Session timed out[% END %]
>-    [% IF ( nopermission ) %]Access denied[% END %] &rsaquo; Koha
>+    [% IF ( nopermission ) %]Access denied[% END %]
>+    [% IF ( auth_error ) %]Error authenticating in external provider[% END %] &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% PROCESS 'auth-two-factor.inc' %]
>@@ -65,6 +67,13 @@
> <div id="login_error"><strong>Error: </strong>Invalid username or password</div>
> [% END %]
> 
>+[% IF auth_error %]
>+    <div id="login_error" class="alert alert-danger">
>+        <p>There was an error authenticating to external identity provider</p>
>+        <p>[% auth_error | html %]</p>
>+    </div>
>+[% END %]
>+
> [% IF (shibbolethAuthentication) %]
> 
> [% IF (invalidShibLogin ) %]
>@@ -75,6 +84,24 @@
> 
> [% IF !TwoFA_prompt && !TwoFA_setup && !Koha.Preference('staffShibOnly') %]
>     
>+    [% SET auth_providers = AuthClient.get_providers('staff') %]
>+    [% IF ( ! auth_providers.empty ) %]
>+        [% FOREACH provider IN auth_providers %]
>+            <p class="clearfix">
>+                <a href="[% provider.url | url %]" class="btn btn-light col-xs-12" id="provider_[% provider.code | html %]">
>+                    [% IF provider.icon_url %]
>+                    <img src="[% provider.icon_url | url %]"  style="max-height: 20px; max-width: 20px;"/>
>+                    [% ELSE %]
>+                    <i class="fa fa-user" aria-hidden="true"></i>
>+                    [% END %]
>+                    Log in with [% provider.description | html %]
>+                </a>
>+            </p>
>+        [% END %]
>+        <hr/>
>+        <p>If you do not have an external account, but do have a local account, you can still log in: </p>
>+    [% END # /IF  auth_providers.size %]
>+
>     <form action="[% script_name | html %]" method="post" name="loginform" id="loginform">
>         <input type="hidden" name="koha_login_context" value="intranet" />
>     [% FOREACH INPUT IN INPUTS %]
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 31378: 141362 | 141363 | 141364 | 141365 | 141366 | 141367 | 141368 | 141369 | 141370 | 141371 | 141372 | 141373 | 141374 | 141375 | 141376 | 141377 | 141378 | 141514 | 141771 | 141772 | 141773 | 141774 | 141775 | 141776 | 141777 | 141778 | 141779 | 141780 | 141781 | 141782 | 141783 | 141784 | 141785 | 141786 | 141787 | 141788 | 141801 | 141802 | 141803 | 141804 | 141805 | 141806 | 141807 | 141808 | 141809 | 141810 | 141811 | 141812 | 141813 | 141814 | 141815 | 141816 | 141817 | 141818 | 141853 | 143056 | 143087 | 143088 | 143089 | 143090 | 143091 | 143092 | 143093 | 143094 | 143095 | 143096 | 143097 | 143098 | 143099 | 143100 | 143101 | 143102 | 143103 | 143104 | 143105 | 143106 | 143107 | 143186 | 143187 | 143188 | 143189 | 143190 | 143191 | 143192 | 143193 | 143194 | 143195 | 143196 | 143197 | 143198 | 143199 | 143200 | 143202 | 143204 | 143205 | 143206 | 143207 | 143208 | 143215 | 143216 | 143217 | 143218 | 143219 | 143220 | 143221 | 143222 | 143223 | 143224 | 143225 | 143226 | 143227 | 143228 | 143229 | 143230 | 143231 | 143232 | 143233 | 143234 | 143235 | 143236 | 143266 | 143267 | 143268 | 143269 | 143270 | 143271 | 143272 | 143273 | 143274 | 143275 | 143277 | 143278 | 143279 | 143280 | 143281 | 143282 | 143283 | 143284 | 143285 | 143286 | 143287 | 143288 | 143396 | 143397 | 143398 | 143399 | 143400 | 143401 | 143402 | 143403 | 143404 | 143405 | 143406 | 143407 | 143408 | 143409 | 143410 | 143411 | 143412 | 143413 | 143414 | 143415 | 143416 | 143417 | 143418 | 143420 | 143421 | 143422 | 143423 | 143424 | 143425 | 143426 | 143427 | 143428 | 143429 | 143430 | 143431 | 143432 | 143433 | 143434 | 143435 | 143436 | 143437 | 143438 | 143439 | 143440 | 143441 | 143442 | 143443 | 143450 | 144071 | 144175