j1_template_mde 2018.4.26 → 2018.4.27
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/j1/version.rb +1 -1
- data/lib/j1_app/j1_auth_manager/auth_manager.rb +71 -63
- data/lib/starter_web/Gemfile +2 -2
- data/lib/starter_web/_config.yml +4 -4
- data/lib/starter_web/_plugins/asciidoctor-extensions/fab-icon-inline.rb +33 -0
- data/lib/starter_web/_plugins/asciidoctor-extensions/fas-icon-inline.rb +33 -0
- data/lib/starter_web/_plugins/asciidoctor-extensions/lightbox-block.rb +1 -1
- data/lib/starter_web/_plugins/asciidoctor-extensions/mdi-icon-inline.rb +33 -0
- data/lib/starter_web/_plugins/asciidoctor-extensions/twitter-emoji-inline.rb +3 -35
- data/lib/starter_web/assets/data/mdi_icons.json +2090 -2090
- data/lib/starter_web/assets/themes/j1/core/css/vendor.css +1756 -17
- data/lib/starter_web/assets/themes/j1/core/css/vendor.min.css +1 -1
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-brands-400.eot +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-brands-400.svg +3454 -985
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-brands-400.ttf +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-brands-400.woff +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-brands-400.woff2 +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-regular-400.eot +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-regular-400.svg +798 -358
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-regular-400.ttf +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-regular-400.woff +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-regular-400.woff2 +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-solid-900.eot +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-solid-900.svg +4522 -1408
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-solid-900.ttf +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-solid-900.woff +0 -0
- data/lib/starter_web/assets/themes/j1/core/fonts/fontawesome_5/fonts/fa-solid-900.woff2 +0 -0
- data/lib/starter_web/assets/themes/j1/core/js/adapter/algolia.js +13 -6
- data/lib/starter_web/assets/themes/j1/core/js/template.js +1 -1
- data/lib/starter_web/assets/themes/j1/core/js/template.js.map +1 -1
- data/lib/starter_web/assets/themes/j1/core/js/template.min.js +1 -1
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/public/about/become_a_patron.adoc +2 -4
- data/lib/starter_web/pages/public/start/roundtrip/000_includes/attributes.asciidoc +3 -2
- data/lib/starter_web/pages/public/start/roundtrip/000_includes/documents/100_gistblock.asciidoc +2 -2
- data/lib/starter_web/pages/public/start/roundtrip/500_asciidoc_extensions.adoc +83 -45
- data/lib/starter_web/pages/public/start/roundtrip/800_search_engine.adoc +1 -1
- metadata +5 -3
- data/lib/starter_web/assets/themes/j1/core/js/adapter/toccer.js.new +0 -265
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7e598f2b2266c1c903fb8033656e9b54dd135ee2
|
4
|
+
data.tar.gz: 9fd291480d254a446482bae7766f9d082e340efc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e36eb684b25b9b847b93e6059f8d4f6596ca05bde78b575c8fddbc34776c7e4424a371b3fb6318a75b0fb2caea8ede6f4b9d9a653deb0f9a151d289c0f4e9e28
|
7
|
+
data.tar.gz: ebc30dc30c3a84f7c862dc7402ed7b3b4ae5978ab35e409ac5c1d4380375a1aedb979528cc6fe8dc2f50cd7907743150fa1b2d541560bbb9314860fd33600aa4
|
data/lib/j1/version.rb
CHANGED
@@ -284,6 +284,8 @@ module J1App
|
|
284
284
|
# --------------------------------------------------------------------------
|
285
285
|
before '/(pages|posts)/*' do
|
286
286
|
|
287
|
+
log_info! 'AuthManager', 'PreFlight', 'Initial checks initiated'
|
288
|
+
|
287
289
|
# read existing/current cookie 'j1.web.session'
|
288
290
|
# to update all data of j1_web_session (hash)
|
289
291
|
# if request.warden.user.respond_to?(:info)
|
@@ -295,8 +297,8 @@ module J1App
|
|
295
297
|
|
296
298
|
log_info! 'PreFlight', 'Cookie', 'Read web session data' # "#{session_decoded}"
|
297
299
|
else
|
298
|
-
requested_page
|
299
|
-
j1_web_session['requested_page']
|
300
|
+
requested_page = env['REQUEST_URI']
|
301
|
+
j1_web_session['requested_page'] = "#{env['REQUEST_URI']}"
|
300
302
|
end
|
301
303
|
|
302
304
|
# Create|Initialize the J1 web session cookie
|
@@ -330,22 +332,22 @@ module J1App
|
|
330
332
|
|
331
333
|
# User state|content detection for implicit authentication
|
332
334
|
# ------------------------------------------------------------------------
|
333
|
-
log_info! 'PreFlight', 'CheckConfig', 'Authentication check
|
335
|
+
log_info! 'PreFlight', 'CheckConfig', 'Authentication check', 'disabled' if authentication_enabled? == false
|
334
336
|
log_info! 'PreFlight', 'AuthCheck', 'Pass for all pages' if authentication_enabled? == false
|
335
337
|
pass if authentication_enabled? == false
|
336
338
|
|
337
|
-
log_info! 'PreFlight', 'CheckConfig', 'Authentication check
|
338
|
-
log_info! 'PreFlight', 'DetectContent', 'Public content
|
339
|
+
log_info! 'PreFlight', 'CheckConfig', 'Authentication check', 'enabled'
|
340
|
+
log_info! 'PreFlight', 'DetectContent', 'Public content', 'YES' if public_content?
|
339
341
|
log_info! 'PreFlight', 'DetectContent', 'Pass all public content' if public_content?
|
340
342
|
pass if public_content?
|
341
343
|
|
342
|
-
log_info! 'PreFlight', 'DetectContent', 'Check
|
344
|
+
log_info! 'PreFlight', 'DetectContent', 'Check content type'
|
343
345
|
|
344
346
|
requested_page = env['REQUEST_URI']
|
345
347
|
requested_page.scan(/(private|premium)/) do |match|
|
346
348
|
|
347
349
|
category = match[0]
|
348
|
-
log_info! 'PreFlight', 'DetectContent', 'Content detected', "#{category}"
|
350
|
+
log_info! 'PreFlight', 'DetectContent', 'Content type detected', "#{category}"
|
349
351
|
|
350
352
|
log_info! 'PreFlight', 'AuthCheck', 'Check authorisation status'
|
351
353
|
if warden.authenticated?
|
@@ -368,7 +370,7 @@ module J1App
|
|
368
370
|
if permissions[:"#{category}"].include? current_provider
|
369
371
|
log_info! 'PreFlight', 'ContentCheck', 'Provider detected', "#{current_provider}"
|
370
372
|
log_info! 'PreFlight', 'ContentCheck', 'Category detected', "#{category}"
|
371
|
-
log_info! 'PreFlight', 'ContentCheck', 'Category
|
373
|
+
log_info! 'PreFlight', 'ContentCheck', 'Category support', 'enabled'
|
372
374
|
|
373
375
|
# Check permissions
|
374
376
|
#
|
@@ -422,9 +424,9 @@ module J1App
|
|
422
424
|
path: '/'
|
423
425
|
)
|
424
426
|
|
425
|
-
log_info! 'PreFlight', '
|
427
|
+
log_info! 'PreFlight', 'Redirect', 'Call API request', 'PageValidate'
|
426
428
|
allowed_users = providers["#{provider}"]['users'].join(',')
|
427
|
-
redirect "/
|
429
|
+
redirect "/page_validation?provider=#{provider}&category=#{category}&page=#{requested_page}&allowed_users=#{allowed_users}"
|
428
430
|
end
|
429
431
|
log_info! 'PreFlight', 'AuthCheck', 'Pass to requested page', "#{requested_page}"
|
430
432
|
pass
|
@@ -437,7 +439,7 @@ module J1App
|
|
437
439
|
provider_strategy = :"#{strategy}"
|
438
440
|
|
439
441
|
log_info! 'PreFlight', 'AuthCheck', 'Start processing provider', "#{default_provider}"
|
440
|
-
log_info! 'PreFlight', 'AuthCheck', '
|
442
|
+
log_info! 'PreFlight', 'AuthCheck', 'Authentication strategy', "#{provider_strategy}"
|
441
443
|
|
442
444
|
case provider_strategy
|
443
445
|
|
@@ -457,12 +459,12 @@ module J1App
|
|
457
459
|
logger.info "Hi There, #{j1_web_session[:user_name]}! You have access to the #{params['id']} team"
|
458
460
|
|
459
461
|
when :member
|
460
|
-
log_info! 'PreFlight', 'AuthCheck', 'Process
|
462
|
+
log_info! 'PreFlight', 'AuthCheck', 'Process authentication strategy'
|
461
463
|
|
462
464
|
if env['HTTP_COOKIE'].include? 'j1.web.session'
|
463
465
|
session_encoded = request.cookies['j1.web.session']
|
464
466
|
session_decoded = Base64.decode64(session_encoded)
|
465
|
-
log_info! 'PreFlight', 'Cookie', 'Read web session data'
|
467
|
+
log_info! 'PreFlight', 'Cookie', 'Read web session data' # "#{session_decoded}"
|
466
468
|
j1_web_session = JSON.parse(session_decoded)
|
467
469
|
end
|
468
470
|
|
@@ -490,8 +492,8 @@ module J1App
|
|
490
492
|
allowed_users = providers["#{default_provider}"]['users'].join(',')
|
491
493
|
requested_page = env['REQUEST_URI']
|
492
494
|
|
493
|
-
log_info! 'PreFlight', 'Redirect', 'Call
|
494
|
-
redirect "/
|
495
|
+
log_info! 'PreFlight', 'Redirect', 'Call API request', 'PageValidate'
|
496
|
+
redirect "/page_validation?provider=#{default_provider}&category=#{category}&page=#{requested_page}&allowed_users=#{allowed_users}"
|
495
497
|
else
|
496
498
|
raise J1App::ConfigError
|
497
499
|
end
|
@@ -502,16 +504,18 @@ module J1App
|
|
502
504
|
|
503
505
|
|
504
506
|
# ==========================================================================
|
505
|
-
#
|
507
|
+
# API ENDPOINTS (Sinatra HANDLERS)
|
506
508
|
# ==========================================================================
|
507
509
|
|
508
|
-
#
|
510
|
+
# ENDPOINT authentication (called from WEB by auth client)
|
509
511
|
# --------------------------------------------------------------------------
|
510
512
|
get '/authentication' do
|
511
513
|
# collect (common) GET parameter|s
|
512
514
|
#
|
513
|
-
request
|
514
|
-
provider
|
515
|
+
request = params.fetch('request')
|
516
|
+
provider = params.fetch('provider')
|
517
|
+
|
518
|
+
log_info! 'API', 'Authentication', 'Authentication request received'
|
515
519
|
|
516
520
|
# SignIn
|
517
521
|
# ------------------------------------------------------------------------
|
@@ -542,7 +546,7 @@ module J1App
|
|
542
546
|
if warden.authenticated?
|
543
547
|
log_info! 'Authentication', 'SignIn', 'User already signed in', "#{warden.user[:info]['nickname']} "
|
544
548
|
else
|
545
|
-
log_info! 'Authentication', 'SignIn', 'Initiate OmniAuth
|
549
|
+
log_info! 'Authentication', 'SignIn', 'Initiate OmniAuth authentication'
|
546
550
|
|
547
551
|
# Make (really) sure that old session is cleared before login
|
548
552
|
# --------------------------------------------------------------------
|
@@ -672,31 +676,29 @@ module J1App
|
|
672
676
|
raise J1App::ConfigError
|
673
677
|
end
|
674
678
|
end
|
675
|
-
# END get '/authentication'
|
679
|
+
# END: get '/authentication'
|
676
680
|
# --------------------------------------------------------------------------
|
677
681
|
|
678
|
-
#
|
682
|
+
# ENDPOINT post_authentication (called after a user is authenticated)
|
679
683
|
# --------------------------------------------------------------------------
|
680
684
|
get '/post_authentication' do
|
681
685
|
reward = {
|
682
|
-
:id
|
683
|
-
:name
|
684
|
-
:link
|
686
|
+
:id => 'unknown',
|
687
|
+
:name => 'unknown',
|
688
|
+
:link => '#'
|
685
689
|
}
|
686
690
|
campaign = {
|
687
|
-
:id
|
688
|
-
:link
|
691
|
+
:id => 'unknown',
|
692
|
+
:link => '#'
|
689
693
|
}
|
690
694
|
|
691
|
-
log_info! 'API', 'Post Authentication', '
|
695
|
+
log_info! 'API', 'Post Authentication', 'Identification request received'
|
692
696
|
|
693
697
|
log_info! 'Post Authentication', 'Cookie', 'Read web session data'
|
694
698
|
session_encoded = request.cookies['j1.web.session']
|
695
699
|
session_decoded = Base64.decode64(session_encoded)
|
696
700
|
j1_web_session = JSON.parse(session_decoded)
|
697
701
|
|
698
|
-
log_info! 'Post Authentication', 'Identification', 'Update web session data' # "#{j1_web_session}"
|
699
|
-
|
700
702
|
user = warden.user
|
701
703
|
user_json = user.to_json
|
702
704
|
|
@@ -754,14 +756,15 @@ module J1App
|
|
754
756
|
if user.nil?
|
755
757
|
# Collection of session data failed (e.g cookie > 4K)
|
756
758
|
#
|
757
|
-
log_info! 'Post Authentication', 'Identification', 'Internal error', '
|
759
|
+
log_info! 'Post Authentication', 'Identification', 'Internal error', 'Authentication failed'
|
758
760
|
warden.logout
|
759
761
|
session.clear
|
760
762
|
log_info! 'Post Authentication', 'Redirect', 'Pass to error page (access_denied)'
|
761
763
|
description_title = "Access Denied"
|
762
764
|
redirect "/access_denied?provider=unknown&user=unknown&category=unknown&title=#{description_title}"
|
763
765
|
else
|
764
|
-
log_info! 'Post Authentication',
|
766
|
+
log_info! 'Post Authentication', 'Identification', 'Authorization successful'
|
767
|
+
log_info! 'Post Authentication', 'Cookie', 'Update web session data' # "#{j1_web_session}"
|
765
768
|
j1_web_session['user_name'] = user[:info]['nickname']
|
766
769
|
j1_web_session['user_id'] = user[:uid]
|
767
770
|
j1_web_session['provider'] = user[:provider]
|
@@ -900,24 +903,24 @@ module J1App
|
|
900
903
|
path: '/'
|
901
904
|
)
|
902
905
|
|
903
|
-
log_info! 'Post Authentication', 'Identification', '
|
904
|
-
log_info! 'Post Authentication', 'Identification', '
|
906
|
+
log_info! 'Post Authentication', 'Identification', 'Provider', "#{user[:provider]}"
|
907
|
+
log_info! 'Post Authentication', 'Identification', 'User', "#{user[:info]['nickname']}"
|
905
908
|
log_info! 'Post Authentication', 'Redirect', 'Pass to requested page', "#{j1_web_session['requested_page']}"
|
906
909
|
redirect j1_web_session['requested_page']
|
907
910
|
|
908
911
|
end
|
909
|
-
#
|
912
|
+
# END: get /post_authentication
|
910
913
|
# --------------------------------------------------------------------------
|
911
914
|
|
912
915
|
|
913
|
-
#
|
916
|
+
# ENDPOINT status (called from WEB to get current state of an user)
|
914
917
|
# --------------------------------------------------------------------------
|
915
918
|
get '/status' do
|
916
919
|
session_encoded = request.cookies['j1.web.session']
|
917
920
|
session_decoded = Base64.decode64(session_encoded)
|
918
921
|
j1_web_session = JSON.parse(session_decoded)
|
919
922
|
|
920
|
-
log_info! 'API', 'Status Request', 'Info request
|
923
|
+
log_info! 'API', 'Status Request', 'Info request received'
|
921
924
|
|
922
925
|
# if request.warden.user.respond_to?(:info)
|
923
926
|
#
|
@@ -979,8 +982,10 @@ module J1App
|
|
979
982
|
}.to_json
|
980
983
|
end
|
981
984
|
end
|
985
|
+
# END: get /status
|
986
|
+
# --------------------------------------------------------------------------
|
982
987
|
|
983
|
-
#
|
988
|
+
# ENDPOINT access_denied (exception, called from the app|auth manager)
|
984
989
|
# --------------------------------------------------------------------------
|
985
990
|
get '/access_denied' do
|
986
991
|
provider = params.fetch('provider')
|
@@ -988,7 +993,8 @@ module J1App
|
|
988
993
|
user = params.fetch('user')
|
989
994
|
description_title = params.fetch('title')
|
990
995
|
|
991
|
-
log_info! 'API', '
|
996
|
+
log_info! 'API', 'ExceptionHandler', 'Request received'
|
997
|
+
log_info! 'ExceptionHandler', 'ERROR', 'Access Denied'
|
992
998
|
|
993
999
|
session_encoded = request.cookies['j1.web.session']
|
994
1000
|
session_decoded = Base64.decode64(session_encoded)
|
@@ -1006,12 +1012,11 @@ module J1App
|
|
1006
1012
|
j1_web_session['authenticated'] = 'false'
|
1007
1013
|
j1_web_session['writer'] = 'middleware'
|
1008
1014
|
|
1015
|
+
log_info! 'ExceptionHandler', 'Cookie', 'Write web session data' # "#{session_json}"
|
1016
|
+
|
1009
1017
|
# write updated J1 session data to cookie
|
1010
1018
|
#
|
1011
|
-
log_info! 'API', 'Exception Handler', 'ERROR', 'Access Denied'
|
1012
1019
|
session_json = j1_web_session.to_json
|
1013
|
-
log_info! 'Exception Handler', 'Cookie', 'Write web session data' # "#{session_json}"
|
1014
|
-
|
1015
1020
|
session_encoded = Base64.encode64(session_json)
|
1016
1021
|
response.set_cookie(
|
1017
1022
|
'j1.web.session',
|
@@ -1020,7 +1025,7 @@ module J1App
|
|
1020
1025
|
path: '/'
|
1021
1026
|
)
|
1022
1027
|
|
1023
|
-
log_info! '
|
1028
|
+
log_info! 'ExceptionHandler', 'Redirect', 'Pass to error page', "Access Denied"
|
1024
1029
|
|
1025
1030
|
# Capitalize first char
|
1026
1031
|
provider = provider.sub(/^./, &:upcase)
|
@@ -1037,11 +1042,11 @@ module J1App
|
|
1037
1042
|
|
1038
1043
|
erb :auth_manager_ui
|
1039
1044
|
end
|
1040
|
-
# END get '/access_denied'
|
1045
|
+
# END: get '/access_denied'
|
1041
1046
|
# --------------------------------------------------------------------------
|
1042
1047
|
|
1043
1048
|
|
1044
|
-
#
|
1049
|
+
# ENDPOINT invalid_funds (exception, called from the app|auth manager)
|
1045
1050
|
# --------------------------------------------------------------------------
|
1046
1051
|
get '/invalid_funds' do
|
1047
1052
|
provider = params.fetch('provider')
|
@@ -1049,7 +1054,8 @@ module J1App
|
|
1049
1054
|
user = params.fetch('user')
|
1050
1055
|
description_title = params.fetch('title')
|
1051
1056
|
|
1052
|
-
log_info! 'API', '
|
1057
|
+
log_info! 'API', 'ExceptionHandler', 'Request received'
|
1058
|
+
log_info! 'ExceptionHandler', 'ERROR', 'Invalid Funds'
|
1053
1059
|
|
1054
1060
|
session_encoded = request.cookies['j1.web.session']
|
1055
1061
|
session_decoded = Base64.decode64(session_encoded)
|
@@ -1067,12 +1073,12 @@ module J1App
|
|
1067
1073
|
j1_web_session['authenticated'] = 'false'
|
1068
1074
|
j1_web_session['writer'] = 'middleware'
|
1069
1075
|
|
1076
|
+
log_info! 'ExceptionHandler', 'Cookie', 'Write web session data' # "#{session_json}"
|
1077
|
+
|
1070
1078
|
# write updated J1 session data to cookie
|
1071
1079
|
#
|
1072
1080
|
log_info! 'API', 'Exception Handler', 'ERROR', 'Invalid Funds'
|
1073
1081
|
session_json = j1_web_session.to_json
|
1074
|
-
log_info! 'Exception Handler', 'Cookie', 'Write web session data' # "#{session_json}"
|
1075
|
-
|
1076
1082
|
session_encoded = Base64.encode64(session_json)
|
1077
1083
|
response.set_cookie(
|
1078
1084
|
'j1.web.session',
|
@@ -1081,7 +1087,7 @@ module J1App
|
|
1081
1087
|
path: '/'
|
1082
1088
|
)
|
1083
1089
|
|
1084
|
-
log_info! '
|
1090
|
+
log_info! 'ExceptionHandler', 'Redirect', 'Pass to error page', 'Invalid Funds'
|
1085
1091
|
|
1086
1092
|
# Capitalize first char
|
1087
1093
|
provider = provider.sub(/^./, &:upcase)
|
@@ -1098,36 +1104,36 @@ module J1App
|
|
1098
1104
|
|
1099
1105
|
erb :auth_manager_ui
|
1100
1106
|
end
|
1101
|
-
# END get /invalid_funds
|
1107
|
+
# END: get /invalid_funds
|
1102
1108
|
# --------------------------------------------------------------------------
|
1103
1109
|
|
1104
1110
|
|
1105
1111
|
# access_protected_content ENDPOINT called from the app (auth manager)
|
1106
1112
|
# --------------------------------------------------------------------------
|
1107
|
-
get '/
|
1108
|
-
provider =
|
1109
|
-
allowed_users =
|
1110
|
-
page =
|
1111
|
-
category =
|
1113
|
+
get '/page_validation' do
|
1114
|
+
provider = params.fetch('provider')
|
1115
|
+
allowed_users = params.fetch('allowed_users')
|
1116
|
+
page = params.fetch('page')
|
1117
|
+
category = params.fetch('category')
|
1112
1118
|
|
1113
|
-
log_info! 'API', 'PageAccessControl', '
|
1119
|
+
log_info! 'API', 'PageAccessControl', 'PageValidate request received'
|
1114
1120
|
|
1115
1121
|
# Capitalize first char
|
1116
1122
|
# provider = provider.sub(/^./, &:upcase)
|
1117
1123
|
|
1118
|
-
log_info! 'PageAccessControl', 'AuthCheck', 'Check
|
1124
|
+
log_info! 'PageAccessControl', 'AuthCheck', 'Check provider', "#{provider}"
|
1119
1125
|
# jadams, 2019-03-16: Hier ist das Problem
|
1120
1126
|
#
|
1121
1127
|
if warden.authenticated?
|
1122
|
-
log_info! 'PageAccessControl', 'AuthCheck', 'Grant access for
|
1128
|
+
log_info! 'PageAccessControl', 'AuthCheck', 'Grant access for', "#{provider}"
|
1123
1129
|
log_info! 'PageAccessControl', 'Redirect', 'Pass to page', "#{page}"
|
1124
1130
|
route = page
|
1125
1131
|
else
|
1126
|
-
log_info! 'PageAccessControl', 'AuthCheck', 'Authentication failed
|
1132
|
+
log_info! 'PageAccessControl', 'AuthCheck', 'Authentication failed', "#{provider}"
|
1127
1133
|
route = "/authentication?request=signin&provider=#{provider}&allowed_users=#{allowed_users}"
|
1128
1134
|
end
|
1129
1135
|
|
1130
|
-
log_info! 'PageAccessControl', 'Redirect', 'Pass to SignIn dialog
|
1136
|
+
log_info! 'PageAccessControl', 'Redirect', 'Pass to SignIn dialog, page', "#{page}"
|
1131
1137
|
# Capitalize first char
|
1132
1138
|
provider = provider.sub(/^./, &:upcase)
|
1133
1139
|
|
@@ -1143,10 +1149,11 @@ module J1App
|
|
1143
1149
|
|
1144
1150
|
erb :auth_manager_ui
|
1145
1151
|
end
|
1146
|
-
# END get '/
|
1152
|
+
# END: get '/page_validation
|
1147
1153
|
# --------------------------------------------------------------------------
|
1148
1154
|
|
1149
|
-
|
1155
|
+
# ENDPOINT iframe
|
1156
|
+
# --------------------------------------------------------------------------
|
1150
1157
|
get '/iframe' do
|
1151
1158
|
@website_url = "https://jekyll-one.github.io/"
|
1152
1159
|
erb :iframe
|
@@ -1159,6 +1166,7 @@ module J1App
|
|
1159
1166
|
log_info! 'Fallback', 'Redirect', 'Pass to requested page', "#{j1_web_session['requested_page']}"
|
1160
1167
|
redirect j1_web_session['requested_page']
|
1161
1168
|
end
|
1162
|
-
|
1169
|
+
# END: get /iframe
|
1170
|
+
# --------------------------------------------------------------------------
|
1163
1171
|
end
|
1164
1172
|
end
|
data/lib/starter_web/Gemfile
CHANGED
@@ -46,7 +46,7 @@ gem 'jekyll', '~> 3.8.5'
|
|
46
46
|
# Theme Rubies
|
47
47
|
# Default: J1 Template
|
48
48
|
#
|
49
|
-
gem 'j1_template_mde', '~> 2018.4.
|
49
|
+
gem 'j1_template_mde', '~> 2018.4.27'
|
50
50
|
|
51
51
|
# --------------------------------------------------------------------
|
52
52
|
# PRODUCTION: Gem needed for the Jekyll and J1 prod environment
|
@@ -109,7 +109,7 @@ gem 'i18n', '0.9.5'
|
|
109
109
|
# If any (additional) plugins are used, they go here:
|
110
110
|
#
|
111
111
|
group :jekyll_plugins do
|
112
|
-
gem 'asciidoctor', '>=
|
112
|
+
gem 'asciidoctor', '>= 2.0'
|
113
113
|
# gem 'asciidoctor-pdf', '>= 1.5.0.alpha.16'
|
114
114
|
gem 'asciidoctor-rouge', '>= 0.3'
|
115
115
|
gem 'jekyll-asciidoc', '>= 2.1.0'
|
data/lib/starter_web/_config.yml
CHANGED
@@ -60,7 +60,7 @@ environment: development
|
|
60
60
|
# anything here because version information is bumped-in by
|
61
61
|
# the build process
|
62
62
|
#
|
63
|
-
version: 2018.4.
|
63
|
+
version: 2018.4.27
|
64
64
|
|
65
65
|
|
66
66
|
# ==============================================================================
|
@@ -603,7 +603,7 @@ j1_auth:
|
|
603
603
|
blacklist: []
|
604
604
|
|
605
605
|
patreon:
|
606
|
-
home_url: https://
|
606
|
+
home_url: https://patreon.com
|
607
607
|
product_url: https://patreon.com/jekyll_one
|
608
608
|
strategy: member
|
609
609
|
scope: [ users, pledges-to-me ]
|
@@ -621,7 +621,7 @@ j1_auth:
|
|
621
621
|
premium:
|
622
622
|
enabled: true
|
623
623
|
users:
|
624
|
-
whitelist: [
|
624
|
+
whitelist: []
|
625
625
|
blacklist: []
|
626
626
|
payment:
|
627
627
|
activated: [ "Premium Content", "Value Content" ]
|
@@ -754,7 +754,7 @@ defaults:
|
|
754
754
|
author: J1 Team
|
755
755
|
resources: toccer
|
756
756
|
toc: true
|
757
|
-
adsense:
|
757
|
+
adsense: false
|
758
758
|
comments: false
|
759
759
|
|
760
760
|
icons:
|