Skip to content

Commit

Permalink
[TASK] Merge site configuration and settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@r3h6
r3h6 committed Oct 18, 2024
1 parent 79bb69c commit 3607587
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
9 changes: 5 additions & 4 deletions Build/Data/db.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ CREATE TABLE `be_users` (
KEY `parent` (`pid`,`deleted`,`disable`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
INSERT INTO `be_users` VALUES (1,0,1729112525,1729112525,0,0,0,0,NULL,'default','a:5:{s:10:\"moduleData\";a:7:{s:57:\"TYPO3\\CMS\\Backend\\Utility\\BackendUtility::getUpdateSignal\";a:0:{}s:10:\"FormEngine\";a:2:{i:0;a:0:{}i:1;s:32:\"831786fd4612b658a2e11ed01c306877\";}s:16:\"opendocs::recent\";a:6:{s:32:\"831786fd4612b658a2e11ed01c306877\";a:5:{i:0;s:7:\"johndoe\";i:1;a:5:{s:4:\"edit\";a:1:{s:8:\"fe_users\";a:1:{i:1;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:31:\"&edit%5Bfe_users%5D%5B1%5D=edit\";i:3;a:5:{s:5:\"table\";s:8:\"fe_users\";s:3:\"uid\";i:1;s:3:\"pid\";i:4;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:91:\"/typo3/module/web/list?token=62f40352e0c491e5314c17c17bd42a3ebfd57143&id=4&table=&pointer=1\";}s:32:\"5c1b878c87d518a051ef05bd38d2cccf\";a:5:{i:0;s:3:\"CUG\";i:1;a:5:{s:4:\"edit\";a:1:{s:9:\"fe_groups\";a:1:{i:1;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:32:\"&edit%5Bfe_groups%5D%5B1%5D=edit\";i:3;a:5:{s:5:\"table\";s:9:\"fe_groups\";s:3:\"uid\";i:1;s:3:\"pid\";i:4;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:91:\"/typo3/module/web/list?token=62f40352e0c491e5314c17c17bd42a3ebfd57143&id=4&table=&pointer=1\";}s:32:\"deac478137dd48a97e299bd046412e21\";a:5:{i:0;s:7:\"Consent\";i:1;a:5:{s:4:\"edit\";a:1:{s:10:\"tt_content\";a:1:{i:2;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:33:\"&edit%5Btt_content%5D%5B2%5D=edit\";i:3;a:5:{s:5:\"table\";s:10:\"tt_content\";s:3:\"uid\";i:2;s:3:\"pid\";i:2;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:76:\"/typo3/module/web/layout?token=17e975600ddad8b75cc6c72f2f962c26184212b1&id=2\";}s:32:\"20ed475662b97ac33d3aa853a74f9c9c\";a:5:{i:0;s:7:\"Consent\";i:1;a:5:{s:4:\"edit\";a:1:{s:5:\"pages\";a:1:{i:2;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:28:\"&edit%5Bpages%5D%5B2%5D=edit\";i:3;a:5:{s:5:\"table\";s:5:\"pages\";s:3:\"uid\";i:2;s:3:\"pid\";i:1;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:76:\"/typo3/module/web/layout?token=17e975600ddad8b75cc6c72f2f962c26184212b1&id=2\";}s:32:\"c312013d83c1a6ad7fec8b36a37ba3c8\";a:5:{i:0;s:5:\"Login\";i:1;a:5:{s:4:\"edit\";a:1:{s:10:\"tt_content\";a:1:{i:1;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:33:\"&edit%5Btt_content%5D%5B1%5D=edit\";i:3;a:5:{s:5:\"table\";s:10:\"tt_content\";s:3:\"uid\";i:1;s:3:\"pid\";i:1;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:77:\"/typo3/module/web/layout?token=17e975600ddad8b75cc6c72f2f962c26184212b1&id=1&\";}s:32:\"2258d9587529a9ea12f96ce7d90372b3\";a:5:{i:0;s:6:\"Client\";i:1;a:5:{s:4:\"edit\";a:1:{s:5:\"pages\";a:1:{i:3;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:28:\"&edit%5Bpages%5D%5B3%5D=edit\";i:3;a:5:{s:5:\"table\";s:5:\"pages\";s:3:\"uid\";i:3;s:3:\"pid\";i:1;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:76:\"/typo3/module/web/layout?token=17e975600ddad8b75cc6c72f2f962c26184212b1&id=3\";}}s:6:\"web_ts\";a:1:{s:6:\"action\";s:17:\"typoscript_active\";}s:23:\"web_typoscript_analyzer\";a:1:{s:23:\"selectedTemplatePerPage\";a:1:{i:1;i:-1;}}s:17:\"typoscript_active\";a:6:{s:18:\"sortAlphabetically\";b:1;s:28:\"displayConstantSubstitutions\";b:1;s:15:\"displayComments\";b:1;s:23:\"selectedTemplatePerPage\";a:1:{i:1;i:-1;}s:18:\"constantConditions\";a:0:{}s:15:\"setupConditions\";a:0:{}}s:12:\"pagetsconfig\";a:1:{s:6:\"action\";s:21:\"pagetsconfig_includes\";}}s:14:\"emailMeAtLogin\";i:0;s:8:\"titleLen\";i:50;s:20:\"edit_docModuleUpload\";s:1:\"1\";s:15:\"moduleSessionID\";a:7:{s:57:\"TYPO3\\CMS\\Backend\\Utility\\BackendUtility::getUpdateSignal\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:10:\"FormEngine\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:16:\"opendocs::recent\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:6:\"web_ts\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:23:\"web_typoscript_analyzer\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:17:\"typoscript_active\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:12:\"pagetsconfig\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";}}',0,NULL,'','admin','$argon2i$v=19$m=65536,t=16,p=1$RW5zamNXR251aHJZSlA3MA$4bxi8hW5GtWSV4ZuYfxTliIOiUCyD/WT0tLYCrunsQk','',0,NULL,'','','',1,3,NULL,1,NULL,'',NULL,1729187716,NULL);
INSERT INTO `be_users` VALUES (1,0,1729112525,1729112525,0,0,0,0,NULL,'default','a:5:{s:10:\"moduleData\";a:7:{s:57:\"TYPO3\\CMS\\Backend\\Utility\\BackendUtility::getUpdateSignal\";a:0:{}s:10:\"FormEngine\";a:2:{i:0;a:1:{s:32:\"fb1ea7bbfdc65adae2f59a7feb072a68\";a:5:{i:0;s:45:\"Example, a491f467-deaa-4bd1-b095-43811001f2b4\";i:1;a:5:{s:4:\"edit\";a:1:{s:35:\"tx_oauth2server_domain_model_client\";a:1:{i:1;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:58:\"&edit%5Btx_oauth2server_domain_model_client%5D%5B1%5D=edit\";i:3;a:5:{s:5:\"table\";s:35:\"tx_oauth2server_domain_model_client\";s:3:\"uid\";i:1;s:3:\"pid\";i:3;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:91:\"/typo3/module/web/list?token=a4743b38e5fe9a1e695f6a227c6298d00ff3a24c&id=3&table=&pointer=1\";}}i:1;s:32:\"fb1ea7bbfdc65adae2f59a7feb072a68\";}s:16:\"opendocs::recent\";a:6:{s:32:\"831786fd4612b658a2e11ed01c306877\";a:5:{i:0;s:7:\"johndoe\";i:1;a:5:{s:4:\"edit\";a:1:{s:8:\"fe_users\";a:1:{i:1;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:31:\"&edit%5Bfe_users%5D%5B1%5D=edit\";i:3;a:5:{s:5:\"table\";s:8:\"fe_users\";s:3:\"uid\";i:1;s:3:\"pid\";i:4;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:91:\"/typo3/module/web/list?token=62f40352e0c491e5314c17c17bd42a3ebfd57143&id=4&table=&pointer=1\";}s:32:\"5c1b878c87d518a051ef05bd38d2cccf\";a:5:{i:0;s:3:\"CUG\";i:1;a:5:{s:4:\"edit\";a:1:{s:9:\"fe_groups\";a:1:{i:1;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:32:\"&edit%5Bfe_groups%5D%5B1%5D=edit\";i:3;a:5:{s:5:\"table\";s:9:\"fe_groups\";s:3:\"uid\";i:1;s:3:\"pid\";i:4;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:91:\"/typo3/module/web/list?token=62f40352e0c491e5314c17c17bd42a3ebfd57143&id=4&table=&pointer=1\";}s:32:\"deac478137dd48a97e299bd046412e21\";a:5:{i:0;s:7:\"Consent\";i:1;a:5:{s:4:\"edit\";a:1:{s:10:\"tt_content\";a:1:{i:2;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:33:\"&edit%5Btt_content%5D%5B2%5D=edit\";i:3;a:5:{s:5:\"table\";s:10:\"tt_content\";s:3:\"uid\";i:2;s:3:\"pid\";i:2;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:76:\"/typo3/module/web/layout?token=17e975600ddad8b75cc6c72f2f962c26184212b1&id=2\";}s:32:\"20ed475662b97ac33d3aa853a74f9c9c\";a:5:{i:0;s:7:\"Consent\";i:1;a:5:{s:4:\"edit\";a:1:{s:5:\"pages\";a:1:{i:2;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:28:\"&edit%5Bpages%5D%5B2%5D=edit\";i:3;a:5:{s:5:\"table\";s:5:\"pages\";s:3:\"uid\";i:2;s:3:\"pid\";i:1;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:76:\"/typo3/module/web/layout?token=17e975600ddad8b75cc6c72f2f962c26184212b1&id=2\";}s:32:\"c312013d83c1a6ad7fec8b36a37ba3c8\";a:5:{i:0;s:5:\"Login\";i:1;a:5:{s:4:\"edit\";a:1:{s:10:\"tt_content\";a:1:{i:1;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:33:\"&edit%5Btt_content%5D%5B1%5D=edit\";i:3;a:5:{s:5:\"table\";s:10:\"tt_content\";s:3:\"uid\";i:1;s:3:\"pid\";i:1;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:77:\"/typo3/module/web/layout?token=17e975600ddad8b75cc6c72f2f962c26184212b1&id=1&\";}s:32:\"2258d9587529a9ea12f96ce7d90372b3\";a:5:{i:0;s:6:\"Client\";i:1;a:5:{s:4:\"edit\";a:1:{s:5:\"pages\";a:1:{i:3;s:4:\"edit\";}}s:7:\"defVals\";N;s:12:\"overrideVals\";N;s:11:\"columnsOnly\";N;s:6:\"noView\";N;}i:2;s:28:\"&edit%5Bpages%5D%5B3%5D=edit\";i:3;a:5:{s:5:\"table\";s:5:\"pages\";s:3:\"uid\";i:3;s:3:\"pid\";i:1;s:3:\"cmd\";s:4:\"edit\";s:12:\"deleteAccess\";b:1;}i:4;s:76:\"/typo3/module/web/layout?token=17e975600ddad8b75cc6c72f2f962c26184212b1&id=3\";}}s:6:\"web_ts\";a:1:{s:6:\"action\";s:17:\"typoscript_active\";}s:23:\"web_typoscript_analyzer\";a:1:{s:23:\"selectedTemplatePerPage\";a:1:{i:1;i:-1;}}s:17:\"typoscript_active\";a:6:{s:18:\"sortAlphabetically\";b:1;s:28:\"displayConstantSubstitutions\";b:1;s:15:\"displayComments\";b:1;s:23:\"selectedTemplatePerPage\";a:1:{i:1;i:-1;}s:18:\"constantConditions\";a:0:{}s:15:\"setupConditions\";a:0:{}}s:12:\"pagetsconfig\";a:1:{s:6:\"action\";s:21:\"pagetsconfig_includes\";}}s:14:\"emailMeAtLogin\";i:0;s:8:\"titleLen\";i:50;s:20:\"edit_docModuleUpload\";s:1:\"1\";s:15:\"moduleSessionID\";a:7:{s:57:\"TYPO3\\CMS\\Backend\\Utility\\BackendUtility::getUpdateSignal\";s:40:\"3d080bac1cd2d3a73a20d562cc36f582245d1f40\";s:10:\"FormEngine\";s:40:\"3d080bac1cd2d3a73a20d562cc36f582245d1f40\";s:16:\"opendocs::recent\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:6:\"web_ts\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:23:\"web_typoscript_analyzer\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:17:\"typoscript_active\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";s:12:\"pagetsconfig\";s:40:\"cc89c3483247b44190032b2ffe280dfbf5220f74\";}}',0,NULL,'','admin','$argon2i$v=19$m=65536,t=16,p=1$RW5zamNXR251aHJZSlA3MA$4bxi8hW5GtWSV4ZuYfxTliIOiUCyD/WT0tLYCrunsQk','',0,NULL,'','','',1,3,NULL,1,NULL,'',NULL,1729198422,NULL);
DROP TABLE IF EXISTS `fe_groups`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
Expand Down Expand Up @@ -135,7 +135,7 @@ CREATE TABLE `fe_users` (
KEY `felogin_forgotHash` (`felogin_forgotHash`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
INSERT INTO `fe_users` VALUES (1,4,1729115145,1729115145,0,0,0,0,'','0',NULL,1729115163,NULL,'','johndoe','$argon2i$v=19$m=65536,t=16,p=1$OS4xUjhoWC5FWDZ2Sk42dA$29daLIBpT3fD13eaIVqJqagRDF6tlPCodET9MJgTga4','1','','John','','Doe','1810 S Main St','(417) 623-5808','','[email protected]','','64804','Joplin','','','Acme Inc.',0,1729115163,'');
INSERT INTO `fe_users` VALUES (1,4,1729115145,1729115145,0,0,0,0,'','0',NULL,1729198459,NULL,'','johndoe','$argon2i$v=19$m=65536,t=16,p=1$OS4xUjhoWC5FWDZ2Sk42dA$29daLIBpT3fD13eaIVqJqagRDF6tlPCodET9MJgTga4','1','','John','','Doe','1810 S Main St','(417) 623-5808','','[email protected]','','64804','Joplin','','','Acme Inc.',0,1729198459,'');
DROP TABLE IF EXISTS `pages`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
Expand Down Expand Up @@ -212,7 +212,7 @@ CREATE TABLE `pages` (
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
INSERT INTO `pages` VALUES (1,0,1729112538,1729112538,0,0,0,0,'0',0,NULL,0,0,0,0,NULL,NULL,0,0,0,0,1,1,31,31,1,1729114877,0,0,0,1,'Home','/',NULL,0,0,0,0,'',0,'','','',0,0,0,'',0,0,NULL,NULL,NULL,'','',0,1,0,'',0,'','','');
INSERT INTO `pages` VALUES (2,1,1729114908,1729112608,0,0,0,0,'-2',32,NULL,0,0,0,0,NULL,'{\"doktype\":\"\",\"title\":\"\",\"slug\":\"\",\"nav_title\":\"\",\"subtitle\":\"\",\"abstract\":\"\",\"keywords\":\"\",\"description\":\"\",\"author\":\"\",\"author_email\":\"\",\"lastUpdated\":\"\",\"layout\":\"\",\"newUntil\":\"\",\"backend_layout\":\"\",\"backend_layout_next_level\":\"\",\"content_from_pid\":\"\",\"target\":\"\",\"cache_timeout\":\"\",\"cache_tags\":\"\",\"is_siteroot\":\"\",\"no_search\":\"\",\"php_tree_stop\":\"\",\"module\":\"\",\"media\":\"\",\"tsconfig_includes\":\"\",\"TSconfig\":\"\",\"l18n_cfg\":\"\",\"hidden\":\"\",\"nav_hide\":\"\",\"starttime\":\"\",\"endtime\":\"\",\"extendToSubpages\":\"\",\"fe_group\":\"\",\"editlock\":\"\",\"categories\":\"\",\"rowDescription\":\"\"}',0,0,0,0,1,0,31,27,0,0,0,0,0,1,'Consent','/consent',NULL,0,0,0,0,'',0,'','','',0,0,0,'',0,0,NULL,NULL,NULL,'','',0,0,0,'',0,'','','');
INSERT INTO `pages` VALUES (2,1,1729114908,1729112608,0,0,0,0,'-2',32,NULL,0,0,0,0,NULL,'{\"doktype\":\"\",\"title\":\"\",\"slug\":\"\",\"nav_title\":\"\",\"subtitle\":\"\",\"abstract\":\"\",\"keywords\":\"\",\"description\":\"\",\"author\":\"\",\"author_email\":\"\",\"lastUpdated\":\"\",\"layout\":\"\",\"newUntil\":\"\",\"backend_layout\":\"\",\"backend_layout_next_level\":\"\",\"content_from_pid\":\"\",\"target\":\"\",\"cache_timeout\":\"\",\"cache_tags\":\"\",\"is_siteroot\":\"\",\"no_search\":\"\",\"php_tree_stop\":\"\",\"module\":\"\",\"media\":\"\",\"tsconfig_includes\":\"\",\"TSconfig\":\"\",\"l18n_cfg\":\"\",\"hidden\":\"\",\"nav_hide\":\"\",\"starttime\":\"\",\"endtime\":\"\",\"extendToSubpages\":\"\",\"fe_group\":\"\",\"editlock\":\"\",\"categories\":\"\",\"rowDescription\":\"\"}',0,0,0,0,1,0,31,27,0,1729114930,0,0,0,1,'Consent','/consent',NULL,0,0,0,0,'',0,'','','',0,0,0,'',0,0,NULL,NULL,NULL,'','',0,0,0,'',0,'','','');
INSERT INTO `pages` VALUES (3,1,1729112640,1729112612,0,0,0,0,'0',128,NULL,0,0,0,0,NULL,'{\"hidden\":\"\"}',0,0,0,0,1,0,31,27,0,0,0,0,0,254,'Clients','/client',NULL,0,0,0,0,'',0,'','','',0,0,0,'',0,0,NULL,NULL,NULL,'','',0,0,0,'',0,'','','');
INSERT INTO `pages` VALUES (4,1,1729112639,1729112619,0,0,0,0,'0',64,NULL,0,0,0,0,NULL,'{\"hidden\":\"\"}',0,0,0,0,1,0,31,27,0,0,0,0,0,254,'Users','/users',NULL,0,0,0,0,'',0,'','','',0,0,0,'',0,0,NULL,NULL,NULL,'','',0,0,0,'',0,'','','');
DROP TABLE IF EXISTS `sys_news`;
Expand Down Expand Up @@ -366,5 +366,6 @@ CREATE TABLE `tx_oauth2server_domain_model_client` (
`allowed_scopes` text DEFAULT NULL,
PRIMARY KEY (`uid`),
KEY `parent` (`pid`,`deleted`,`hidden`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
INSERT INTO `tx_oauth2server_domain_model_client` VALUES ('Secret: 2afdd504b3b75ea10f3a40a73e22b5468d1ce0b8',1,3,1729192893,1729187864,0,0,0,0,0,'a491f467-deaa-4bd1-b095-43811001f2b4','Example','$argon2i$v=19$m=65536,t=16,p=1$Qi8yUFJJTjYzcnloTGdvcg$qgkZ2OcTSKJAt6s62PTnFeAw/ftyBUzq/GZbedyysRc','authorization_code,client_credentials,implicit,password,refresh_token','https://oauthdebugger.com/debug',1,0,'');
6 changes: 4 additions & 2 deletions Classes/Middleware/Initializer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,17 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
return $handler->handle($request);
}

$siteConfiguration = $site->getConfiguration()['oauth2'] ?? $site->getSettings()->get('oauth2_server') ?? false;
if ($siteConfiguration === false) {
$siteConfiguration = $site->getConfiguration()['oauth2'] ?? [];
$siteSettings = $site->getSettings()->get('oauth2_server') ?? [];
if ($siteConfiguration === [] && $siteSettings === []) {
return $handler->handle($request);
}

$this->logger->debug('Configure oauth2 server', $this->configuration->toArray());

$this->configuration->merge($this->extensionConfiguration->get('oauth2_server'));
$this->configuration->merge($siteConfiguration);
$this->configuration->merge($siteSettings);

if ($this->configuration->isEnabled() === false) {
return $handler->handle($request);
Expand Down

0 comments on commit 3607587

Please sign in to comment.