Revision 4cd4de2d
Added by Andreas Müller over 3 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractAuthenticatedUI.java | ||
|---|---|---|
| 1 | 1 |
package eu.etaxonomy.cdm.vaadin.ui; |
| 2 | 2 |
|
| 3 |
import java.net.URI; |
|
| 4 | 3 |
import java.util.logging.Logger; |
| 5 | 4 |
|
| 6 | 5 |
import com.vaadin.navigator.Navigator; |
| ... | ... | |
| 11 | 10 |
import com.vaadin.spring.navigator.SpringViewProvider; |
| 12 | 11 |
import com.vaadin.ui.UI; |
| 13 | 12 |
|
| 13 |
import eu.etaxonomy.cdm.common.URI; |
|
| 14 | 14 |
import eu.etaxonomy.cdm.vaadin.util.CdmVaadinAuthentication; |
| 15 | 15 |
import eu.etaxonomy.cdm.vaadin.view.AuthenticationView; |
| 16 | 16 |
|
| ... | ... | |
| 53 | 53 |
CdmVaadinAuthentication cvAuthentication = (CdmVaadinAuthentication) VaadinSession.getCurrent().getAttribute(CdmVaadinAuthentication.KEY); |
| 54 | 54 |
|
| 55 | 55 |
doInit(request); |
| 56 |
URI uri = Page.getCurrent().getLocation();
|
|
| 56 |
URI uri = new URI(Page.getCurrent().getLocation());
|
|
| 57 | 57 |
String context = VaadinServlet.getCurrent().getServletContext().getContextPath(); |
| 58 | 58 |
if(ignoreAuthentication || (cvAuthentication != null && cvAuthentication.isAuthenticated(uri, context))) {
|
| 59 | 59 |
if(cvAuthentication != null) {
|
Also available in: Unified diff
ref #9114 adapt URIs to URI wrapper in vaadin