diff options
author | Angel Avila | 2016-03-02 09:58:11 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2016-03-02 09:58:11 +0000 |
commit | 640a48c2684153ac0cd054a785cbe136ade0dbab (patch) | |
tree | 876d7aea8dc9ec9e4bfbe4f28d39cf01415de563 /plugins/org.eclipse.osee.jaxrs.server | |
parent | b4a6440a00ba4adfe1bb26e7c35b1b59a2f31810 (diff) | |
download | org.eclipse.osee-640a48c2684153ac0cd054a785cbe136ade0dbab.tar.gz org.eclipse.osee-640a48c2684153ac0cd054a785cbe136ade0dbab.tar.xz org.eclipse.osee-640a48c2684153ac0cd054a785cbe136ade0dbab.zip |
refactor[ats_ATS253925]: Change ids in Account from int to Long
Change-Id: Ie47850668181faa89d9493ce29c688e1a48c04d6
Diffstat (limited to 'plugins/org.eclipse.osee.jaxrs.server')
7 files changed, 14 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF index 5401227518e..66c15974036 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF @@ -63,6 +63,7 @@ Import-Package: com.google.common.cache;version="15.0.0", org.apache.cxf.transport.http;version="3.0.0", org.apache.cxf.transport.servlet;version="3.0.0", org.codehaus.jackson.jaxrs;version="1.9.13", + org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.jaxrs, diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java index 69669c13198..ac351880532 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider; -import com.google.common.io.InputSupplier; import java.io.InputStream; import javax.ws.rs.core.UriInfo; import org.apache.cxf.rs.security.oauth2.common.Client; import org.eclipse.osee.framework.jdk.core.type.OseePrincipal; import org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.endpoints.ClientFormData; +import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java index 4fdb25fa0dc..b23ec07f603 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.adapters; -import com.google.common.io.InputSupplier; import java.io.InputStream; import org.apache.cxf.rs.security.oauth2.common.Client; import org.eclipse.osee.framework.jdk.core.type.Identity; import org.eclipse.osee.jaxrs.server.security.OAuthClient; +import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java index eaa9b84e669..1c084e1c8a7 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java @@ -10,10 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.adapters; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.io.InputSupplier; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -36,6 +32,10 @@ import org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.SubjectPr import org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.endpoints.ClientFormData; import org.eclipse.osee.jaxrs.server.security.JaxRsOAuthStorage; import org.eclipse.osee.jaxrs.server.security.OAuthClient; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java index 7b5a09ef0bc..16e81e86654 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ImplicitGrantEndpoint.java @@ -144,6 +144,8 @@ public class ImplicitGrantEndpoint extends ImplicitGrantService { .buildFromEncoded(); secData.setApplicationLogoUri(newClientLogoUri.toString()); + } else { + secData.setApplicationLogoUri(clientLogoUri.toString()); } return secData; diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthStorage.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthStorage.java index 0fceae66c35..b32ae577782 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthStorage.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/JaxRsOAuthStorage.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.security; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseePrincipal; /** @@ -21,9 +22,11 @@ public interface JaxRsOAuthStorage { OAuthClient getClientByClientGuid(String guid); + OAuthClient getClientByClientUuid(Long uuid); + OAuthClient getClientByClientKey(String clientKey); - void storeClient(OseePrincipal principal, OAuthClient client); + ArtifactId storeClient(OseePrincipal principal, OAuthClient client); void removeClient(OseePrincipal principal, OAuthClient client); diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java index 4517c801b54..1d7c67cd341 100644 --- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java +++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.jaxrs.server.security; -import com.google.common.io.InputSupplier; import java.io.InputStream; import java.util.List; import java.util.Map; import org.eclipse.osee.framework.jdk.core.type.Identity; +import com.google.common.io.InputSupplier; /** * @author Roberto E. Escobar |