From c6890f6925a4f446f319b23bbc29007b9312c6f8 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 18 Nov 2019 12:18:03 -0700
Subject: [PATCH 1/5] SHIBUI-1471 Fixed issue with autocomplete components

---
 ui/package-lock.json                          |  20 +++-
 ui/package.json                               |   3 +-
 .../container/copy-resolver.component.html    |   1 +
 .../widget/datalist/datalist.component.html   |   9 +-
 .../widget/datalist/datalist.component.ts     |   7 ++
 .../autocomplete/autocomplete.component.html  | 106 +++++++++---------
 .../autocomplete/autocomplete.component.scss  |   2 +
 .../autocomplete/autocomplete.component.ts    |  30 +++--
 8 files changed, 103 insertions(+), 75 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index e563a1f26..717b0f7ad 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -339,6 +339,23 @@
         }
       }
     },
+    "@angular/cdk": {
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-8.2.3.tgz",
+      "integrity": "sha512-ZwO5Sn720RA2YvBqud0JAHkZXjmjxM0yNzCO8RVtRE9i8Gl26Wk0j0nQeJkVm4zwv2QO8MwbKUKGTMt8evsokA==",
+      "requires": {
+        "parse5": "^5.0.0",
+        "tslib": "^1.7.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+          "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+          "optional": true
+        }
+      }
+    },
     "@angular/cli": {
       "version": "8.3.12",
       "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.3.12.tgz",
@@ -12255,8 +12272,7 @@
     "tslib": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz",
-      "integrity": "sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw=",
-      "dev": true
+      "integrity": "sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw="
     },
     "tslint": {
       "version": "5.3.2",
diff --git a/ui/package.json b/ui/package.json
index b47cb0463..f0fa2d460 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -18,6 +18,7 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "8.2.11",
+    "@angular/cdk": "^8.2.3",
     "@angular/common": "8.2.11",
     "@angular/compiler": "8.2.11",
     "@angular/core": "8.2.11",
@@ -73,4 +74,4 @@
     "typescript": "3.5.3",
     "webpack-bundle-analyzer": "^3.3.2"
   }
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.html b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
index fb3832558..fb850e9bb 100644
--- a/ui/src/app/metadata/resolver/container/copy-resolver.component.html
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
@@ -28,6 +28,7 @@ <h3 class="tag tag-primary">
                     </label>
                     <auto-complete
                         id="target"
+                        fieldId="target"
                         formControlName="target"
                         [matches]="searchResults$ | async"
                         [required]="true"
diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.html b/ui/src/app/schema-form/widget/datalist/datalist.component.html
index ae5351a9b..1471be3b5 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.html
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.html
@@ -1,5 +1,5 @@
 <div class="widget form-group">
-    <label [for]="formProperty._canonicalPath" class="d-flex justify-content-between control-label">
+    <label [id]="formProperty._canonicalPath + '-label'" [for]="formProperty._canonicalPath" class="d-flex justify-content-between control-label">
         <span [ngClass]="{'sr-only': formProperty.parent.schema.type === 'array'}">
             <translate-i18n [key]="title">{{ title }}</translate-i18n>
             <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
@@ -10,16 +10,17 @@
     </label>
     <span *ngIf="schema.description" class="sr-only" [translate]="schema.description">{{ schema.description }}</span>
     <auto-complete
-        [id]="formProperty._canonicalPath"
+        [id]="formProperty._canonicalPath + 'autocomplete'"
         [fieldId]="formProperty._canonicalPath"
         [formControl]="control"
-        [matches]="schema.widget.data"
+        [matches]="data"
         [required]="true"
         [dropdown]="true"
         [attr.placeholder]="schema.placeholder || '' | translate"
         [attr.disabled]="schema.readOnly?true:null"
         role="textbox"
-        [attr.aria-label]="title | translate">
+        [attr.aria-label]="title | translate"
+        (onChange)="getData($event)">
     </auto-complete>
     <small class="form-text text-danger" *ngIf="errorMessages && errorMessages.length && control.touched">
         <ng-container *ngFor="let error of errorMessages; let first=first;">
diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.ts b/ui/src/app/schema-form/widget/datalist/datalist.component.ts
index 08d9c5b48..ce3244e6f 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.ts
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.ts
@@ -9,6 +9,9 @@ import { HARD_CODED_REQUIRED_MSG } from '../../model/messages';
     templateUrl: `./datalist.component.html`
 })
 export class DatalistComponent extends ControlWidget implements AfterViewInit {
+
+    data: string[] = [];
+
     constructor(
         private widgetService: SchemaService
     ) {
@@ -24,6 +27,10 @@ export class DatalistComponent extends ControlWidget implements AfterViewInit {
         }
     }
 
+    getData(query: string): void {
+        this.data = [...this.schema.widget.data];
+    }
+
     get required(): boolean {
         return this.widgetService.isRequired(this.formProperty);
     }
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 95c1ed3dd..7a6f0fd24 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -1,58 +1,52 @@
-<div id="{{ id }}-container"
-    class="dropdown form-group"
-    (keydown)="handleKeyDown($event)"
-    role='combobox'
-    [attr.aria-expanded]="(menuIsVisible$ | async) ? 'true' : 'false'"
-    [attr.aria-label]="id">
-    <div [ngClass]="{'input-group': dropdown}">
-        <input
-            #inputField
-            [formControl]="input"
-            [disableValidation]="true"
-            [id]="fieldId || (id + '__input')"
-            class="form-control"
-            autoComplete="off"
-            type="text"
-            [attr.aria-activedescendant]="activeDescendant"
-            [placeholder]="placeholder"
-            attr.aria-owns="{{ id }}__listbox"
-            [attr.aria-labelledby]="id"
-            (focus)="handleInputFocus()"
-            (blur)="handleInputBlur()"
-        />
-        <div class="input-group-append" *ngIf="dropdown">
-            <button class="btn btn-outline-secondary"
-                type="button"
-                aria-haspopup="true"
-                aria-expanded="false"
-                [attr.aria-labelledby]="id"
-                (click)="state.setState({menuOpen: !state.currentState.menuOpen})">
-                <i class="fa fa-caret-down"></i>
-                <span class="sr-only">Toggle Dropdown</span>
-            </button>
-        </div>
+<div [ngClass]="{'input-group': dropdown}">
+    <input
+        #inputField
+        [formControl]="input"
+        [disableValidation]="true"
+        [id]="fieldId"
+        class="form-control"
+        autocomplete="off"
+        role="combobox"
+        type="text"
+        [placeholder]="placeholder"
+        [attr.aria-activedescendant]="activeDescendant"
+        aria-autocomplete="both"
+        aria-multiline="false"
+        [attr.aria-owns]="fieldId + '__listbox'"
+        [attr.aria-expanded]="(menuIsVisible$ | async) ? 'true' : 'false'"
+        (focus)="handleInputFocus()"
+        (blur)="handleInputBlur()"
+    />
+    <div class="input-group-append" *ngIf="dropdown">
+        <button class="btn btn-outline-secondary"
+            type="button"
+            aria-haspopup="true"
+            [attr.aria-expanded]="state.currentState.menuOpen"
+            (click)="state.setState({menuOpen: !state.currentState.menuOpen})">
+            <i class="fa fa-caret-down"></i>
+            <span class="sr-only">Toggle Dropdown</span>
+        </button>
     </div>
-    <ul class="dropdown-menu"
-        id="{{ id }}__listbox"
-        role="listbox"
-        [class.show]="(menuIsVisible$ | async) && !processing && !input.disabled">
-        <li *ngFor="let option of matches; let i = index;"
-            #matchElement
-            class="dropdown-item"
-            [class.active]="state.currentState.selected === i"
-            [class.focused]="state.currentState.focused === i"
-            [id]="this.getOptionId(i)"
-            (focusout)="handleOptionBlur($event, i)"
-            (click)="handleOptionClick(i)"
-            (mousedown)="handleOptionMouseDown($event)"
-            (mouseenter)="handleOptionMouseEnter(i)"
-            (mouseout)="handleOptionMouseOut()"
-            role="option"
-            tabIndex="-1"
-            [attr.aria-selected]="state.currentState.focused === i"
-            [innerHTML]="option | highlight:this.input.value"></li>
-        <li class="dropdown-item dropdown-item-noresults" *ngIf="matches && matches.length === 0 && !processing">
-            {{ noneFoundText }}
-        </li>
-    </ul>
 </div>
+<ul class="dropdown-menu"
+    [id]="fieldId + '__listbox'"
+    role="listbox"
+    [class.show]="(menuIsVisible$ | async) && !processing && !input.disabled">
+    <li *ngFor="let option of matches; let i = index;"
+        #matchElement
+        class="dropdown-item"
+        [class.active]="state.currentState.selected === i"
+        [class.focused]="state.currentState.focused === i"
+        [id]="this.getOptionId(i)"
+        (focusout)="handleOptionBlur($event, i)"
+        (click)="handleOptionClick(i)"
+        (mousedown)="handleOptionMouseDown($event)"
+        (mouseenter)="handleOptionMouseEnter(i)"
+        (mouseout)="handleOptionMouseOut()"
+        role="option"
+        [attr.aria-selected]="state.currentState.focused === i"
+        [innerHTML]="option | highlight:this.input.value"></li>
+    <li class="dropdown-item dropdown-item-noresults" *ngIf="matches && matches.length === 0 && !processing">
+        {{ noneFoundText }}
+    </li>
+</ul>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.scss b/ui/src/app/shared/autocomplete/autocomplete.component.scss
index f794dce0c..262779eab 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.scss
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.scss
@@ -12,6 +12,8 @@
 }
 
 :host {
+    position: relative;
+
     .btn-outline-secondary {
         border-color: $input-border-color;
     }
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.ts b/ui/src/app/shared/autocomplete/autocomplete.component.ts
index bc9994b1a..28a4c0365 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.ts
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.ts
@@ -5,21 +5,22 @@ import {
     EventEmitter,
     OnInit,
     OnDestroy,
+    OnChanges,
     AfterViewInit,
     ViewChild,
     ViewChildren,
     QueryList,
     ElementRef,
-    SimpleChanges,
     forwardRef,
-    ChangeDetectionStrategy,
-    OnChanges,
-    HostListener
+    HostListener,
+    SimpleChanges
 } from '@angular/core';
-import { FormControl, ControlValueAccessor, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import { FormControl, ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { Observable, Subject, Subscription, interval } from 'rxjs';
 import { takeUntil, combineLatest, map } from 'rxjs/operators';
 
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+
 import { keyCodes } from '../../shared/keycodes';
 import { AutoCompleteStateEmitter } from './autocomplete.model';
 import { NavigatorService } from '../../core/service/navigator.service';
@@ -28,7 +29,6 @@ const POLL_TIMEOUT = 1000;
 const INPUT_FIELD_INDEX = -1;
 
 @Component({
-    changeDetection: ChangeDetectionStrategy.OnPush,
     selector: 'auto-complete',
     templateUrl: './autocomplete.component.html',
     styleUrls: ['./autocomplete.component.scss'],
@@ -40,7 +40,7 @@ const INPUT_FIELD_INDEX = -1;
         }
     ]
 })
-export class AutoCompleteComponent implements OnInit, OnDestroy, AfterViewInit, ControlValueAccessor {
+export class AutoCompleteComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit, ControlValueAccessor {
     @Input() defaultValue = '';
     @Input() matches: string[] = [];
     @Input() id: string;
@@ -69,8 +69,6 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, AfterViewInit,
     $pollSubscription: Subscription;
 
     showMoreAvailable: boolean;
-
-    matches$: Observable<string[]>;
     numMatches: number;
 
     input: FormControl = new FormControl();
@@ -84,7 +82,7 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, AfterViewInit,
     propagateChange = (_: any | null) => { };
     propagateTouched = (_: any | null) => { };
 
-    constructor(private navigator: NavigatorService) {}
+    constructor(private navigator: NavigatorService, private live: LiveAnnouncer) {}
 
     ngOnInit(): void {
         this.$pollInput = interval(POLL_TIMEOUT);
@@ -116,7 +114,14 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, AfterViewInit,
     }
 
     ngAfterViewInit(): void {
-        this.listItems.changes.subscribe((changes) => this.setElementReferences(changes));
+        this.listItems.changes.subscribe((changes) => this.setElementReferences(changes) );
+    }
+
+    ngOnChanges(changes: SimpleChanges): void {
+        if (changes.matches && this.matches) {
+            const count = this.matches.length;
+            this.live.announce(count === 0 ? 'No results available' : `${count} result${count === 1 ? '' : 's'} available`);
+        }
     }
 
     writeValue(value: any): void {
@@ -242,6 +247,7 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, AfterViewInit,
         });
     }
 
+    @HostListener('keydown', ['$event'])
     handleKeyDown(event: KeyboardEvent): void {
         switch (keyCodes[event.keyCode]) {
             case 'up':
@@ -338,7 +344,7 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, AfterViewInit,
     }
 
     getOptionId(index): string {
-        return `${this.id}__option--${index}`;
+        return `${this.fieldId}__option--${index}`;
     }
 
     get hasAutoselect(): boolean {

From 2d1ebeb08fc8956ee14a22f74b6d7ee37bdd3530 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Mon, 18 Nov 2019 16:26:12 -0500
Subject: [PATCH 2/5] SHIBUI-1639

---
 .gitignore                                    |  6 +-
 .../MetadataResolverConverterServiceImpl.java | 69 +++++++++++--------
 ...taResolverConverterServiceImplTests.groovy | 29 ++++++++
 3 files changed, 76 insertions(+), 28 deletions(-)
 create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImplTests.groovy

diff --git a/.gitignore b/.gitignore
index 934a0cec0..050e01025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -390,4 +390,8 @@ pac4j-module/out/
 r
 
 #Local integration test run shell script wrapper
-rinteg
\ No newline at end of file
+rinteg
+
+#Local run with durable H2 shell script wrapper
+**/application-h2durable.properties
+rdurable
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
index 8088793a9..ee5f8cec3 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
@@ -13,6 +13,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects;
 import net.shibboleth.ext.spring.resource.ResourceHelper;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 import net.shibboleth.utilities.java.support.resource.Resource;
 import org.apache.lucene.index.IndexWriter;
@@ -21,13 +22,10 @@
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.stereotype.Service;
 
-import javax.validation.ConstraintViolationException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URL;
 
 import static edu.internet2.tier.shibboleth.admin.util.TokenPlaceholderResolvers.placeholderResolverService;
 
@@ -46,8 +44,8 @@ private OpenSamlFunctionDrivenDynamicHTTPMetadataResolver convertToOpenSamlRepre
         IndexWriter indexWriter = indexWriterService.getIndexWriter(resolver.getResourceId());
 
         OpenSamlFunctionDrivenDynamicHTTPMetadataResolver openSamlResolver = new OpenSamlFunctionDrivenDynamicHTTPMetadataResolver(openSamlObjects.getParserPool(),
-                                                                     indexWriter,
-                                                                     resolver);
+                indexWriter,
+                resolver);
         openSamlResolver.initialize();
         return openSamlResolver;
     }
@@ -68,31 +66,25 @@ private OpenSamlFilesystemMetadataResolver convertToOpenSamlRepresentation(Files
         }
 
         OpenSamlFilesystemMetadataResolver openSamlResolver = new OpenSamlFilesystemMetadataResolver(openSamlObjects.getParserPool(),
-                                                      indexWriter,
-                                                      resolver,
-                                                      metadataFile);
+                indexWriter,
+                resolver,
+                metadataFile);
         openSamlResolver.initialize();
         return openSamlResolver;
     }
 
     private OpenSamlLocalDynamicMetadataResolver convertToOpenSamlRepresentation(LocalDynamicMetadataResolver resolver) throws IOException, ComponentInitializationException {
-        IndexWriter indexWriter = indexWriterService.getIndexWriter(resolver.getResourceId());
-
-        XMLObjectLoadSaveManager manager = null;
-        if (resolver.getDoInitialization()) {
-            try {
-                manager = new FilesystemLoadSaveManager(placeholderResolverService()
-                        .resolveValueFromPossibleTokenPlaceholder(resolver.getSourceDirectory()));
-            } catch (ConstraintViolationException e) {
-                // the base directory string instance was null or empty
-                //TODO: What should we do here? Currently, this causes a test to fail.
-                throw new RuntimeException("An exception occurred while attempting to instantiate a FilesystemLoadSaveManger for the path: " + resolver.getSourceDirectory(), e);
-            }
+        try {
+            IndexWriter indexWriter = indexWriterService.getIndexWriter(resolver.getResourceId());
+            XMLObjectLoadSaveManager manager = new FilesystemLoadSaveManager(new AlwaysExistingVirtualMetadataDirectory(placeholderResolverService()
+                    .resolveValueFromPossibleTokenPlaceholder(resolver.getSourceDirectory())));
+            OpenSamlLocalDynamicMetadataResolver openSamlResolver = new OpenSamlLocalDynamicMetadataResolver(openSamlObjects.getParserPool(), indexWriter, resolver, manager);
+            openSamlResolver.initialize();
+            return openSamlResolver;
+        } catch (ConstraintViolationException e) {
+            // the base directory string instance was null or empty
+            throw new RuntimeException("An exception occurred while attempting to instantiate a FilesystemLoadSaveManger for the path: " + resolver.getSourceDirectory(), e);
         }
-
-        OpenSamlLocalDynamicMetadataResolver openSamlResolver = new OpenSamlLocalDynamicMetadataResolver(openSamlObjects.getParserPool(), indexWriter, resolver, manager);
-        openSamlResolver.initialize();
-        return openSamlResolver;
     }
 
     private OpenSamlResourceBackedMetadataResolver convertToOpenSamlRepresentation(ResourceBackedMetadataResolver resolver) throws IOException, ComponentInitializationException {
@@ -112,9 +104,9 @@ private OpenSamlResourceBackedMetadataResolver convertToOpenSamlRepresentation(R
         }
 
         OpenSamlResourceBackedMetadataResolver openSamlResolver = new OpenSamlResourceBackedMetadataResolver(openSamlObjects.getParserPool(),
-                                                          indexWriter,
-                                                          resolver,
-                                                          resource);
+                indexWriter,
+                resolver,
+                resource);
         openSamlResolver.initialize();
         return openSamlResolver;
     }
