diff options
Diffstat (limited to 'plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2')
4 files changed, 8 insertions, 6 deletions
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; |