Bugzilla – Attachment 143440 Details for
Bug 31378
Add a generic OAuth2/OIDC client implementation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31378: (follow-up) catch startup error when missing Oauth provider table
Bug-31378-follow-up-catch-startup-error-when-missi.patch (text/plain), 1.72 KB, created by
Martin Renvoize (ashimema)
on 2022-11-08 15:25:43 UTC
(
hide
)
Description:
Bug 31378: (follow-up) catch startup error when missing Oauth provider table
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-11-08 15:25:43 UTC
Size:
1.72 KB
patch
obsolete
>From b8741c8f7b45acf122967e18db54d2c393ddb312 Mon Sep 17 00:00:00 2001 >From: David Cook <dcook@prosentient.com.au> >Date: Thu, 3 Nov 2022 09:32:03 -0300 >Subject: [PATCH] Bug 31378: (follow-up) catch startup error when missing Oauth > provider table > >In theory, this shouldn't come up with a package install, but >it could happen with other installations, so best to let it get to >the web installer. > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > Koha/REST/V1.pm | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > >diff --git a/Koha/REST/V1.pm b/Koha/REST/V1.pm >index 0c35c6f005..cfb7a597f4 100644 >--- a/Koha/REST/V1.pm >+++ b/Koha/REST/V1.pm >@@ -140,12 +140,17 @@ sub startup { > }; > > my $oauth_configuration = {}; >- my $search_options = { protocol => [ "OIDC", "OAuth" ] }; >- my $providers = Koha::Auth::Identity::Providers->search( $search_options ); >+ try { >+ my $search_options = { protocol => [ "OIDC", "OAuth" ] }; > >- while(my $provider = $providers->next) { >- $oauth_configuration->{$provider->code} = decode_json($provider->config); >- } >+ my $providers = Koha::Auth::Identity::Providers->search($search_options); >+ while ( my $provider = $providers->next ) { >+ $oauth_configuration->{ $provider->code } = decode_json( $provider->config ); >+ } >+ } catch { >+ my $logger = Koha::Logger->get( { interface => 'api' } ); >+ $logger->warn( "Warning: Failed to fetch oauth configuration: " . $_ ); >+ }; > > $self->plugin( 'Koha::REST::Plugin::Pagination' ); > $self->plugin( 'Koha::REST::Plugin::Query' ); >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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