cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbernha...@apache.org
Subject cxf-fediz git commit: Remove OIDC Client Description
Date Mon, 14 Dec 2015 16:27:41 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 7c6707f8a -> b125218df


Remove OIDC Client Description


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b125218d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b125218d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b125218d

Branch: refs/heads/master
Commit: b125218df3899cd194d6d6e3ac0bc710afc90f54
Parents: 7c6707f
Author: Jan Bernhardt <jbernhardt@talend.com>
Authored: Mon Dec 14 11:41:01 2015 +0100
Committer: Jan Bernhardt <jbernhardt@talend.com>
Committed: Mon Dec 14 13:56:45 2015 +0100

----------------------------------------------------------------------
 .../service/oidc/ClientRegistrationService.java      |  5 ++---
 .../webapp/WEB-INF/views/oAuthAuthorizationData.jsp  | 15 ++++++---------
 .../src/main/webapp/WEB-INF/views/registerClient.jsp |  5 -----
 3 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b125218d/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java
index 8c4babb..2398537 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java
@@ -72,8 +72,8 @@ public class ClientRegistrationService {
     @Produces(MediaType.TEXT_HTML)
     @Path("/")
     public Collection<Client> registerForm(@FormParam("client_name") String appName,
-        @FormParam("client_description") String appDesc, @FormParam("client_type") String
appType,
-        @FormParam("client_redirectURI") String redirectURI, @FormParam("client_homeRealm")
String homeRealm) {
+        @FormParam("client_type") String appType, @FormParam("client_redirectURI") String
redirectURI,
+        @FormParam("client_homeRealm") String homeRealm) {
         //TODO Check for mandatory parameters
         
         String clientId = generateClientId();
@@ -84,7 +84,6 @@ public class ClientRegistrationService {
 
         FedizClient newClient = new FedizClient(clientId, clientSecret, isConfidential, appName);
         newClient.setHomeRealm(homeRealm);
-        newClient.setApplicationDescription(appDesc);
         if (!StringUtils.isEmpty(redirectURI)) {
             newClient.setRedirectUris(Collections.singletonList(redirectURI));
         }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b125218d/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 9fe59b7..16404a8 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
@@ -13,7 +13,7 @@
 </STYLE>
 </head>
 <body>
-<title align="center">Third Party Authorization Form</title>
+<h1 align="center">Third Party Authorization Form</h1>
 <table align="center">
        <tr align="center">
                 <td>
@@ -60,18 +60,16 @@
                                name="<%= org.apache.cxf.rs.security.oauth2.utils.OAuthConstants
                                    .SESSION_AUTHENTICITY_TOKEN %>"
                                value="<%= data.getAuthenticityToken() %>"/>
-                        <p><big><big><big>Would you like to grant
<%= data.getApplicationName() %><br/>(<%= data.getApplicationDescription()
%>)</big></big></big>
-                        <%
+						<%
                             if (data.getApplicationLogoUri() != null) {
-                        %> 
-                        <br/><br/> 
+                        %>                        
                         <img src="<%= data.getApplicationLogoUri() %>" alt="Application
Logo" width="100" height="100">
                         <%
                             }
                         %>
-                        <br/></p>
-                        <big><big>the following permissions:<big/></big>
-                        <p/>
+
+                        <h2>Would you like to grant <%= data.getApplicationName()
%><br />the following permissions:</h2>
+
                         <table> 
                             <%
                                for (Permission perm : data.getPermissions()) {
@@ -118,7 +116,6 @@
                                     .AUTHORIZATION_DECISION_DENY %>">
                             No,thanks
                         </button>
-                        
                     </form>
                 </td>
             </tr>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b125218d/services/oidc/src/main/webapp/WEB-INF/views/registerClient.jsp
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/registerClient.jsp b/services/oidc/src/main/webapp/WEB-INF/views/registerClient.jsp
index e29d77f..8251e26 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/registerClient.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/registerClient.jsp
@@ -72,11 +72,6 @@ input, select, button {
 					size="40" name="client_name" id="input_name" data-type="input-textbox" />
 			</div>
 			<div class="form-line">
-				<label for="client_description" id="label_description" class="form-label"> Description
</label>
-				<input placeholder="OIDC Client Description" type="text"
-					value="" size="40" name="client_description" id="input_description" data-type="input-textbox"
/>
-			</div>
-			<div class="form-line">
 				<label for="client_type" id="label_type" class="form-label"> Type <span class="form-required">
* </span></label>
 				<select name="client_type" id="input_type">
 					<option value="confidential" selected="selected">Confidential</option>


Mime
View raw message