Merge pull request #34 from timhall/timeout-long

Convert timeout to Long

Author: timhall

authenticators/FacebookAuthenticator.cls

@@ -227,7 +227,7 @@ Private Function TokenRequest() As RestRequest
     TokenRequest.AddQuerystringParam "redirect_uri", RedirectUri
 End Function
 
-Private Function OAuthIsComplete(IE As InternetExplorer) As Boolean
+Private Function OAuthIsComplete(IE As Object) As Boolean
     If Not IE.Busy And IE.readyState = 4 Then
         If OAuthIsSuccessful(IE) Or OAuthIsDenied(IE) Then
             OAuthIsComplete = True

authenticators/GoogleAuthenticator.cls

@@ -24,20 +24,20 @@ Attribute VB_Exposed = True
 ' https://developers.google.com/oauthplayground/
 '
 ' @example
-' 
+'
 ' Dim Auth As New GoogleAuthenticator
 ' Auth.Setup "Your Client Id", "Your Client Secret"
-' 
+'
 ' ' Enable analytics scope and add YouTube scope
 ' Auth.EnableScope("analytics")
 ' Auth.AddScope("https://www.googleapis.com/auth/yt-analytics.readonly")
-' 
+'
 ' ' Open up Google login
 ' Auth.Login
 '
 ' ' or - Use your API key to access your own information
 ' Auth.ApiKey = "Your Api Key"
-' 
+'
 ' ' Add authenticator to client
 ' Set Client.Authenticator = Auth
 '

specs/RestClientBaseSpecs.bas

@@ -15,7 +15,7 @@ Attribute VB_Exposed = True
 '
 ' @author: tim.hall.engr@gmail.com
 ' @license: MIT (http://www.opensource.org/licenses/mit-license.php)
-' 
+'
 ' ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ '
 Option Explicit
 

src/IAuthenticator.cls

@@ -19,7 +19,7 @@ Attribute VB_Exposed = True
 ' ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ '
 Option Explicit
 
-Private Const DefaultTimeoutMS As Integer = 5000
+Private Const DefaultTimeoutMS As Long = 5000
 
 
 ' --------------------------------------------- '
@@ -28,7 +28,7 @@ Private Const DefaultTimeoutMS As Integer = 5000
 
 Public BaseUrl As String
 Public Authenticator As IAuthenticator
-Public TimeoutMS As Integer
+Public TimeoutMS As Long
 Public ProxyServer As String
 Public ProxyUsername As String
 Public ProxyPassword As String
@@ -80,7 +80,7 @@ Public Function ExecuteAsync(Request As RestRequest, Callback As String, Optiona
 
     ' Setup the request
     Set Http = HttpSetup(Request, True)
-    RestHelpers.ExecuteRequestAsync Http, Request, TimeoutMS, Callback, CallbackArgs
+    RestHelpers.ExecuteRequestAsync Http, Request, Me.TimeoutMS, Callback, CallbackArgs
     ExecuteAsync = True
     Exit Function
 

src/RestClient.cls

@@ -406,7 +406,7 @@ End Function
 ' @return {Object} Setup http object
 ' --------------------------------------------- '
 
-Public Function PrepareHttpRequest(Request As RestRequest, TimeoutMS As Integer, _
+Public Function PrepareHttpRequest(Request As RestRequest, TimeoutMS As Long, _
     Optional UseAsync As Boolean = False) As Object
     Dim Http As Object
     Set Http = CreateObject("MSXML2.ServerXMLHTTP.6.0")
@@ -517,7 +517,7 @@ End Function
 ' @param {Variant} [CallbackArgs] Variable array of arguments that get passed directly to callback function
 ' --------------------------------------------- '
 
-Public Sub ExecuteRequestAsync(ByRef Http As Object, ByRef Request As RestRequest, TimeoutMS As Integer, Callback As String, Optional ByVal CallbackArgs As Variant)
+Public Sub ExecuteRequestAsync(ByRef Http As Object, ByRef Request As RestRequest, TimeoutMS As Long, Callback As String, Optional ByVal CallbackArgs As Variant)
     On Error GoTo ErrorHandling
 
     Request.Callback = Callback
@@ -729,7 +729,7 @@ End Function
 ' @param {RestRequest} Request
 ' @param {Long} TimeoutMS
 ' --------------------------------------------- '
-Public Sub StartTimeoutTimer(Request As RestRequest, TimeoutMS As Integer)
+Public Sub StartTimeoutTimer(Request As RestRequest, TimeoutMS As Long)
     SetTimer Application.HWnd, ObjPtr(Request), TimeoutMS, AddressOf RestHelpers.TimeoutTimerExpired
 End Sub
 

src/RestClientBase.bas

@@ -392,7 +392,7 @@ End Sub
 '
 ' --------------------------------------------- '
 
-Public Sub StartTimeoutTimer(TimeoutMS As Integer)
+Public Sub StartTimeoutTimer(TimeoutMS As Long)
     RestHelpers.StartTimeoutTimer Me, TimeoutMS
 End Sub