Skip to content

MCR-3032 MCR-3032 Decouple redirection to login page from globaly used MCRLoginServlet URL path #1413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toKrause wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MCR-3032 MCR-3032 Decouple redirection to login page from globaly used MCRLoginServlet URL path #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mir-module/src/main/resources/actionmappings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
<action action="create">
<when condition="(group = admin) or (group = editor)" url="/editor/editor-admins.xed" />
<when condition="group = submitter" url="/content/publish/index.xml" />
<when condition="true" url="/servlets/MCRLoginServlet?url=MCRActionMappingServlet/mods/create" />
<when condition="true" login-detour="true" url="MCRActionMappingServlet/mods/create"/>
</action>
<action action="create-child">
<when condition="(group = admin) or (group = editor)" url="/editor/editor-admins.xed" />
<when condition="group = submitter" url="/editor/editor-dynamic.xed" />
<when condition="true" url="/servlets/MCRLoginServlet?url=MCRActionMappingServlet/mods/create-child" />
<when condition="true" login-detour="true" url="MCRActionMappingServlet/mods/create-child" />
</action>
<action action="create-copy">
<when condition="(group = admin) or (group = editor)" url="/editor/editor-admins.xed" />
<when condition="group = submitter" url="/editor/editor-dynamic.xed" />
<when condition="true" url="/servlets/MCRLoginServlet?url=MCRActionMappingServlet/mods/create-copy" />
<when condition="true" login-detour="true" url="MCRActionMappingServlet/mods/create-copy" />
</action>
<action action="update">
<when condition="(group = admin) or (group = editor)" url="/servlets/MCRLockServlet?url=/editor/editor-dynamic.xed" />
Expand All @@ -46,7 +46,7 @@
<collection name="lecture">
<action action="create-child">
<when condition="(group = admin) or (group = editor) or (group = submitter)" url="/editor/editor-dynamic.xed" />
<when condition="true" url="/servlets/MCRLoginServlet?url=MCRActionMappingServlet/lecture/create-child" />
<when condition="true" login-detour="true" url="MCRActionMappingServlet/lecture/create-child" />
</action>
</collection>
</actionmappings>
5 changes: 2 additions & 3 deletions mir-module/src/main/resources/xslt/layout/mir-common-layout.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<xsl:include href="resource:xslt/mir-utils.xsl" />
<xsl:variable name="loaded_navigation_xml" select="mcrlayoututils:get-personal-navigation()/navigation" />
<xsl:variable name="browserAddress" select="mcrlayoututils:get-browser-address($loaded_navigation_xml,.)" />
<xsl:variable name="whiteList" select="concat($ServletsBaseURL,'MCRLoginServlet')" />
<xsl:variable name="whiteList" select="$LoginURL" />
<xsl:variable name="readAccess">
<xsl:choose>
<xsl:when test="starts-with($RequestURL, $whiteList)">
Expand All @@ -41,8 +41,7 @@


<xsl:template name="mir.loginMenu">
<xsl:variable name="loginURL"
select="concat( $ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri( string( $RequestURL ) ) )" />
<xsl:variable name="loginURL" select="$LoginDetourURL" />
<xsl:choose>
<xsl:when test="mcracl:is-current-user-guest-user()">
<li class="nav-item">
Expand Down
8 changes: 3 additions & 5 deletions mir-module/src/main/resources/xslt/layout/mir-layout-utils.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
</a>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="LoginURL"
select="concat($ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri(string($RequestURL)))" />
<xsl:variable name="LoginURL" select="$LoginDetourURL" />
<xsl:apply-templates select="$mcrobj" mode="resulttitle" />
<xsl:text>&#160;</xsl:text>
<a href="{$LoginURL}">
Expand All @@ -43,8 +42,7 @@
</a>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="LoginURL"
select="concat($ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri(string($RequestURL)))" />
<xsl:variable name="LoginURL" select="$LoginDetourURL" />
<xsl:apply-templates select="$resolved_mcrobj" mode="resulttitle" />
<xsl:text>&#160;</xsl:text>
<a href="{$LoginURL}">
Expand All @@ -57,7 +55,7 @@
</xsl:template>

