ZNTA-2303 fix single openid provider landing on 404

zanata · Dec 11, 2017 · 703029b · 703029b
1 parent 9eb3ddc
commit 703029b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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"))