From 703029b777d842209e63de8e6d7e6e26e67c9c69 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Mon, 11 Dec 2017 12:26:24 +1000 Subject: [PATCH] ZNTA-2303 fix single openid provider landing on 404 --- server/docker/conf/zanata-config.cli | 2 ++ .../src/main/java/org/zanata/servlet/UrlRewriteConfig.java | 1 + 2 files changed, 3 insertions(+) diff --git a/server/docker/conf/zanata-config.cli b/server/docker/conf/zanata-config.cli index 92f1f043e5..f5d6380435 100644 --- a/server/docker/conf/zanata-config.cli +++ b/server/docker/conf/zanata-config.cli @@ -99,6 +99,8 @@ jms-queue add --queue-address=MailsQueue --durable=true --entries=["java:/jms/qu ## add zanata.openid security domain /subsystem=security/security-domain=zanata.openid:add() /subsystem=security/security-domain=zanata.openid/authentication=classic:add() +# uncomment following line and comment the line below will turn the instance into single OpenID provider mode. Sign in will go straight to the openID provider +# /subsystem=security/security-domain=zanata.openid/authentication=classic/login-module=ZanataOpenIdLoginModule:add(code="org.zanata.security.OpenIdLoginModule",flag="required",module-options={providerURL="https://id.fedoraproject.org/openid/"}) /subsystem=security/security-domain=zanata.openid/authentication=classic/login-module=ZanataOpenIdLoginModule:add(code="org.zanata.security.OpenIdLoginModule",flag="required") # ==== mail session ==== diff --git a/server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java b/server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java index 8d824e4b7c..905aa02888 100644 --- a/server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java +++ b/server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java @@ -124,6 +124,7 @@ public Configuration getConfiguration(final ServletContext context) { .addRule(Join.path("/account/sign_in").to("/account/login.xhtml")) .addRule(Join.path("/account/register").to("/account/register.xhtml")) .addRule(Join.path("/account/sign_out").to("/account/logout.xhtml")) + .addRule(Join.path("/account/singleopenidlogin").to("/account/singleopenidlogin.xhtml")) // open id return url .addRule(Join.path("/openid").to("/account/openid.xhtml")) .addRule(Join.path("/account/validate_email/{key}").to("/account/email_validation.xhtml"))