Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix Weibo UniversalLink OAuth #210

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

chore: fix Weibo UniversalLink OAuth #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31b4420
chore: fix Weibo UniversalLink OAuth
Dec 2, 2022
403ca2a
chore: code format
Dec 8, 2022
c954389
chore: remove empty lines
Dec 8, 2022
d3d048b
chore: Swift format
Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/MonkeyKing/MonkeyKing+Message.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,15 +492,15 @@ extension MonkeyKing {
["transferObject": NSKeyedArchiver.archivedData(withRootObject: dict)],
["app": appData],
]
UIPasteboard.general.items = messageData


guard let url = weiboSchemeLink(uuidString: uuidString) else {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
}
UIPasteboard.general.items = messageData

if account.universalLink != nil,
let ulURL = weiboUniversalLink(query: url.query) {
let ulURL = weiboUniversalLink(query: url.query, authItems: [:]) {
shared.openURL(ulURL, options: [.universalLinksOnly: true]) { succeed in
if !succeed {
fallbackToScheme(url: url, completionHandler: completionHandler)
Expand Down
157 changes: 76 additions & 81 deletions Sources/MonkeyKing/MonkeyKing+OAuth.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,24 @@ extension MonkeyKing {
completionHandler(.failure(.noAccount))
return
}

shared.oauthCompletionHandler = completionHandler
shared.payCompletionHandler = nil
shared.deliverCompletionHandler = nil
shared.openSchemeCompletionHandler = nil

switch account {
case .alipay(let appID):

guard let dataStr = dataString else {
completionHandler(.failure(.apiRequest(.missingParameter)))
return
}

let appUrlScheme = "apoauth" + appID
let resultDic: [String: String] = ["fromAppUrlScheme": appUrlScheme, "requestType": "SafePay", "dataString": dataStr]

guard var resultStr = resultDic.toString else {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
}

resultStr = resultStr.replacingOccurrences(of: "\n", with: "").replacingOccurrences(of: " ", with: "")
resultStr = resultStr.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? resultStr
resultStr = "alipay://alipayclient/?" + resultStr
Expand All @@ -42,7 +38,6 @@ extension MonkeyKing {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
}

shared.openURL(url) { flag in
if flag { return }
completionHandler(.failure(.sdk(.invalidURLScheme)))
Expand All @@ -57,40 +52,38 @@ extension MonkeyKing {
let accessTokenAPI = "https://open.weixin.qq.com/connect/mobilecheck?appid=\(appID)&uid=1926559385"
addWebView(withURLString: accessTokenAPI)
} else {
let defaultURLComponents: ()-> URLComponents? = {
let defaultURLComponents: () -> URLComponents? = {
var urlComponents = URLComponents(string: "weixin://app/\(appID)/auth/")
urlComponents?.queryItems = [
URLQueryItem(name: "scope", value: scope),
URLQueryItem(name: "state", value: "Weixinauth"),
]
return urlComponents
}

var urlComponents = defaultURLComponents()
var wxUrlOptions = [UIApplication.OpenExternalURLOptionsKey : Any]()
var wxUrlOptions = [UIApplication.OpenExternalURLOptionsKey: Any]()

if let universalLink = universalLink,
let authUrl = shared.wechatUniversalLink(of: "auth") {
let authUrl = shared.wechatUniversalLink(of: "auth")
{
urlComponents = URLComponents(url: authUrl, resolvingAgainstBaseURL: true)
urlComponents?.queryItems?.append(contentsOf: [
URLQueryItem(name: "scope", value: scope),
URLQueryItem(name: "state", value: "Weixinauth"), // Weixinauth instead?
])

shared.setPasteboard(of: appID, with: [
"universalLink": universalLink,
"isAuthResend": false,
"command": "0"
"command": "0",
])

wxUrlOptions[.universalLinksOnly] = true
}

handleWeChatAuth(
urlComponents,
defaultURLComponents(),
wxUrlOptions,
completionHandler: completionHandler)
completionHandler: completionHandler
)
}
case .qq(let appID, _):
let scope = scope ?? ""
Expand All @@ -115,12 +108,10 @@ extension MonkeyKing {
urlComponents?.queryItems = [
URLQueryItem(name: "generalpastboard", value: "1"),
]

guard let url = urlComponents?.url else {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
}

shared.openURL(url) { flag in
if flag { return }
completionHandler(.failure(.sdk(.invalidURLScheme)))
Expand All @@ -132,59 +123,65 @@ extension MonkeyKing {
addWebView(withURLString: accessTokenAPI)
case .weibo(let appID, _, let redirectURL, _):
let scope = scope ?? "all"
guard !platform.isAppInstalled else {
let uuidString = UUID().uuidString
let transferObjectData = NSKeyedArchiver.archivedData(
withRootObject: [
"__class": "WBAuthorizeRequest",
"redirectURI": redirectURL,
"requestID": uuidString,
"scope": scope,
]
)
let userInfoData = NSKeyedArchiver.archivedData(
withRootObject: [
"mykey": "as you like",
"SSO_From": "SendMessageToWeiboViewController",
]
)
let appData = NSKeyedArchiver.archivedData(
withRootObject: [
"appKey": appID,
"bundleID": Bundle.main.monkeyking_bundleID ?? "",
"name": Bundle.main.monkeyking_displayName ?? "",
"universalLink": account.universalLink ?? "",
]
)
let authItems: [[String: Any]] = [
["transferObject": transferObjectData],
["userInfo": userInfoData],
["app": appData],
]
UIPasteboard.general.items = authItems
guard platform.isAppInstalled else {
// Web OAuth
let accessTokenAPI = "https://api.weibo.com/oauth2/authorize?client_id=\(appID)&response_type=code&redirect_uri=\(redirectURL)&scope=\(scope)"
addWebView(withURLString: accessTokenAPI)
return
}
let uuidString = UUID().uuidString
let transferObject: [String: String] = [
"__class": "WBAuthorizeRequest",
"redirectURI": redirectURL,
"requestID": uuidString,
"scope": scope,
]
let transferObjectData = NSKeyedArchiver.archivedData(withRootObject: transferObject)

guard let url = weiboSchemeLink(uuidString: uuidString) else {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
}
let userInfo: [String: String] = [
"mykey": "as you like",
"SSO_From": "SendMessageToWeiboViewController",
"sdkVersion": "3.3.4",
"startTime": Date().description,
]
let userInfoData = NSKeyedArchiver.archivedData(withRootObject: userInfo)

let app: [String: String] = [
"appKey": appID,
"requestID": uuidString,
"bundleID": Bundle.main.monkeyking_bundleID ?? "",
"name": Bundle.main.monkeyking_displayName ?? "",
"uLink": account.universalLink ?? "",
]
let appData = NSKeyedArchiver.archivedData(withRootObject: app)

if account.universalLink != nil,
#available(iOS 10.0, *),
let ulURL = weiboUniversalLink(query: url.query) {
shared.openURL(ulURL, options: [.universalLinksOnly: true]) { succeed in
if !succeed {
fallbackToScheme(url: url, completionHandler: completionHandler)
}
}
} else {
let pasteboardItems: [[String: Any]] = [
["transferObject": transferObjectData],
["userInfo": userInfoData],
["app": appData],
]
let authItems: [String: Any] = [
"sdkiOS16AppAttachment": app,
"sdkiOS16attachment": ["transferObject": transferObject, "userInfo": userInfo],
]
guard let url = weiboSchemeLink(uuidString: uuidString) else {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
}
UIPasteboard.general.items = pasteboardItems
guard #available(iOS 10.0, *), account.universalLink != nil,
let ulURL = weiboUniversalLink(query: url.query, authItems: authItems)
else {
UIPasteboard.general.items = pasteboardItems
fallbackToScheme(url: url, completionHandler: completionHandler)
return
}
shared.openURL(ulURL, options: [.universalLinksOnly: true]) { succeed in
if !succeed {
UIPasteboard.general.items = pasteboardItems
fallbackToScheme(url: url, completionHandler: completionHandler)
}

return
}
// Web OAuth
let accessTokenAPI = "https://api.weibo.com/oauth2/authorize?client_id=\(appID)&response_type=code&redirect_uri=\(redirectURL)&scope=\(scope)"
addWebView(withURLString: accessTokenAPI)
case .pocket(let appID):
guard let startIndex = appID.range(of: "-")?.lowerBound else {
return
Expand All @@ -203,7 +200,6 @@ extension MonkeyKing {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
}

shared.openURL(url) { flag in
if flag { return }
completionHandler(.failure(.sdk(.invalidURLScheme)))
Expand All @@ -218,12 +214,13 @@ extension MonkeyKing {
shared.twitterAuthenticate(appID: appID, appKey: appKey, redirectURL: redirectURL)
}
}

private class func handleWeChatAuth(
_ urlComponents: URLComponents?,
_ default: URLComponents?,
_ wxUrlOptions: [UIApplication.OpenExternalURLOptionsKey : Any],
completionHandler: @escaping OAuthCompletionHandler) {
_ wxUrlOptions: [UIApplication.OpenExternalURLOptionsKey: Any],
completionHandler: @escaping OAuthCompletionHandler
) {
guard let url = urlComponents?.url else {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
Expand All @@ -247,11 +244,12 @@ extension MonkeyKing {
}
}

public class func weChatOAuthForCode(scope: String? = nil,
state: String? = nil,
completionHandler: @escaping OAuthFromWeChatCodeCompletionHandler) {
public class func weChatOAuthForCode(
scope: String? = nil,
state: String? = nil,
completionHandler: @escaping OAuthFromWeChatCodeCompletionHandler
) {
let platform = SupportedPlatform.weChat

guard platform.isAppInstalled || platform.canWebOAuth else {
completionHandler(.failure(.noApp))
return
Expand All @@ -260,9 +258,7 @@ extension MonkeyKing {
completionHandler(.failure(.noAccount))
return
}

shared.oauthFromWeChatCodeCompletionHandler = completionHandler

if case .weChat(let appID, _, _, let universalLink) = account {
let scope = scope ?? "snsapi_userinfo"
let state = state ?? "Weixinauth"
Expand All @@ -271,19 +267,17 @@ extension MonkeyKing {
URLQueryItem(name: "scope", value: scope),
URLQueryItem(name: "state", value: state),
]

guard let url = shared.wechatUniversalLink(of: "auth", items: items),
let universalLink = universalLink else {
let universalLink = universalLink
else {
completionHandler(.failure(.sdk(.urlEncodeFailed)))
return
}

shared.setPasteboard(of: appID, with: [
"universalLink": universalLink,
"isAuthResend": false,
"command": "0"
"command": "0",
])

shared.openURL(url) { flag in
if flag { return }
completionHandler(.failure(.sdk(.invalidURLScheme)))
Expand All @@ -299,7 +293,8 @@ extension MonkeyKing {
let oauthHeader = ["Authorization": oauthString]
Networking.shared.request(requestTokenAPI, method: .post, parameters: nil, encoding: .url, headers: oauthHeader) { responseData, _, _ in
if let responseData = responseData,
let requestToken = (responseData["oauth_token"] as? String) {
let requestToken = (responseData["oauth_token"] as? String)
{
let loginURL = "https://api.twitter.com/oauth/authenticate?oauth_token=\(requestToken)"
MonkeyKing.addWebView(withURLString: loginURL)
}
Expand Down
36 changes: 27 additions & 9 deletions Sources/MonkeyKing/MonkeyKing+WeiboLinks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,55 @@
import Foundation

extension MonkeyKing {

static func weiboSchemeLink(uuidString: String) -> URL? {
var components = URLComponents(string: "weibosdk://request")

components?.queryItems = [
.init(name: "id", value: uuidString),
.init(name: "sdkversion", value: "003233000"),
.init(name: "luicode", value: "10000360"),
.init(name: "lfid", value: Bundle.main.monkeyking_bundleID ?? ""),
.init(name: "newVersion", value: "3.3"),
]

return components?.url
}
static func weiboUniversalLink(query: String?) -> URL? {

static func weiboUniversalLink(query: String?, authItems: [String: Any]) -> URL? {
var components = URLComponents(string: "https://open.weibo.com/weibosdk/request")

components?.query = query

if let index = components?.queryItems?.firstIndex(where: { $0.name == "id" }) {
components?.queryItems?[index].name = "objId"
} else {
assertionFailure()
return nil
}

if let index = components?.queryItems?.firstIndex(where: { $0.name == "sdkversion" }) {
components?.queryItems?[index].value = "3.3.4"
} else {
assertionFailure()
return nil
}
components?.queryItems?.append(
.init(name: "urltype", value: "link")
)

guard let sdkiOS16AppAttachment = authItems["sdkiOS16AppAttachment"] as? [String: Any],
let sdkiOS16attachment = authItems["sdkiOS16attachment"] as? [String: Any]
else {
return components?.url
}
guard let data1 = try? PropertyListSerialization.data(fromPropertyList: sdkiOS16AppAttachment, format: .xml, options: 0),
let data2 = try? PropertyListSerialization.data(fromPropertyList: sdkiOS16attachment, format: .xml, options: 0)
else {
return components?.url
}
components?.queryItems?.append(
.init(name: "sdkiOS16AppAttachment", value: data1.base64EncodedString())
)
components?.queryItems?.append(
.init(name: "sdkiOS16attachment", value: data2.base64EncodedString())
)
return components?.url
}
}