You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/10/28 19:39:47 UTC

[5/5] usergrid git commit: Fix typo and unused reference

Fix typo and unused reference


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/406a742d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/406a742d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/406a742d

Branch: refs/heads/hotfix-20160819
Commit: 406a742d2d9133fa5999ec983547c431cf05a56b
Parents: efa65ac
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Oct 28 14:31:27 2016 -0400
Committer: Michael Russo <mr...@apigee.com>
Committed: Fri Oct 28 12:21:25 2016 -0700

----------------------------------------------------------------------
 .../apache/usergrid/rest/management/ExternalSSOEnabledIT.java  | 2 +-
 .../org/apache/usergrid/security/sso/ApigeeSSO2Provider.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/406a742d/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExternalSSOEnabledIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExternalSSOEnabledIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExternalSSOEnabledIT.java
index cae65df..7a2df1e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExternalSSOEnabledIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExternalSSOEnabledIT.java
@@ -50,7 +50,7 @@ public class ExternalSSOEnabledIT extends AbstractRestIT {
     PrivateKey privateKey;
     String compactJws;
     String username = "SSOadminuser" + UUIDUtils.newTimeUUID();
-    ApigeeSSO2Provider apigeeSSO2ProviderTest;
+
     //SSO2 implementation
     public static final String USERGRID_EXTERNAL_SSO_ENABLED = "usergrid.external.sso.enabled";
     public static final String USERGRID_EXTERNAL_PROVIDER =    "usergrid.external.sso.provider";

http://git-wip-us.apache.org/repos/asf/usergrid/blob/406a742d/stack/services/src/main/java/org/apache/usergrid/security/sso/ApigeeSSO2Provider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/sso/ApigeeSSO2Provider.java b/stack/services/src/main/java/org/apache/usergrid/security/sso/ApigeeSSO2Provider.java
index 8e3c463..b1a05e6 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/sso/ApigeeSSO2Provider.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/sso/ApigeeSSO2Provider.java
@@ -61,7 +61,7 @@ public class ApigeeSSO2Provider implements ExternalSSOProvider {
 
     public static final String USERGRID_EXTERNAL_PUBLICKEY_URL = "usergrid.external.sso.url";
 
-    public static final String USERGRID_EXTERMAL_PUBLICKEY_FRESHNESS = "usergrid.external.sso.public-key-freshness";
+    public static final String USERGRID_EXTERNAL_PUBLICKEY_FRESHNESS = "usergrid.external.sso.public-key-freshness";
 
 
     public ApigeeSSO2Provider() {
@@ -241,11 +241,11 @@ public class ApigeeSSO2Provider implements ExternalSSOProvider {
 
         lastPublicKeyFetch = System.currentTimeMillis();
 
-        String freshnessString = (String)properties.get( USERGRID_EXTERMAL_PUBLICKEY_FRESHNESS );
+        String freshnessString = (String)properties.get( USERGRID_EXTERNAL_PUBLICKEY_FRESHNESS );
         try {
             freshnessTime = Long.parseLong( freshnessString );
         } catch ( Exception e ) {
-            logger.error("Ignoring invalid setting for " + USERGRID_EXTERMAL_PUBLICKEY_FRESHNESS );
+            logger.error("Ignoring invalid setting for " + USERGRID_EXTERNAL_PUBLICKEY_FRESHNESS );
         }
     }
 }