From 11b35267b44bb1912aaf28320d31cc0ef353d34c Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Tue, 28 Aug 2012 17:42:20 -0400 Subject: [PATCH] Refactored stats processor into a service, made home page into a smart page. --- .../openid/connect/service/StatsService.java | 24 +++++++++ .../service/impl/DefaultStatsService.java | 49 +++++++++++++++++++ .../openid/connect/web/ManagerController.java | 14 +++++- .../mitre/openid/connect/web/StatsAPI.java | 29 ++--------- .../src/main/webapp/WEB-INF/views/home.jsp | 31 +++++------- 5 files changed, 100 insertions(+), 47 deletions(-) create mode 100644 openid-connect-common/src/main/java/org/mitre/openid/connect/service/StatsService.java create mode 100644 openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/StatsService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/StatsService.java new file mode 100644 index 000000000..bd6063258 --- /dev/null +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/StatsService.java @@ -0,0 +1,24 @@ +/** + * + */ +package org.mitre.openid.connect.service; + +import java.util.Map; + +/** + * @author jricher + * + */ +public interface StatsService { + + /** + * Calculate summary statistics + * approvalCount: total approved sites + * userCount: unique users + * clientCount: unique clients + * + * @return + */ + public Map calculateSummaryStats(); + +} diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java new file mode 100644 index 000000000..71189d0b1 --- /dev/null +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java @@ -0,0 +1,49 @@ +/** + * + */ +package org.mitre.openid.connect.service.impl; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.mitre.openid.connect.model.ApprovedSite; +import org.mitre.openid.connect.service.ApprovedSiteService; +import org.mitre.openid.connect.service.StatsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author jricher + * + */ +@Service +public class DefaultStatsService implements StatsService { + + @Autowired + private ApprovedSiteService approvedSiteService; + + @Override + public Map calculateSummaryStats() { + // get all approved sites + Collection allSites = approvedSiteService.getAll(); + + // process to find number of unique users and sites + Set userIds = new HashSet(); + Set clientIds = new HashSet(); + for (ApprovedSite approvedSite : allSites) { + userIds.add(approvedSite.getUserId()); + clientIds.add(approvedSite.getClientId()); + } + + Map e = new HashMap(); + + e.put("approvalCount", allSites.size()); + e.put("userCount", userIds.size()); + e.put("clientCount", clientIds.size()); + return e; + } + +} diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java index d8a915469..df1efcc3b 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java @@ -15,8 +15,13 @@ ******************************************************************************/ package org.mitre.openid.connect.web; +import java.util.Map; + +import org.mitre.openid.connect.service.StatsService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; /** @@ -28,9 +33,16 @@ import org.springframework.web.bind.annotation.RequestMapping; @PreAuthorize("hasRole('ROLE_USER')") // TODO: this probably shouldn't be here public class ManagerController { + @Autowired + private StatsService statsService; @RequestMapping({"", "home", "index"}) - public String showHomePage() { + public String showHomePage(ModelMap m) { + + Map summary = statsService.calculateSummaryStats(); + + m.put("statsSummary", summary); + return "home"; } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java index baab1cbe4..70bae8980 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java @@ -1,13 +1,9 @@ package org.mitre.openid.connect.web; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; -import org.mitre.openid.connect.model.ApprovedSite; import org.mitre.openid.connect.service.ApprovedSiteService; +import org.mitre.openid.connect.service.StatsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; @@ -21,31 +17,12 @@ import org.springframework.web.bind.annotation.RequestMapping; public class StatsAPI { @Autowired - private ApprovedSiteService approvedSiteService; + private StatsService statsService; - public StatsAPI() { - - } - @RequestMapping("summary") public String statsSummary(ModelMap m) { - // get all approved sites - Collection allSites = approvedSiteService.getAll(); - - // process to find number of unique users and sites - Set userIds = new HashSet(); - Set clientIds = new HashSet(); - for (ApprovedSite approvedSite : allSites) { - userIds.add(approvedSite.getUserId()); - clientIds.add(approvedSite.getClientId()); - } - - Map e = new HashMap(); - - e.put("approvalCount", allSites.size()); - e.put("userCount", userIds.size()); - e.put("clientCount", clientIds.size()); + Map e = statsService.calculateSummaryStats(); m.put("entity", e); diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp b/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp index 08362794b..eff0142a5 100644 --- a/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp +++ b/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp @@ -14,10 +14,10 @@

Welcome!

-

Can't remember your passwords? Tired of filling out registration forms? - OpenID is a safe, faster, and easier way to log - in to - web sites.

+

OpenID Connect is a next-generation protocol built on top of the OAuth2 authorization framework. + OpenID Connect lets you log into a remote site using your identity without exposing your + credentials, like a username and password. +

Learn more »

@@ -26,24 +26,16 @@

About

-

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, - tortor - mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada - magna - mollis euismod. Donec sed odio dui.

+

This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.

-

More »

+

More »

Contact

-

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, - tortor - mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada - magna - mollis euismod. Donec sed odio dui.

+

For more information or support, contact the administrators of this system.

-

Email »

+

Email »

@@ -53,10 +45,9 @@

Current Statistics

-

You'll be keen to know that there have been 4720 users of this - system who have logged in to - 203 - total sites, for a total of 6224 site approvals.

+

There have been ${statsSummary["userCount"]} users of this + system who have logged in to ${statsSummary["clientCount"]} + total sites, for a total of ${statsSummary["approvalCount"]} site approvals.