Handle spaces in OAuth1 parameters

Author: timhall

authenticators/OAuth1Authenticator.cls

@@ -239,7 +239,11 @@ Public Function RequestParameters(Client As RestClient, Request As RestRequest)
     Dim Parts As Dictionary
     Set Parts = RestHelpers.UrlParts(Request.FullUrl(Client.BaseUrl))
 
-    RequestParameters = RestHelpers.UrlDecode(Replace(Parts("Querystring"), "?", ""))
+    ' Remove leading ?
+    RequestParameters = Replace(Parts("Querystring"), "?", "")
+    
+    ' Replace + for spaces with %20
+    RequestParameters = Replace(RequestParameters, "+", "%20")
 End Function
 
 Public Function CreateSigningKey() As String

specs/Excel-REST - Specs.xlsm

@@ -61,7 +61,17 @@ Public Function Specs() As SpecSuite
         Request.AddParameter "c", "Howdy!"
         Request.AddQuerystringParam "d", 789
 
-        .Expect(Auth.RequestParameters(Client, Request)).ToEqual "a=123&b=456&c=Howdy!&d=789"
+        .Expect(Auth.RequestParameters(Client, Request)).ToEqual "a=123&b=456&c=Howdy%21&d=789"
+    End With
+    
+    With Specs.It("should handle spaces in parameters correctly")
+        Client.BaseUrl = "http://localhost:3000/"
+        Set Request = New RestRequest
+        Request.Resource = "testing"
+        Request.AddQuerystringParam "a", "a b"
+        
+        .Expect(Auth.RequestParameters(Client, Request)).ToEqual "a=a%20b"
+        .Expect(Request.FullUrl(Client.BaseUrl)).ToEqual "http://localhost:3000/testing?a=a+b"
     End With
 
     Set Client = New RestClient
@@ -95,3 +105,67 @@ Public Function Specs() As SpecSuite
 
     InlineRunner.RunSuite Specs
 End Function
+
+' LinkedIn Specific
+' ----------------- '
+Sub LinkedInSpecs()
+    Dim Specs As New SpecSuite
+    
+    Dim Client As New RestClient
+    Client.BaseUrl = "http://api.linkedin.com/v1/"
+    
+    Dim Auth As New OAuth1Authenticator
+    Dim ConsumerKey As String
+    Dim ConsumerSecret As String
+    Dim Token As String
+    Dim TokenSecret As String
+    
+    If Credentials.Loaded Then
+        ConsumerKey = Credentials.Values("LinkedIn")("api_key")
+        ConsumerSecret = Credentials.Values("LinkedIn")("api_secret")
+        Token = Credentials.Values("LinkedIn")("user_token")
+        TokenSecret = Credentials.Values("LinkedIn")("user_secret")
+    Else
+        ConsumerKey = InputBox("Enter Consumer Key")
+        ConsumerSecret = InputBox("Enter Consumer Secret")
+        Token = InputBox("Enter Token")
+        TokenSecret = InputBox("Enter Token Secret")
+    End If
+    Auth.Setup _
+        ConsumerKey:=ConsumerKey, _
+        ConsumerSecret:=ConsumerSecret, _
+        Token:=Token, _
+        TokenSecret:=TokenSecret
+        
+    Set Client.Authenticator = Auth
+    
+    Dim Request As RestRequest
+    Dim Response As RestResponse
+    
+    With Specs.It("should get profile")
+        Set Request = New RestRequest
+        Request.Resource = "people/~?format={format}"
+        
+        Set Response = Client.Execute(Request)
+        
+        .Expect(Response.StatusCode).ToEqual 200
+        .Expect(Response.Data("firstName")).ToBeDefined
+    End With
+    
+    With Specs.It("should search with space")
+        Set Request = New RestRequest
+        Request.Resource = "company-search?format={format}"
+        Request.AddQuerystringParam "keywords", "microsoft corp"
+        
+        Set Response = Client.Execute(Request)
+        
+        .Expect(Response.StatusCode).ToEqual 200
+        .Expect(Response.Data("companies")).ToBeDefined
+        
+        If (Response.StatusCode <> 200) Then
+            Debug.Print "Error :" & Response.StatusCode & " - " & Response.Content
+        End If
+    End With
+    
+    InlineRunner.RunSuite Specs
+End Sub