Skip to content

pidan / FuSiLive

Go to a project
Commit 9a79f11d by ludi
Options

修复谷歌和line登录

parent 89b2d797
Inline Side-by-side
Showing with 98 additions and 56 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FUSSocialLogin/FUSThirdAccountLoginHelper.m
...@@ -347,15 +347,20 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey ...@@ -347,15 +347,20 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
} else { } else {
[FUSHttpManager httpGetRequestWithUrl:@"https://www.google.com/" params:nil headers:nil timeout:6 requestType:HTTPRequestType responseType:HTTPResponseType contentTypes:nil success:^(NSURLSessionDataTask *operation, id responseObject) { NSArray *currentScopes = [GIDSignIn sharedInstance].scopes;
NSArray *currentScopes = [GIDSignIn sharedInstance].scopes; [GIDSignIn sharedInstance].scopes = [currentScopes arrayByAddingObject:@"https://www.googleapis.com/auth/userinfo.profile"];
[GIDSignIn sharedInstance].scopes = [currentScopes arrayByAddingObject:@"https://www.googleapis.com/auth/userinfo.profile"]; [GIDSignIn sharedInstance].presentingViewController = viewController;
[GIDSignIn sharedInstance].presentingViewController = viewController; [[GIDSignIn sharedInstance] signIn];
[[GIDSignIn sharedInstance] signIn];
} failure:^(NSURLSessionDataTask *operation, NSError *error) { // [FUSHttpManager httpGetRequestWithUrl:@"https://www.google.com/" params:nil headers:nil timeout:6 requestType:HTTPRequestType responseType:HTTPResponseType contentTypes:nil success:^(NSURLSessionDataTask *operation, id responseObject) {
if (failure) failure(error); // NSArray *currentScopes = [GIDSignIn sharedInstance].scopes;
[FUSDialogView fus_showDialog:@"can not connect to Google" autoDismissTime:2]; // [GIDSignIn sharedInstance].scopes = [currentScopes arrayByAddingObject:@"https://www.googleapis.com/auth/userinfo.profile"];
}]; // [GIDSignIn sharedInstance].presentingViewController = viewController;
// [[GIDSignIn sharedInstance] signIn];
// } failure:^(NSURLSessionDataTask *operation, NSError *error) {
// if (failure) failure(error);
// [FUSDialogView fus_showDialog:@"can not connect to Google" autoDismissTime:2];
// }];
} }
} }
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/ThirdParty/TwitterHelper/LineHelper/FUSLineHelper.swift
...@@ -25,48 +25,85 @@ import LineSDK ...@@ -25,48 +25,85 @@ import LineSDK
/// Line 登录 /// Line 登录
public func fus_lineLogin(success successHandle: loginSuccessBlock?, failure failureHandle: loginFailureBlock?) { public func fus_lineLogin(success successHandle: loginSuccessBlock?, failure failureHandle: loginFailureBlock?) {
FUSHttpManager.httpGetRequest(withUrl: "https://www.google.com/", params: nil, headers: nil, timeout: 6, requestType: HTTPRequestType, responseType: HTTPResponseType, contentTypes: nil) { _, _ in
LoginManager.shared.login(permissions: [.profile, .openID], in: nil) {[weak self] result in
LoginManager.shared.login(permissions: [.profile, .openID], in: nil) {[weak self] result in switch result {
switch result { case .success(let success):
case .success(let success): let token = success.accessToken.value
let token = success.accessToken.value
let displayName = success.userProfile?.displayName
let displayName = success.userProfile?.displayName var pictureUrlStr: String?
var pictureUrlStr: String? if let pictureUrl = success.userProfile?.pictureURL {
if let pictureUrl = success.userProfile?.pictureURL { pictureUrlStr = pictureUrl.absoluteString
pictureUrlStr = pictureUrl.absoluteString }
}
var completeDict = [String: String]()
var completeDict = [String: String]()
completeDict[FUSSocializedFetchIDTokenKey] = token completeDict[FUSSocializedFetchIDTokenKey] = token
if let userId = success.userProfile?.userID { if let userId = success.userProfile?.userID {
completeDict[FUSSocializedFetchOpenIdKey] = userId completeDict[FUSSocializedFetchOpenIdKey] = userId
} }
if let pictureUrlStr = pictureUrlStr { if let pictureUrlStr = pictureUrlStr {
completeDict[FUSSocializedFetchFacepathKey] = pictureUrlStr completeDict[FUSSocializedFetchFacepathKey] = pictureUrlStr
} }
if let displayName = success.userProfile?.displayName { if let displayName = success.userProfile?.displayName {
completeDict[FUSSocializedFetchNikeNameKey] = displayName completeDict[FUSSocializedFetchNikeNameKey] = displayName
} }
completeDict[FUSSocializedFetchSexKey] = "1" completeDict[FUSSocializedFetchSexKey] = "1"
// LINE Opentype 为8 // LINE Opentype 为8
completeDict[FUSSocializedFetchOpenTypeKey] = "8" completeDict[FUSSocializedFetchOpenTypeKey] = "8"
successHandle?(completeDict) successHandle?(completeDict)
case .failure(let failure): case .failure(let failure):
// self?.currentLoginModel?.completionHandler?(false, failure.failureReason, [:]) // self?.currentLoginModel?.completionHandler?(false, failure.failureReason, [:])
// self?.currentLoginModel = nil // self?.currentLoginModel = nil
let error: NSError = .init(domain: failure.failureReason ?? "", code: failure.errorCode) let error: NSError = .init(domain: failure.failureReason ?? "", code: failure.errorCode)
failureHandle?(error) failureHandle?(error)
}
} }
} failure: { _, error in
failureHandle?(error)
FUSDialogView.fus_showDialog("can not connect to Line")
} }
// FUSHttpManager.httpGetRequest(withUrl: "https://www.google.com/", params: nil, headers: nil, timeout: 6, requestType: HTTPRequestType, responseType: HTTPResponseType, contentTypes: nil) { _, _ in
//
// LoginManager.shared.login(permissions: [.profile, .openID], in: nil) {[weak self] result in
// switch result {
// case .success(let success):
// let token = success.accessToken.value
//
// let displayName = success.userProfile?.displayName
// var pictureUrlStr: String?
// if let pictureUrl = success.userProfile?.pictureURL {
// pictureUrlStr = pictureUrl.absoluteString
// }
//
// var completeDict = [String: String]()
//
//
// completeDict[FUSSocializedFetchIDTokenKey] = token
// if let userId = success.userProfile?.userID {
// completeDict[FUSSocializedFetchOpenIdKey] = userId
// }
// if let pictureUrlStr = pictureUrlStr {
// completeDict[FUSSocializedFetchFacepathKey] = pictureUrlStr
// }
// if let displayName = success.userProfile?.displayName {
// completeDict[FUSSocializedFetchNikeNameKey] = displayName
// }
// completeDict[FUSSocializedFetchSexKey] = "1"
// // LINE Opentype 为8
// completeDict[FUSSocializedFetchOpenTypeKey] = "8"
// successHandle?(completeDict)
// case .failure(let failure):
//// self?.currentLoginModel?.completionHandler?(false, failure.failureReason, [:])
//// self?.currentLoginModel = nil
// let error: NSError = .init(domain: failure.failureReason ?? "", code: failure.errorCode)
// failureHandle?(error)
// }
// }
//
// } failure: { _, error in
// failureHandle?(error)
// FUSDialogView.fus_showDialog("can not connect to Line")
// }
} }
} }
FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>NotificationService.xcscheme_^#shared#^_</key> <key>NotificationService.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>81</integer> <integer>89</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>89</integer> <integer>81</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>87</integer> <integer>82</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>85</integer> <integer>90</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>82</integer> <integer>85</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>91</integer> <integer>88</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<key>FUSBDAlphaPlayer-BDAlphaPlayer.xcscheme_^#shared#^_</key> <key>FUSBDAlphaPlayer-BDAlphaPlayer.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>84</integer> <integer>91</integer>
</dict> </dict>
<key>FUSBDAlphaPlayer.xcscheme</key> <key>FUSBDAlphaPlayer.xcscheme</key>
<dict> <dict>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<key>FUSBDAlphaPlayer.xcscheme_^#shared#^_</key> <key>FUSBDAlphaPlayer.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>83</integer> <integer>87</integer>
</dict> </dict>
<key>FUSCommon-FUSCommonBundle.xcscheme</key> <key>FUSCommon-FUSCommonBundle.xcscheme</key>
<dict> <dict>
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<key>Firebase.xcscheme_^#shared#^_</key> <key>Firebase.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>90</integer> <integer>84</integer>
</dict> </dict>
<key>FirebaseAnalytics.xcscheme</key> <key>FirebaseAnalytics.xcscheme</key>
<dict> <dict>
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<key>FirebaseCrashlytics.xcscheme_^#shared#^_</key> <key>FirebaseCrashlytics.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>88</integer> <integer>83</integer>
</dict> </dict>
<key>FirebaseInstallations.xcscheme</key> <key>FirebaseInstallations.xcscheme</key>
<dict> <dict>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment