Changeset 33664

Timestamp:

05/29/09 18:12:10 (4 years ago)

Author:

kiri_feather

Message:

 

Location:

lang/vb2005/FuwaKumo/trunk/FuwaKumo

Files:

• FuwaKumo.vbproj (modified) (1 diff)
• StatusElement.vb (added)
• WebAccessBase.vb (modified) (1 diff)
• WebOAuth.vb (modified) (3 diffs)
• WebTwitter.vb (added)

lang/vb2005/FuwaKumo/trunk/FuwaKumo/FuwaKumo.vbproj

@@ -74 +74 @@
     <Compile Include="SettingNet.vb" />
     <Compile Include="SettingTwitter.vb" />
+    <Compile Include="StatusElement.vb" />
     <Compile Include="WebAccessBase.vb" />
     <Compile Include="WebOAuth.vb" />
+    <Compile Include="WebTwitter.vb" />
   </ItemGroup>
   <ItemGroup>

lang/vb2005/FuwaKumo/trunk/FuwaKumo/WebAccessBase.vb

@@ -128 +128 @@
                             Return CType(sr.ReadToEnd(), Object)
                         End Using
+                    Case Else
+                        Throw New System.ArgumentException("Type must String or Bitmap")
                 End Select
             End Using

lang/vb2005/FuwaKumo/trunk/FuwaKumo/WebOAuth.vb

@@ -13 +13 @@
     End Sub
 
-    Private Shared Function OpenAuthorizePage() As Boolean
+    Public Shared Function GetAuthorizePageUrl() As String
         _requestToken = ""
 
         Dim query As System.Collections.Specialized.NameValueCollection = GetOAuthToken(_oauthSetting.RequestTokenUrl)
-        If query Is Nothing Then Return False
+        If query Is Nothing OrElse query.Count = 0 Then Return Nothing
 
         _requestToken = query.Item("oauth_token")
 
-        Try
-            System.Diagnostics.Process.Start(String.Format("{0}?oauth_token={1}", _oauthSetting.AuthorizeUrl, _requestToken))
-        Catch ex As Exception
-        End Try
-
-        Return True
+        Return String.Format("{0}?oauth_token={1}", _oauthSetting.AuthorizeUrl, _requestToken)
     End Function
 
-    Private Shared Function GetAccessToken() As Boolean
+    Public Shared Function GetAccessToken() As Boolean
         If String.IsNullOrEmpty(_requestToken) Then Return False
 
         Dim query As System.Collections.Specialized.NameValueCollection = GetOAuthToken(_oauthSetting.AccessTokenUrl)
 
-        If query Is Nothing Then Return False
+        If query Is Nothing OrElse query.Count = 0 Then Return False
 
         _oauthSetting.Token = query.Item("oauth_token")
@@ -48 +43 @@
         Dim statusCode As HttpStatusCode
         Try
-            Dim response As String = GetText(request, statusCode)
+            Dim response As String = WebAccessBase.GetText(request, statusCode)
             If statusCode <> HttpStatusCode.OK OrElse String.IsNullOrEmpty(response) Then Return Nothing
             Return ParseQueryString(response)
@@ -102 +97 @@
         Return _random.Next(123400, 9999999).ToString
     End Function
+
+    Protected Shared Function GetPage(ByVal url As String, _
+                                        ByRef query As System.Collections.Generic.SortedList(Of String, String), _
+                                        ByVal encode As System.Text.Encoding, _
+                                        ByVal headerInfo As System.Collections.Specialized.NameValueCollection _
+                                    ) As String
+        Dim request As HttpWebRequest = CreateRequestObject(WEBACCESS_REQ_TYPE.ReqGET, _
+                                                            New Uri(url), _
+                                                            query)
+        Return GetText(request, query, encode, headerInfo)
+    End Function
+
+    Protected Shared Function PostData(ByVal url As String, _
+                                        ByRef query As System.Collections.Generic.SortedList(Of String, String), _
+                                        ByVal encode As System.Text.Encoding, _
+                                        ByVal headerInfo As System.Collections.Specialized.NameValueCollection _
+                                    ) As String
+        Dim request As HttpWebRequest = CreateRequestObject(WEBACCESS_REQ_TYPE.ReqPOST, _
+                                                            New Uri(url), _
+                                                            query)
+        Return GetText(request, query, encode, headerInfo)
+    End Function
+
+    Private Overloads Shared Function GetText(ByVal webRequest As HttpWebRequest, _
+                                        ByVal query As System.Collections.Generic.SortedList(Of String, String), _
+                                        ByVal encode As System.Text.Encoding, _
+                                        ByVal headerInfo As System.Collections.Specialized.NameValueCollection _
+                                    ) As String
+
+        If _oauthSetting.Token = "" Then Throw New System.UnauthorizedAccessException("Unauthorized OAuth")
+
+        AppendOAuthInfo(webRequest, query, _oauthSetting.Token, _oauthSetting.TokenSecret)
+
+        Dim statusCode As HttpStatusCode
+        Dim response As String = WebAccessBase.GetText(webRequest, statusCode, encode, headerInfo)
+
+        If statusCode = HttpStatusCode.Unauthorized Then
+            _oauthSetting.ClearToken()
+            Throw New System.UnauthorizedAccessException("Unauthorized OAuth")
+        End If
+
+        If statusCode <> HttpStatusCode.OK OrElse String.IsNullOrEmpty(response) Then Return Nothing
+        Return response
+    End Function
 End Class