From 0dd9f8f057249eae6297bc28b6c2314f82e8a223 Mon Sep 17 00:00:00 2001
From: Li Shengzhao <shengzhan@uwantsoft.com>
Date: Mon, 9 Nov 2015 15:38:58 +0800
Subject: [PATCH] =?UTF-8?q?109=20=09=E5=8D=87=E7=BA=A7=20spring-security-o?=
 =?UTF-8?q?auth2=20=E7=9A=84=E7=89=88=E6=9C=AC=E5=88=B0=202.0.6=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8A,=20=E7=9B=AE=E5=89=8D=E6=98=AF1.0.5=20113=20=09Upgrad?=
 =?UTF-8?q?e=20spring,=20spring=20security=20version=20to=20>=204.0=20vers?=
 =?UTF-8?q?ion:=200.4-beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/dto/OauthClientDetailsDto.java     |  8 +++
 .../jsp/clientdetails/register_client.jsp     |  3 +-
 .../WEB-INF/jsp/clientdetails/test_client.jsp | 72 +++++++++++++------
 3 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/src/main/java/cc/wdcy/domain/dto/OauthClientDetailsDto.java b/src/main/java/cc/wdcy/domain/dto/OauthClientDetailsDto.java
index 7d3b84b..1815032 100644
--- a/src/main/java/cc/wdcy/domain/dto/OauthClientDetailsDto.java
+++ b/src/main/java/cc/wdcy/domain/dto/OauthClientDetailsDto.java
@@ -107,6 +107,14 @@ public class OauthClientDetailsDto implements Serializable {
         return scope;
     }
 
+
+    public String getScopeWithBlank() {
+        if (scope != null && scope.contains(",")) {
+            return scope.replaceAll(",", " ");
+        }
+        return scope;
+    }
+
     public void setScope(String scope) {
         this.scope = scope;
     }
diff --git a/src/main/webapp/WEB-INF/jsp/clientdetails/register_client.jsp b/src/main/webapp/WEB-INF/jsp/clientdetails/register_client.jsp
index 53f3228..949f15e 100644
--- a/src/main/webapp/WEB-INF/jsp/clientdetails/register_client.jsp
+++ b/src/main/webapp/WEB-INF/jsp/clientdetails/register_client.jsp
@@ -73,8 +73,7 @@
                     <form:select path="scope" id="scope" cssClass="form-control">
                         <form:option value="read">read</form:option>
                         <form:option value="write">write</form:option>
-                        <form:option value="trust">trust</form:option>
-                        <form:option value="read,write">read,write</form:option>
+                        <form:option value="read,write">read write</form:option>
                     </form:select>
 
                     <p class="help-block">scope必须选择</p>
diff --git a/src/main/webapp/WEB-INF/jsp/clientdetails/test_client.jsp b/src/main/webapp/WEB-INF/jsp/clientdetails/test_client.jsp
index 9e030ba..2aadfa1 100644
--- a/src/main/webapp/WEB-INF/jsp/clientdetails/test_client.jsp
+++ b/src/main/webapp/WEB-INF/jsp/clientdetails/test_client.jsp
@@ -41,18 +41,25 @@
                                 <a href="${contextPath}/oauth/authorize?client_id={{clientId}}&redirect_uri={{redirectUri}}&response_type=code&scope={{scope}}"
                                    target="_blank">
                                     /oauth/authorize?client_id={{clientId}}&redirect_uri={{redirectUri}}&response_type=code&scope={{scope}}</a>
+                                <span class="label label-info">GET</span>
                             </p>
                         </li>
                         <li>
-                            <p>
-                                <code>用 'code' 换取 'access_token'</code>
-                                <br/>
-                                输入第一步获取的code: <input type="text" name="code" value="" ng-model="code"
-                                                     required="required"/>
-                                <br/>
-                                <a href="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=authorization_code&code={{code}}&redirect_uri={{redirectUri}}"
-                                   target="_blank">/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=authorization_code&code={{code}}&redirect_uri={{redirectUri}}</a>
-                            </p>
+                            <code>用 'code' 换取 'access_token'</code>
+                            <br/>
+                            输入第一步获取的code: <input type="text" name="code" value="" ng-model="code"
+                                                 required="required"/>
+                            <br/>
+
+                            <form action="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=authorization_code&code={{code}}&redirect_uri={{redirectUri}}"
+                                  method="post" target="_blank">
+                                    <%--<a href="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=authorization_code&code={{code}}&redirect_uri={{redirectUri}}"--%>
+                                    <%--target="_blank">/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=authorization_code&code={{code}}&redirect_uri={{redirectUri}}</a>--%>
+                                <button class="btn btn-link" type="submit">
+                                    /oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=authorization_code&code={{code}}&redirect_uri={{redirectUri}}
+                                </button>
+                                <span class="label label-warning">POST</span>
+                            </form>
                         </li>
                     </ol>
                 </div>
