fixed #107

nixzhu · Nov 10, 2017 · e5e845a · e5e845a
1 parent 165a1a5
commit e5e845a
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/Sources/MonkeyKing.swift b/Sources/MonkeyKing.swift
@@ -177,31 +177,38 @@ extension MonkeyKing {
                 result = (ret == "0")
                 return result
             }
+
             // Share
             if let data = UIPasteboard.general.data(forPasteboardType: "content") {
                 if let dict = try? PropertyListSerialization.propertyList(from: data, options: PropertyListSerialization.MutabilityOptions(), format: nil) as? [String: Any] {
+
                     guard
                         let account = shared.accountSet[.weChat],
                         let info = dict?[account.appID] as? [String: Any],
                         let result = info["result"] as? String,
                         let resultCode = Int(result) else {
                             return false
                     }
+
+                    // OAuth Failed
+                    if let state = info["state"] as? String, state == "Weixinauth", resultCode != 0 {
+                        let error = NSError(domain: "WeChat OAuth Error", code: -1, userInfo: nil)
+                        shared.oauthCompletionHandler?(nil, nil, error)
+                        return false
+                    }
+
                     let success = (resultCode == 0)
+
                     if success {
                         shared.deliverCompletionHandler?(.success(nil))
                     } else {
-                        shared.deliverCompletionHandler?(.failure(.sdk(reason: .unknown))) // TODO: pass resultCode
+                        shared.deliverCompletionHandler?(.failure(.sdk(reason: .unknown)))
                     }
+
                     return success
                 }
             }
-            // OAuth Failed
-            if urlString.contains("platformId=wechat") && !urlString.contains("state=Weixinauth") {
-                let error = NSError(domain: "WeChat OAuth Error", code: -1, userInfo: nil)
-                shared.oauthCompletionHandler?(nil, nil, error)
-                return false
-            }
+
             return false
         }
         // QQ Share