@@ -136,4 +128,27 @@ public MetadataResolver convertToOpenSamlRepresentation(edu.internet2.tier.shibb
                 throw new RuntimeException("Unsupported metadata resolver type!");
         }
     }
+
+    /**
+     * Use this class when creating FilesystemLoadSaveManager for OpenSamlLocalDynamicMetadataResolver
+     * as we guard the system from any file-related exceptions during init of open saml object representation.
+     * File with the same name might exist and we don't force the
+     * system to create a directory in this case. Shibboleth Idp would take care of these directory-creating aspects
+     * instead.
+     */
+    private static class AlwaysExistingVirtualMetadataDirectory extends File {
+        public AlwaysExistingVirtualMetadataDirectory(String pathname) {
+            super(pathname);
+        }
+
+        @Override
+        public boolean exists() {
+            return true;
+        }
+
+        @Override
+        public boolean isDirectory() {
+            return true;
+        }
+    }
 }
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImplTests.groovy
new file mode 100644
index 000000000..8a261565e
--- /dev/null
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImplTests.groovy
@@ -0,0 +1,29 @@
+package edu.internet2.tier.shibboleth.admin.ui.service
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicMetadataResolverAttributes
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import spock.lang.Specification
+
+@SpringBootTest
+class MetadataResolverConverterServiceImplTests extends Specification {
+
+    @Autowired
+    MetadataResolverConverterService mrConverterServiceUnderTest
+
+    def "conversion to OpenSamlLocalDynamicMetadataResolver with source directory name matching existing file (non-directory) succeeds"() {
+        given:
+        LocalDynamicMetadataResolver mr = new LocalDynamicMetadataResolver().with {
+            it.name = 'SHIBUI-1639'
+            it.sourceDirectory = File.createTempFile('foo', null).absolutePath
+            it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes()
+            it
+        }
+        when:
+        mrConverterServiceUnderTest.convertToOpenSamlRepresentation(mr)
+
+        then:
+        noExceptionThrown()
+    }
+}