<xsl:template name="displayLogin">
<xsl:variable name="loginURL" select="concat($ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri(string($RequestURL)))" />
<xsl:variable name="loginURL" select="$LoginDetourURL" />
<br></br>
<xsl:copy-of
select="
Expand Down
3 changes: 1 addition & 2 deletions mir-module/src/main/resources/xslt/metadata/mir-collapse-files.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
<xsl:param name="MIR.NotFullAccessInfo.Genres" />
<xsl:param name="MIR.FileBrowser.FilesPerPage" />
<xsl:template match="/">
<xsl:variable name="loginURL"
select="concat( $ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri( string( $RequestURL ) ) )" />
<xsl:variable name="loginURL" select="$LoginDetourURL" />

<xsl:choose>
<xsl:when test="key('rights', mycoreobject/@ID)/@read or key('rights', mycoreobject/structure/derobjects/derobject/@xlink:href)/@accKeyEnabled">
Expand Down
4 changes: 2 additions & 2 deletions mir-module/src/main/resources/xslt/modsdetails-external.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,15 +268,15 @@
<xsl:choose>
<xsl:when test="not($accessedit) and mcracl:is-current-user-in-role('guest')">
<li class="mir-action-item">
<a href="{concat($ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri(string($RequestURL)))}" class="dropdown-item">
<a href="{$LoginDetourURL}" class="dropdown-item">
<xsl:value-of select="mcri18n:translate('mir.actions.noaccess')" />
</a>
</li>
</xsl:when>
<xsl:otherwise>
<xsl:if test="not($accessedit or $accessdelete)">
<li class="mir-action-item">
<a href="{concat($ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri(string($RequestURL)))}" class="dropdown-item">
<a href="{$LoginDetourURL}" class="dropdown-item">
<xsl:value-of select="mcri18n:translate('mir.actions.norights')" />
</a>
</li>
Expand Down
6 changes: 2 additions & 4 deletions mir-module/src/main/resources/xslt/modsmetadata-legacy.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,7 @@
</xsl:when>
<xsl:otherwise>
<!-- Build Login URL for LoginServlet -->
<xsl:variable name="LoginURL"
select="concat( $ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri( string( $RequestURL ) ) )" />
<xsl:variable name="LoginURL" select="$LoginDetourURL" />
<xsl:apply-templates select="$mcrobj" mode="resulttitle" />
&#160;
<a href="{$LoginURL}">
Expand All @@ -223,8 +222,7 @@
</xsl:when>
<xsl:otherwise>
<!-- Build Login URL for LoginServlet -->
<xsl:variable name="LoginURL"
select="concat( $ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri( string( $RequestURL ) ) )" />
<xsl:variable name="LoginURL" select="$LoginDetourURL" />
<xsl:apply-templates select="$mcrobj" mode="resulttitle" />
&#160;
<a href="{$LoginURL}">
Expand Down
2 changes: 1 addition & 1 deletion mir-module/src/main/resources/xslt/new-author-verified.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<xsl:value-of select="user/eMail" />
</b>
<xsl:value-of select="' ' || mcri18n:translate($i18n-prefix || 'user.info.2')" />
<a href="{$ServletsBaseURL || 'MCRLoginServlet?url=' || $WebApplicationBaseURL || 'content/index.xml'}">
<a href="{$LoginURL || '?url=' || encode-for-uri($WebApplicationBaseURL || 'content/index.xml')}">
<xsl:value-of select="' ' || mcri18n:translate($i18n-prefix || 'user.info.3')" />
</a>
<xsl:value-of select="mcri18n:translate($i18n-prefix || 'user.info.4')" />
Expand Down
Loading