Merged develop into feature/shibui-2264

README.md

@@ -2,14 +2,14 @@
 
 ## Requirements_
 
-* Java 8 (note that ONLY Java 8 is supported at this time; other later versions might work)
+* Java 11 (note that ONLY Java 11 is supported at this time; other later versions might work)
 
 ## Running
 
 There are currently 2 ways to run the application:
 
-1. As an executable
-1. deployed in a Java Servlet 3.0 container
+1. As an executable WAR using Java
+1. deployed in a Java Servlet 3.0 container such as Tomcat or Jetty
 
 Note that some features require encoded slashes in the URL. In tomcat (which is embedded in the war), this can be
 allowed with:
@@ -57,6 +57,7 @@ beginning with `#` are commented out.
 # Server Configuration
 #server.port=8080
 
+
 # Logging Configuration
 #logging.config=classpath:log4j2.xml
 #logging.level.org.springframework.web=ERROR
@@ -110,4 +111,10 @@ spring.profiles.active=default
 
 # Password for the default user. If not set, a password will be generated at startup
 #shibui.default-password=
-```
+
+springdoc.use-management-port=true
+springdoc.pathsToMatch=/entities, /api/**
+# This property enables the openapi and swagger-ui endpoints to be exposed beneath the actuator base path.
+management.endpoints.web.exposure.include=openapi, swagger-ui
+management.server.port=9090
+```

backend/build.gradle