From 0d6fe9afde85a98d4efb75bf81f30c014c294e53 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 19 Nov 2019 07:02:35 -0700
Subject: [PATCH 3/5] SHIBUI-1472 added badges to tab order

---
 .../component/resolvers-list.component.html   | 19 ++++++++++++-------
 .../dashboard-providers-list.component.html   |  7 ++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ui/src/app/metadata/manager/component/resolvers-list.component.html b/ui/src/app/metadata/manager/component/resolvers-list.component.html
index de54eebae..c221fbcff 100644
--- a/ui/src/app/metadata/manager/component/resolvers-list.component.html
+++ b/ui/src/app/metadata/manager/component/resolvers-list.component.html
@@ -16,9 +16,11 @@
                     <a [routerLink]="['/', 'metadata', 'resolver', 'new', 'blank', 'common']"
                         [queryParams]="{'id': resolver.getId()}">{{ resolver.name }}</a>
                 </td>
-                <td>{{ resolver.getDisplayId() }}</td>
-                <td>{{ resolver.createdBy }}</td>
-                <td>{{ resolver.getCreationDate() ? (resolver.getCreationDate() | customDate) : '&mdash;' }}</td>
+                <td [attr.aria-label]="resolver.getDisplayId()">{{ resolver.getDisplayId() }}</td>
+                <td [attr.aria-label]="resolver.createdBy">{{ resolver.createdBy ? resolver.createdBy : '&mdash;' }}</td>
+                <td [attr.aria-label]="resolver.getCreationDate() ? (resolver.getCreationDate() | customDate) : 'unknown'">
+                    {{ resolver.getCreationDate() ? (resolver.getCreationDate() | customDate) : '&mdash;' }}
+                </td>
                 <td class="text-right">
                     <span *ngIf="resolver.isDraft()">
                         <button class="btn btn-outline btn-sm btn-danger" (click)="delete.emit(resolver)">
