From a8d39b905f85b416c0d8d97381259f7d5d845816 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Fri, 16 Dec 2011 13:28:59 -0500 Subject: [PATCH] updated some repositories with basic get/save functions --- mitre-local | 2 +- spring-security-oauth | 2 +- .../connect/repository/ApprovedSiteRepository.java | 10 +++++++++- .../openid/connect/repository/IdTokenRepository.java | 6 ++++++ .../openid/connect/repository/UserInfoRepository.java | 2 ++ .../openid/connect/web/AuthorizationEndpoint.java | 4 ++++ 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/mitre-local b/mitre-local index b3dbc687b..f1f301046 160000 --- a/mitre-local +++ b/mitre-local @@ -1 +1 @@ -Subproject commit b3dbc687b2922a78cb3879ca16c0ce1bc9a4f657 +Subproject commit f1f301046b6c6f397bc4d40a25dd407ca6f2b757 diff --git a/spring-security-oauth b/spring-security-oauth index 674ebf1fa..5784e6bf5 160000 --- a/spring-security-oauth +++ b/spring-security-oauth @@ -1 +1 @@ -Subproject commit 674ebf1fa71f4886216c01d731c6acdcd4e37d72 +Subproject commit 5784e6bf534e65627d4efb94be90ab7ba4df9069 diff --git a/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java b/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java index db7b06574..3e06f3a12 100644 --- a/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java +++ b/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java @@ -1,11 +1,19 @@ package org.mitre.openid.connect.repository; +import java.util.Collection; +import java.util.Collections; + import org.mitre.openid.connect.model.ApprovedSite; +import org.mitre.openid.connect.model.UserInfo; public interface ApprovedSiteRepository { public ApprovedSite getById(Long id); - public ApprovedSite getByUrl(String url); + public Collection getAllForUser(UserInfo user); + + public Collection getAllExpired(); + + public ApprovedSite save(ApprovedSite site); } diff --git a/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java b/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java index 5e9183093..98676bb66 100644 --- a/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java +++ b/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java @@ -1,5 +1,11 @@ package org.mitre.openid.connect.repository; +import org.mitre.openid.connect.model.IdToken; + public interface IdTokenRepository { + public IdToken getById(Long id); + + public IdToken save(IdToken idToken); + } diff --git a/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java b/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java index 9da679568..0f239660c 100644 --- a/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java +++ b/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java @@ -6,4 +6,6 @@ public interface UserInfoRepository { public UserInfo getByUserId(String user_id); + public UserInfo save(UserInfo user); + } diff --git a/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java b/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java index 10ccb36b0..77767d69a 100644 --- a/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java +++ b/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java @@ -17,5 +17,9 @@ public class AuthorizationEndpoint { * handle "idtoken token" flow * */ + + /* + * Other flows get handled outside of our endpoints by SSOA + */ }