OLTU-203 - Extend client demo with more provider
git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1759584 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/Utils.java b/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/Utils.java
index f607a14..f467d50 100644
--- a/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/Utils.java
+++ b/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/Utils.java
@@ -80,6 +80,12 @@
public static final String GITHUB_TOKEN = OAuthProviderType.GITHUB.getTokenEndpoint();
public static final String GITHUB_SCOPE = "";
public static final String GITHUB_RESOURCE_URL = "https://api.github.com/user";
+
+ public static final String MICROSOFT = OAuthProviderType.MICROSOFT.getProviderName();
+ public static final String MICROSOFT_AUTHZ = OAuthProviderType.MICROSOFT.getAuthzEndpoint();
+ public static final String MICROSOFT_TOKEN = OAuthProviderType.MICROSOFT.getTokenEndpoint();
+ public static final String MICROSOFT_SCOPE = "";
+ public static final String MICROSOFT_RESOURCE_URL = "https://api.github.com/user";
public static final String SMART_GALLERY = "smart_gallery";
public static final String SMART_GALLERY_AUTHZ = "http://localhost:8090/oauth/authorize";
diff --git a/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/MainController.java b/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/MainController.java
index 166f56e..0fa1aa1 100644
--- a/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/MainController.java
+++ b/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/MainController.java
@@ -83,6 +83,9 @@
} else if (Utils.LINKEDIN.equalsIgnoreCase(app)) {
selected = true;
addLinkedInParams(oauthParams);
+ } else if (Utils.MICROSOFT.equalsIgnoreCase(app)) {
+ selected = true;
+ addMicrosfotParams(oauthParams);
}
if (selected) {
@@ -125,6 +128,12 @@
oauthParams.setTokenEndpoint(Utils.GITHUB_TOKEN);
oauthParams.setScope(Utils.GITHUB_SCOPE);
}
+
+ private void addMicrosfotParams(OAuthParams oauthParams) {
+ oauthParams.setAuthzEndpoint(Utils.MICROSOFT_AUTHZ);
+ oauthParams.setTokenEndpoint(Utils.MICROSOFT_TOKEN);
+ oauthParams.setScope(Utils.MICROSOFT_SCOPE);
+ }
@RequestMapping("/decode")
public ModelAndView decode(@ModelAttribute("oauthParams") OAuthParams oauthParams) {
diff --git a/demos/client-demo/src/main/webapp/WEB-INF/views/index.jsp b/demos/client-demo/src/main/webapp/WEB-INF/views/index.jsp
index a645127..1af0f5d 100644
--- a/demos/client-demo/src/main/webapp/WEB-INF/views/index.jsp
+++ b/demos/client-demo/src/main/webapp/WEB-INF/views/index.jsp
@@ -43,11 +43,12 @@
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
<li><a href="<c:url value="/main/generic"/>">Generic OAuth2 Application</a></li>
- <li><a href="<c:url value="/main/smart_gallery"/>">Smart Gallery</a></li>
<li><a href="<c:url value="/main/facebook"/>">Facebook</a></li>
<li><a href="<c:url value="/main/google"/>">Google</a></li>
<li><a href="<c:url value="/main/github"/>">Github</a></li>
<li><a href="<c:url value="/main/linkedin"/>">LinkedIn</a></li>
+ <li><a href="<c:url value="/main/microsoft"/>">Microsoft</a></li>
+ <li><a href="<c:url value="/main/smart_gallery"/>">Smart Gallery</a></li>
</ul>
</div>
</nav>