@@ -68,10 +75,17 @@
                     <br/>
                     password: <input type="text" required="required" ng-model="password"/>
 
-                    <p>
-                        <a href="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=password&scope={{scope}}&username={{username}}&password={{password}}"
-                           target="_blank">/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=password&scope={{scope}}&username={{username}}&password={{password}}</a>
-                    </p>
+                    <br/>
+
+                    <form action="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=password&scope={{scope}}&username={{username}}&password={{password}}"
+                          method="post" target="_blank">
+                            <%--<a href="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=password&scope={{scope}}&username={{username}}&password={{password}}"--%>
+                            <%--target="_blank">/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=password&scope={{scope}}&username={{username}}&password={{password}}</a>--%>
+                        <button class="btn btn-link" type="submit">
+                            /oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=password&scope={{scope}}&username={{username}}&password={{password}}
+                        </button>
+                        <span class="label label-warning">POST</span>
+                    </form>
                 </div>
             </div>
         </c:if>
@@ -87,6 +101,7 @@
                     <p>
                         <a href="${contextPath}/oauth/authorize?client_id={{clientId}}&client_secret={{clientSecret}}&response_type=token&scope={{scope}}&redirect_uri={{implicitRedirectUri}}"
                                 >/oauth/authorize?client_id={{clientId}}&client_secret={{clientSecret}}&response_type=token&scope={{scope}}&redirect_uri={{implicitRedirectUri}}</a>
+                        <span class="label label-info">GET</span>
                     </p>
                 </div>
             </div>
@@ -98,10 +113,16 @@
                 <div class="panel-body">
                     <p class="text-muted">点击链接地址即可测试</p>
 
-                    <p>
-                        <a href="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=client_credentials&scope={{scope}}"
-                           target="_blank">/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=client_credentials&scope={{scope}}</a>
-                    </p>
+
+                    <form action="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=client_credentials&scope={{scope}}"
+                          method="post" target="_blank">
+                            <%--<a href="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=client_credentials&scope={{scope}}"--%>
+                            <%--target="_blank">/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=client_credentials&scope={{scope}}</a>--%>
+                        <button class="btn btn-link" type="submit">
+                            /oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=client_credentials&scope={{scope}}
+                        </button>
+                        <span class="label label-warning">POST</span>
+                    </form>
                 </div>
             </div>
         </c:if>
@@ -113,10 +134,17 @@
                     <p class="text-muted">输入refresh_token 后点击链接地址.</p>
                     refresh_token: <input type="text" ng-model="refreshToken" required="required" size="70"/>
 
-                    <p>
-                        <a href="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=refresh_token&refresh_token={{refreshToken}}"
-                           target="_blank">/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=refresh_token&refresh_token={{refreshToken}}</a>
-                    </p>
+                    <br/>
+
+                    <form action="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=refresh_token&refresh_token={{refreshToken}}"
+                          method="post" target="_blank">
+                            <%--<a href="${contextPath}/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=refresh_token&refresh_token={{refreshToken}}"--%>
+                            <%--target="_blank">/oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=refresh_token&refresh_token={{refreshToken}}</a>--%>
+                        <button class="btn btn-link" type="submit">
+                            /oauth/token?client_id={{clientId}}&client_secret={{clientSecret}}&grant_type=refresh_token&refresh_token={{refreshToken}}
+                        </button>
+                        <span class="label label-warning">POST</span>
+                    </form>
                 </div>
             </div>
         </c:if>
@@ -131,7 +159,7 @@
     var TestClientCtrl = ["$scope", function ($scope) {
         $scope.clientId = "${clientDetailsDto.clientId}";
         $scope.clientSecret = "${clientDetailsDto.clientSecret}";
-        $scope.scope = "${clientDetailsDto.scope}";
+        $scope.scope = "${clientDetailsDto.scopeWithBlank}";
 
         <c:if test="${empty clientDetailsDto.webServerRedirectUri}" var="eptRedUri">
         $scope.implicitRedirectUri = location.href;