@@ -175,9 +175,8 @@ dependencies {
     runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.0.4'
     runtimeOnly 'mysql:mysql-connector-java:8.0.29'
 
-    //Swagger
-    compile 'io.springfox:springfox-swagger2:2.9.2'
-    compile 'io.springfox:springfox-swagger-ui:2.9.2'
+    //Swagger 3
+    implementation 'org.springdoc:springdoc-openapi-ui:1.6.8'
 
     compile 'org.codehaus.groovy:groovy-all:3.0.10'
     testImplementation platform("org.spockframework:spock-bom:2.1-groovy-3.0")

backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy

@@ -117,7 +117,7 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1335: Verify Filesystem Metadata Provider'                  | '/SHIBUI-1335-2.side'
         'SHIBUI-1335: Verify Local Dynamic Metadata Provider'               | '/SHIBUI-1335-3.side'
         'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters'        | '/SHIBUI-1335-4.side'
-        'SHIBUI-1361: Verify dates display in proper format'                | '/SHIBUI-1361.side'
+        'SHIBUI-1361: Verify dates display in proper format'                | '/SHIBUI-1361.side' // Note that this script WILL NOT PASS in the Selenium IDE due to it thinking there is a syntax error where there is none.
         'SHIBUI-1385: Restore a metadata source version'                    | '/SHIBUI-1385-1.side'
         'SHIBUI-1385: Restore a metadata provider version'                  | '/SHIBUI-1385-2.side'
         'SHIBUI-1391: Regex Validation'                                     | '/SHIBUI-1391.side'

backend/src/integration/resources/SHIBUI-1281.side

@@ -626,9 +626,12 @@
       "id": "c1534880-c4e5-4fbd-b200-c28f9f556ab9",
       "comment": "",
       "command": "click",
-      "target": "css=div.p-0.m-0.container-fluid > div:nth-child(2) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "css=.is-invalid > .toggle-button",
       "targets": [
-        ["css=.is-invalid .svg-inline--fa", "css:finder"]
+        ["css=.is-invalid > .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[12]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[5]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[2]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div[2]/div/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -678,12 +681,12 @@
       "id": "97a98737-862d-4567-8b20-c5c991444ed0",
       "comment": "",
       "command": "click",
-      "target": "css=div.p-0.m-0.container-fluid > div:nth-child(3) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "css=.is-invalid > .toggle-button",
       "targets": [
-        ["css=#\\/serviceProviderSsoDescriptor\\/nameIdFormats\\/2-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[4]", "xpath:attributes"],
-        ["xpath=//div[@id='/serviceProviderSsoDescriptor/nameIdFormats/2-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+        ["css=.is-invalid > .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[14]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[5]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[3]/div/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -731,12 +734,12 @@
       "id": "e2e8d5d4-8b6a-42d5-9fe7-abb8a84216e3",
       "comment": "",
       "command": "click",
-      "target": "css=div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "css=.is-invalid > .toggle-button",
       "targets": [
-        ["css=#\\/serviceProviderSsoDescriptor\\/nameIdFormats\\/3-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
-        ["xpath=//div[@id='/serviceProviderSsoDescriptor/nameIdFormats/3-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+        ["css=.is-invalid > .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[16]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[5]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -778,10 +781,11 @@
       "id": "23fd8856-32df-48ed-a198-a74e8ca71b10",
       "comment": "",
       "command": "type",
-      "target": "css=div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4",
       "targets": [
-        ["css=.focus", "css:finder"],
-        ["xpath=(//input[@value=''])[5]", "xpath:attributes"],
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4", "id"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']", "xpath:attributes"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[5]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
@@ -1985,11 +1989,12 @@
       "id": "4e0fa4f5-817f-41fb-9885-60f37b699436",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=tr > .text-right",
+      "target": "css=td:nth-child(1)",
       "targets": [
-        ["css=tr > .text-right", "css:finder"],
-        ["xpath=//td[5]", "xpath:position"],
-        ["xpath=//td[contains(.,'Enabled')]", "xpath:innerText"]
+        ["css=.lead", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/span", "xpath:idRelative"],
+        ["xpath=//section/div/div/span", "xpath:position"],
+        ["xpath=//span[contains(.,'Current Metadata Sources')]", "xpath:innerText"]
       ],
       "value": "10000"
     }, {

backend/src/integration/resources/SHIBUI-1334-1.side

@@ -2005,11 +2005,15 @@
       "id": "4e0fa4f5-817f-41fb-9885-60f37b699436",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=tr > .text-right",
+      "target": "linkText=Test Provider",
       "targets": [
-        ["css=tr > .text-right", "css:finder"],
-        ["xpath=//td[5]", "xpath:position"],
-        ["xpath=//td[contains(.,'Enabled')]", "xpath:innerText"]
+        ["linkText=Test Provider", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'Test Provider')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/source/bb384f9e-a87d-4e46-aa68-81d46b7c43e1/configuration/options')]", "xpath:href"],
+        ["xpath=//td/a", "xpath:position"],
+        ["xpath=//a[contains(.,'Test Provider')]", "xpath:innerText"]
       ],
       "value": "10000"
     }, {

backend/src/integration/resources/SHIBUI-1334-2.side

@@ -970,12 +970,13 @@
       "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a",
       "comment": "",
       "command": "click",
-      "target": "css=.form-group:nth-child(2) .toggle-button",
+      "target": "css=.mb-3:nth-child(2) .toggle-button",
       "targets": [
-        ["css=.form-group:nth-child(2) .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[6]/div/div/div/div/div[2]/div/div/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div/div/button", "xpath:position"]
+        ["css=.mb-3:nth-child(2) .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[14]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[5]/div/div/div/div/div[2]/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Options')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
@@ -1012,7 +1013,7 @@
       "id": "d7406190-0bb0-4df8-9c0b-7e393952b6a2",
       "comment": "",
       "command": "click",
-      "target": "css=.form-group:nth-child(3) .toggle-button",
+      "target": "css=.mb-3:nth-child(3) .toggle-button",
       "targets": [
         ["css=.form-group:nth-child(3) .toggle-button", "css:finder"],
         ["xpath=(//button[@type='button'])[15]", "xpath:attributes"],
@@ -1054,11 +1055,11 @@
       "id": "19182110-0f86-4601-ae12-0b90967ef68a",
       "comment": "",
       "command": "click",
-      "target": "css=.form-group:nth-child(4) .toggle-button",
+      "target": "css=.mb-3:nth-child(4) .toggle-button",
       "targets": [
-        ["css=.form-group:nth-child(4) .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[17]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[6]/div/div/div/div/div[2]/div[3]/div/div/div/button", "xpath:idRelative"],
+        ["css=.mb-3:nth-child(4) .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[5]/div/div/div/div/div[2]/div[3]/div/div/div/button", "xpath:idRelative"],
         ["xpath=//div[3]/div/div/div/button", "xpath:position"]
       ],
       "value": ""

backend/src/integration/resources/SHIBUI-1335-1.side

@@ -1304,10 +1304,10 @@
       "id": "e16e4888-e311-4719-9f87-590ddb124dc4",
       "comment": "",
       "command": "click",
-      "target": "css=.text-left:nth-child(3)",
+      "target": "xpath=(//button[@type='button'])[11]",
       "targets": [
-        ["css=.text-left:nth-child(3)", "css:finder"],
-        ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
+        ["css=.nav-link:nth-child(3)", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div/nav/button[3]", "xpath:idRelative"],
         ["xpath=//button[3]", "xpath:position"],
         ["xpath=//button[contains(.,'Attributes')]", "xpath:innerText"]

backend/src/integration/resources/SHIBUI-1335-3.side

@@ -279,11 +279,11 @@
       "id": "84f35d35-ea9c-4a06-aaec-bee1c1922aec",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(3) > .col-12 > .form-group .toggle-button",
+      "target": "css=.row:nth-child(3) > .col-12 > .mb-3 .toggle-button",
       "targets": [
-        ["css=.row:nth-child(3) > .col-12 > .form-group .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[4]/div/div/div/div[3]/div/div/div/div/div/button", "xpath:idRelative"],
+        ["css=.row:nth-child(3) > .col-12 > .mb-3 .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[3]/div/div/div/div[3]/div/div/div/div/div/button", "xpath:idRelative"],
         ["xpath=//div[3]/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""

backend/src/integration/resources/SHIBUI-1335-4.side

@@ -344,10 +344,10 @@
       "id": "2793bf1b-177b-461f-b06c-0a584ab6eaf0",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(3) > .col-12 > .form-group .toggle-button",
+      "target": "css=.row:nth-child(3) > .col-12 > .mb-3 .toggle-button",
       "targets": [
-        ["css=.row:nth-child(3) > .col-12 > .form-group .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
+        ["css=.row:nth-child(3) > .col-12 > .mb-3 .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[4]/div/div/div/div[3]/div/div/div/div/div/button", "xpath:idRelative"],
         ["xpath=//div[3]/div/div/div/div/div/button", "xpath:position"]
       ],
@@ -912,10 +912,10 @@
       "id": "f82f3d61-f057-4c8e-96c8-321cc7bb134c",
       "comment": "",
       "command": "click",
-      "target": "css=.text-left:nth-child(3)",
+      "target": "css=.nav-link:nth-child(3)",
       "targets": [
-        ["css=.text-left:nth-child(3)", "css:finder"],
-        ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
+        ["css=.nav-link:nth-child(3)", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div/nav/button[3]", "xpath:idRelative"],
         ["xpath=//button[3]", "xpath:position"],
         ["xpath=//button[contains(.,'Attributes')]", "xpath:innerText"]

backend/src/integration/resources/SHIBUI-1352-1.side

@@ -305,11 +305,11 @@
       "id": "a5274853-084e-438f-8cea-9a74e55fd0b9",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(3) > .col-12 > .form-group .toggle-button",
+      "target": "css=.row:nth-child(3) > .col-12 > .mb-3 .toggle-button",
       "targets": [
-        ["css=.row:nth-child(3) > .col-12 > .form-group .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[4]/div/div/div/div[3]/div/div/div/div/div/button", "xpath:idRelative"],
+        ["css=.row:nth-child(3) > .col-12 > .mb-3 .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[3]/div/div/div/div[3]/div/div/div/div/div/button", "xpath:idRelative"],
         ["xpath=//div[3]/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""

backend/src/integration/resources/SHIBUI-1361.side

@@ -1030,12 +1030,13 @@
       "id": "d00ecf98-7425-467c-acbb-3b39918e3462",
       "comment": "",
       "command": "click",
-      "target": "css=.form-group:nth-child(2) .toggle-button",
+      "target": "css=.mb-3:nth-child(2) .toggle-button",
       "targets": [
-        ["css=.form-group:nth-child(2) .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[6]/div/div/div/div/div[2]/div/div/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[2]/div/div/div/div/button", "xpath:position"]
+        ["css=.mb-3:nth-child(2) .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[14]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[5]/div/div/div/div/div[2]/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Options')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
@@ -1072,11 +1073,11 @@
       "id": "d7406190-0bb0-4df8-9c0b-7e393952b6a2",
       "comment": "",
       "command": "click",
-      "target": "css=.form-group:nth-child(3) .toggle-button",
+      "target": "css=.mb-3:nth-child(3) .toggle-button",
       "targets": [
-        ["css=.form-group:nth-child(3) .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[15]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[6]/div/div/div/div/div[2]/div[2]/div/div/div/button", "xpath:idRelative"],
+        ["css=.mb-3:nth-child(3) .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[16]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[5]/div/div/div/div/div[2]/div[2]/div/div/div/button", "xpath:idRelative"],
         ["xpath=//div[2]/div[2]/div/div/div/button", "xpath:position"]
       ],
       "value": ""
@@ -1114,11 +1115,11 @@
       "id": "19182110-0f86-4601-ae12-0b90967ef68a",
       "comment": "",
       "command": "click",
-      "target": "css=.form-group:nth-child(4) .toggle-button",
+      "target": "css=.mb-3:nth-child(4) .toggle-button",
       "targets": [
-        ["css=.form-group:nth-child(4) .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[17]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[6]/div/div/div/div/div[2]/div[3]/div/div/div/button", "xpath:idRelative"],
+        ["css=.mb-3:nth-child(4) .toggle-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/form/div/div/div/div/div[5]/div/div/div/div/div[2]/div[3]/div/div/div/button", "xpath:idRelative"],
         ["xpath=//div[3]/div/div/div/button", "xpath:position"]
       ],
       "value": ""

backend/src/integration/resources/SHIBUI-1364-1.side

@@ -717,6 +717,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "10000"
+    }, {
+      "id": "563c9606-0174-4432-877a-ad769eb3206a",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "b1c779b1-d3ed-47cc-bc88-e5c280161c32",
       "comment": "",
@@ -1358,6 +1365,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "10000"
+    }, {
+      "id": "563c9606-0174-4432-877a-ad769eb3206a",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "92fdc836-2479-4faa-9e3d-447f5b82cc11",
       "comment": "",
@@ -2341,7 +2355,7 @@
       "id": "2ff5a597-9fe0-46b4-9ca5-63123ddb3cef",
       "comment": "",
       "command": "click",
-      "target": "css=.border-primary:nth-child(2) .fa-square",
+      "target": "xpath=//section/div/div/div[4]/div[2]/div/button",
       "targets": [
         ["css=.border-primary:nth-child(2) .fa-square", "css:finder"]
       ],