Fix bug around endpointId not being identified correctly when a querystring is present on the URL

Author: wabson

share-oauth/src/main/java/org/sharextras/webscripts/connector/HttpOAuth2Connector.java

@@ -303,6 +303,7 @@ private OAuth2CredentialVault getCredentialVault(String endpointId, HttpServletR
             String userId = getUserId(session);
             ConnectorService connectorService = getConnectorService();
 
+            // TODO Check that userId is not null, which it will be if the user's session has expired
             OAuth2CredentialVault vault = (OAuth2CredentialVault)connectorService.getCredentialVault(session, userId, VAULT_PROVIDER_ID);
             if (load)
             {
@@ -582,8 +583,10 @@ public String getEndpointId()
 
     private String getEndpointId(String uri, HttpServletRequest request)
     {
+        // Work out URI path (i.e. uri without the querystring portion)
+        String uriPath = uri.indexOf('?') > -1 ? uri.substring(0, uri.indexOf('?')) : uri;
         return getEndpointId() != null ? getEndpointId() : 
-            request.getPathInfo().replaceAll(uri, "").replaceAll("/proxy/", "");
+            request.getPathInfo().replaceAll(uriPath, "").replaceAll("/proxy/", "");
 
     }