Commit 90a8f05b authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

412: Migrate security to new dariahsp (OPENED)

Task-Url: search#412
parent 6c491270
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<tiles:importAttribute name="fluidLayout" />
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div id="notifications-area" class="col-10 offset-1"></div>
......@@ -12,8 +12,7 @@
<c:if test="${not empty error}">
<div class="alert alert-warning" role="alert"><s:message code="~eu.dariah.de.minfba.common.local_login.invalid_credentials" /></div>
</c:if>
<form name='loginForm' action="<c:url value='/localsec/login' />" method='POST'>
<form name='loginForm' action="<s:url value='${callbackUrl}?client_name=local&url=${requestUrl}' />" method='POST'>
<input type="hidden" name="redirectUrl" id="redirectUrl" value="${redirectUrl}" />
<div class="form-group">
<label for="username"><s:message code="~eu.dariah.de.minfba.common.local_login.username" /></label>
......
......@@ -14,7 +14,7 @@
<form>
<div class="form-group">
<label for="authorizedAs"><s:message code="~eu.dariah.de.minfba.common.titles.user_profile.autorized_as" /></label>
<input type="text" readonly class="form-control-plaintext" id="authorizedAs" value="${_auth.displayName}">
<input type="text" readonly class="form-control-plaintext" id="authorizedAs" value="${_auth.displayName==null?_auth.userId:_auth.displayName}">
</div>
</form>
</c:when>
......
......@@ -89,10 +89,10 @@
<c:set var="currentUrl" value="${requestScope['javax.servlet.forward.request_uri']}" />
<c:choose>
<c:when test="${_auth==null || _auth.auth!=true}">
<a class="nav-link account_toggle" href="<s:url value='/login?url=${currentUrl}' />"><span class="ti-login"></span></a>
<a class="nav-link account_toggle" href="<s:url value='/startLogin?url=${currentUrl}' />"><span class="ti-login"></span></a>
</c:when>
<c:otherwise>
<a class="nav-link account_toggle" href="<s:url value='/logout' />"><span class="ti-logout"></span></a>
<a class="nav-link account_toggle" href="<s:url value='/centralLogout' />"><span class="ti-logout"></span></a>
</c:otherwise>
</c:choose>
</li>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment