Repository: cxf-fediz Updated Branches: refs/heads/master e481b9344 -> e15c2661a
Fixing a typo Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e15c2661 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e15c2661 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e15c2661 Branch: refs/heads/master Commit: e15c2661a772a0ee87e6a123c52454c42707a9ec Parents: e481b93 Author: Sergey Beryozkin <[email protected]> Authored: Mon Nov 16 14:39:29 2015 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Mon Nov 16 14:39:29 2015 +0000 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/applicationContext.xml | 3 +-- .../webapp/WEB-INF/views/oAuthAuthorizationData.jsp | 14 +++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e15c2661/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml index 1f89eab..ba56b40 100644 --- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml +++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml @@ -36,7 +36,6 @@ </jaxrs:serviceBeans> <jaxrs:providers> <ref bean="viewProvider"/> - <ref bean="oauthJsonService"/> </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.signature.properties" value="rs.security.properties"/> @@ -88,7 +87,7 @@ <ref bean="accessTokenValidatorService"/> </jaxrs:serviceBeans> <jaxrs:providers> - <ref bean="oauthJsonService"/> + <ref bean="oauthJsonProvider"/> </jaxrs:providers> </jaxrs:server> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e15c2661/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp index ca659c8..db74371 100644 --- a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp +++ b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp @@ -22,12 +22,24 @@ <input type="hidden" name="client_id" value="<%= data.getClientId() %>"/> + <% + if (data.getState() != null) { + %> <input type="hidden" name="state" value="<%= data.getState() %>"/> + <% + } + %> <input type="hidden" name="scope" value="<%= data.getProposedScope() %>"/> + <% + if (data.getRedirectUri() != null) { + %> <input type="hidden" name="redirect_uri" - value="<%= data.getRedirectUri() %>"/> + value="<%= data.getRedirectUri() %>"/> + <% + } + %> <input type="hidden" name="<%= org.apache.cxf.rs.security.oauth2.utils.OAuthConstants .SESSION_AUTHENTICITY_TOKEN %>"