@@ -26,7 +28,7 @@
                             <i class="fa fa-trash"></i>
                         </button>
                         &nbsp;
-                        <span class="badge badge-warning" aria-label="Warning Badge: Incomplete Form"
+                        <span class="badge badge-warning" tabindex="0" aria-label="Warning Badge: Incomplete Form"
                             translate="message.incomplete-form">
                             Incomplete Form
                         </span>
@@ -42,10 +44,13 @@
                         </button>
                     </ng-container>
                     <ng-container *ngIf="!toggleEnabled.observers.length">
-                        <span class="badge" *ngIf="!resolver.isDraft()" [class.badge-danger]="!resolver.enabled"
+                        <span tabindex="0"
+                            [attr.aria-label]="(resolver.enabled ? 'value.enabled' : 'value.disabled') | translate"
+                            class="badge"
+                            *ngIf="!resolver.isDraft()"
+                            [class.badge-danger]="!resolver.enabled"
                             [class.badge-success]="resolver.enabled">
-                            <span *ngIf="resolver.enabled" translate="value.enabled">Enabled</span>
-                            <span *ngIf="!resolver.enabled" translate="value.disabled">Disabled</span>
+                            {{ (resolver.enabled ? 'value.enabled' : 'value.disabled') | translate }}
                         </span>
                     </ng-container>
                 </td>
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
index 22823cc35..00e11d268 100644
--- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
@@ -52,11 +52,12 @@
                             <td>{{ provider.createdBy }}</td>
                             <td>{{ provider.createdDate | customDate }}</td>
                             <td class="text-right">
