diff --git a/src/main/resources/templates/consent.html b/src/main/resources/templates/consent.html new file mode 100644 index 0000000..107ce67 --- /dev/null +++ b/src/main/resources/templates/consent.html @@ -0,0 +1,107 @@ + + + + + + 授权确认 - Spring Security&OAuth2.1 + + + + +
+
+

授权确认

+
+
+
+

+ The application + + wants to access your account + +

+
+
+
+
+

+ You have provided the code + . + Verify that this code matches what is shown on your device. +

+
+
+
+
+

+ The following permissions are requested by the above app.
+ Please review these and consent if you approve. +

+
+
+
+
+
+ + + + +
+ + +

+
+ +

+ You have already granted the following permissions to the above app: +

+
+ + +

+
+ +
+ +
+
+ +
+
+
+
+
+
+

+ + Your consent to provide access is required.
+ If you do not approve, click Cancel, in which case no information will be shared with the app. + +

+
+
+
+
+ + diff --git a/src/main/resources/templates/device_verification.html b/src/main/resources/templates/device_verification.html new file mode 100644 index 0000000..bf37c38 --- /dev/null +++ b/src/main/resources/templates/device_verification.html @@ -0,0 +1,36 @@ + + + + + + Device Login - Spring Security&OAuth2.1 + + + +
+
+

Device Login

+
+
+
+
+
+ + +

Please type device user code

+
+ +
+ +
+
+ Cancel +
+
+
+
+
+
+ + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..f390010 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,113 @@ + + + + + + + + + Home - Spring Security&OAuth2.1 + + + + +

Spring Security&OAuth2.1 + 3.0.0 +

+ +
+ Logged: +
+ Authorities： + +
+ +
+
+
+
+ 操作说明: +
    +
  1. +

    + 菜单 User 是不需要OAuth 验证即可访问的(即公开的resource); 用于管理用户信息(添加,删除等). +

    +
    2. +
  2. +

    + 菜单 Unity 与 Mobile 需要OAuth 验证后才能访问(即受保护的resource);
    + Unity 需要 [ROLE_UNITY] 权限, Mobile 需要 [ROLE_MOBILE] 权限. +

    +
    3. +
  3. +

    + 在使用之前, 建议先了解OAuth2.1支持的grant_type, 请访问 https://andaily.com/blog/?p=103 +

    +
    4. +
  4. +

    + 在项目的 others目录里有 oauth_test.txt文件, 里面有测试的URL地址(包括浏览器与客户端的),
    + 若想访问 Unity 与 Mobile, 则先用基于浏览器的测试URL 访问,等验证通过后即可访问(注意不同的账号对应的权限). +

    +
    5. +
  5. +

    + 若需要自定义client_details数据并进行测试, + 可进入client_details去手动添加client_details或删除已创建的client_details. +

    +
    6. +
+
+
+菜单 +
    +
  • +

    + API - 查看提供的API文档 +

    +
    • +
  • +

    + client_details - 管理ClientDetails +

    +
    • +
  • +

    + User - 管理User +

    +
    • +
  • +

    + Unity - Unity 资源(resource), 需要具有 [ROLE_UNITY] 权限才能访问 +

    +
    • +
  • +

    + Mobile - Mobile资源(resource), 需要具有 [ROLE_MOBILE] 权限才能访问 +

    +
    • +
+
+ +
+

+ 说明: Unity与Mobile菜单需要先获取到access_token后才能正常访问; 可以尝试在URL后面任意添加access_token参数值试试效果, +
+ 如: /m/dashboard?access_token=i_am_testing_access_token +

+ +

+ 请求受保护的资源时传递 + Access Token + 有两种方式, 方式一在URL参数中添加access_token, 方式二在请求的Header中添加 Authorization, 其值为 Bearer + your_access_token【推荐方式二】 +

+
+ +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/decorators/main.jsp b/src/main/webapp/WEB-INF/jsp/decorators/main.jsp.old similarity index 96% rename from src/main/webapp/WEB-INF/jsp/decorators/main.jsp rename to src/main/webapp/WEB-INF/jsp/decorators/main.jsp.old index d602957..c5a27be 100644 --- a/src/main/webapp/WEB-INF/jsp/decorators/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/decorators/main.jsp.old @@ -1,42 +1,42 @@ -<%-- - * - * @author Shengzhao Li ---%> - -<%@ page contentType="text/html;charset=UTF-8" language="java" trimDirectiveWhitespaces="true" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %> - - - - - - - - - - - - <sitemesh:write property='title'/> - Spring Security&OAuth2 - - - <%----%> - - - - -
-
- <%----%> - -
-
-
-

- © 2013 - 2022 spring-oauth-server. - v${mainVersion} -

-
-
- +<%-- + * + * @author Shengzhao Li +--%> + +<%@ page contentType="text/html;charset=UTF-8" language="java" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %> + + + + + + + + + + + + <sitemesh:write property='title'/> - Spring Security&OAuth2 + + + <%----%> + + + + +
+
+ <%----%> + +
+
+
+

+ © 2013 - 2022 spring-oauth-server. + v${mainVersion} +

+
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp.old similarity index 100% rename from src/main/webapp/WEB-INF/jsp/index.jsp rename to src/main/webapp/WEB-INF/jsp/index.jsp.old diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp.old similarity index 100% rename from src/main/webapp/WEB-INF/jsp/login.jsp rename to src/main/webapp/WEB-INF/jsp/login.jsp.old