-                                <span class="badge"
+                                <span tabindex="0"
+                                    class="badge"
+                                    [attr.aria-label]="(provider.enabled ? 'value.enabled' : 'value.disabled') | translate"
                                     [class.badge-danger]="!provider.enabled"
                                     [class.badge-success]="provider.enabled">
-                                    <span *ngIf="provider.enabled" translate="value.enabled">Enabled</span>
-                                    <span *ngIf="!provider.enabled" translate="value.disabled">Enabled</span>
+                                    {{ (provider.enabled ? 'value.enabled' : 'value.disabled') | translate }}
                                 </span>
                             </td>
                         </tr>

From 3ffa9d6e949cff6b29366665fead9e7bad08bfeb Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 19 Nov 2019 07:09:03 -0700
Subject: [PATCH 4/5] SHIBUI-1498 fixed typo

---
 backend/src/main/resources/i18n/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 714bf14bb..a5cd009f7 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -560,7 +560,7 @@ tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provide
 
 tooltip.max-validity-interval=Defines the window within which the metadata is valid.
 tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.
-tooltip.certificate-file=A path (on the local file system) to a certificate file whose key used to verify the signature. Conflicts with trustEngineRef and both of the child elements.
+tooltip.certificate-file=A path (on the local file system) to a certificate file whose key is used to verify the signature. Conflicts with trustEngineRef and both of the child elements.
 tooltip.retained-roles=Note that property replacement cannot be used on this element.
 tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntityDescriptor> element must include at least one role descriptor.
 tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element.

From 3fc8632b8a772ec844079468ba8bf50cc8c5a723 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 19 Nov 2019 07:34:40 -0700
Subject: [PATCH 5/5] SHIBUI-1543

---
 .../main/resources/i18n/messages.properties   |  1 +
 .../container/metadata-options.component.html | 20 ++++++++++---------
 .../container/metadata-xml.component.html     | 10 ++++++++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 714bf14bb..7ed41b2e9 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -58,6 +58,7 @@ action.back-to-top=Back to Top
 action.restore=Restore
 action.view-only-changes=View Only Changes
 action.user-role=User Role
+action.toggle-view=Toggle view
 
 value.enabled=Enabled
 value.disabled=Disabled
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html
index 54c969b5e..09b72b7f9 100644
--- a/ui/src/app/metadata/configuration/container/metadata-options.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html
@@ -20,15 +20,17 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
                 <translate-i18n key="label.filters">Filters</translate-i18n>
             </button>
         </div>
-        <div class="btn-group" *ngIf="hasXml$ | async">
-            <a class="btn"
-                routerLink="../options"
-                routerLinkActive="btn-primary"
-                translate="action.options">Options</a>
-            <a class="btn"
-                routerLink="../xml"
-                routerLinkActive="btn-primary"
-                translate="action.xml">XML</a>
+        <div *ngIf="hasXml$ | async">
+            <div class="btn-group">
+                <a class="btn" routerLink="../options" routerLinkActive="btn-primary">
+                    <span class="sr-only" translate="action.toggle-view">Toggle view:</span>
+                    Options
+                </a>
+                <a class="btn" routerLink="../xml" routerLinkActive="btn-primary">
+                    <span class="sr-only" translate="action.toggle-view">Toggle view:</span>
+                    XML
+                </a>
+            </div>
         </div>
     </div>
     <ng-container *ngIf="configuration$ | async">
diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.html b/ui/src/app/metadata/configuration/container/metadata-xml.component.html
index e682a556d..2b5837944 100644
--- a/ui/src/app/metadata/configuration/container/metadata-xml.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.html
@@ -6,8 +6,14 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
 <div class="container-fluid">
     <div class="px-3 my-3 d-flex justify-content-end">
         <div class="btn-group">
-            <a class="btn" routerLink="../options" routerLinkActive="btn-primary">Options</a>
-            <a class="btn" routerLink="../xml" routerLinkActive="btn-primary">XML</a>
+            <a class="btn" routerLink="../options" routerLinkActive="btn-primary">
+                <span class="sr-only" translate="action.toggle-view">Toggle view:</span>
+                Options
+            </a>
+            <a class="btn" routerLink="../xml" routerLinkActive="btn-primary">
+                <span class="sr-only" translate="action.toggle-view">Toggle view:</span>
+                XML
+            </a>
         </div>
     </div>
     <div class="px-3 my-3">