diff --git a/editor/osm_auth.cpp b/editor/osm_auth.cpp index 1ffbeaee69..b7965f28f2 100644 --- a/editor/osm_auth.cpp +++ b/editor/osm_auth.cpp @@ -94,10 +94,11 @@ OsmOAuth OsmOAuth::ServerAuth(string const & oauthToken) OsmOAuth OsmOAuth::DevServerAuth() { constexpr char const * kOsmDevServer = "https://master.apis.dev.openstreetmap.org"; - constexpr char const * kOsmDevClientId = "nw9bW3nZ-q99SXzgnH-dlED3ueDSmFPtxl33n3hDwFU"; - constexpr char const * kOsmDevClientSecret = "nIxwFx1NXIx9lKoNmb7lAoHd9ariGMf46PtU_YG558c"; - constexpr char const * kOsmDevScope = "read_prefs"; + constexpr char const * kOsmDevClientId = "QSh_IksPC78W7EgRxSRDw_F8oulQghpL2QcTLHrP4z8"; + constexpr char const * kOsmDevClientSecret = "NMU8BNkUGg_R0KhGtrrSJRREBbMBM2133Gi-cZWmVmc"; + constexpr char const * kOsmDevScope = "read_prefs write_api write_notes"; constexpr char const * kOsmDevRedirectUri = "om://oauth2/osm/callback"; + return {kOsmDevClientId, kOsmDevClientSecret, kOsmDevScope, kOsmDevRedirectUri, kOsmDevServer, kOsmDevServer}; } // static diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h index 45a47a3e36..a5b9c57726 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h @@ -11,11 +11,11 @@ enum class AuthorizationButtonType }; // Deletes any stored credentials if called with empty key or secret. -void AuthorizationStoreCredentials(osm::KeySecret const & keySecret); +void AuthorizationStoreCredentials(std::string const & oauthToken); BOOL AuthorizationHaveCredentials(); void AuthorizationClearCredentials(); // Returns empty key and secret if user has not beed authorized. -osm::KeySecret AuthorizationGetCredentials(); +std::string const AuthorizationGetCredentials(); void AuthorizationSetNeedCheck(BOOL needCheck); BOOL AuthorizationIsNeedCheck(); diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm index 33621903f6..8ad2e32ed7 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm @@ -11,6 +11,7 @@ namespace osm_auth_ios NSString * const kOSMRequestToken = @"OSMRequestToken"; NSString * const kOSMRequestSecret = @"OSMRequestSecret"; NSString * const kAuthNeedCheck = @"AuthNeedCheck"; +NSString * const kOSMAuthToken = @"OSMAuthToken"; NSString * const kOSMUserName = @"UDOsmUserName"; NSString * const kOSMChangesetsCount = @"OSMUserChangesetsCount"; @@ -33,11 +34,10 @@ BOOL LoadOsmUserPreferences(osm::UserPreferences & prefs) return success; } -void AuthorizationStoreCredentials(osm::KeySecret const & keySecret) +void AuthorizationStoreCredentials(std::string const & oauthToken) { NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - [ud setObject:@(keySecret.first.c_str()) forKey:kOSMRequestToken]; - [ud setObject:@(keySecret.second.c_str()) forKey:kOSMRequestSecret]; + [ud setObject:@(oauthToken.c_str()) forKey:kOSMAuthToken]; osm::UserPreferences prefs; if (LoadOsmUserPreferences(prefs)) { [ud setObject:@(prefs.m_displayName.c_str()) forKey:kOSMUserName]; @@ -50,9 +50,8 @@ void AuthorizationStoreCredentials(osm::KeySecret const & keySecret) BOOL AuthorizationHaveCredentials() { NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - NSString * requestToken = [ud stringForKey:kOSMRequestToken]; - NSString * requestSecret = [ud stringForKey:kOSMRequestSecret]; - return requestToken.length && requestSecret.length; + NSString * oauthToken = [ud stringForKey:kOSMAuthToken]; + return oauthToken.length; } void AuthorizationClearCredentials() @@ -65,13 +64,12 @@ void AuthorizationClearCredentials() [ud synchronize]; } -osm::KeySecret AuthorizationGetCredentials() +std::string const AuthorizationGetCredentials() { NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - NSString * requestToken = [ud stringForKey:kOSMRequestToken]; - NSString * requestSecret = [ud stringForKey:kOSMRequestSecret]; - if (requestToken && requestSecret) - return osm::KeySecret(requestToken.UTF8String, requestSecret.UTF8String); + NSString * oauthToken = [ud stringForKey:kOSMAuthToken]; + if (oauthToken) + return std::string(oauthToken.UTF8String); return {}; } diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index be7f2b90c7..eb071bda07 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -1,7 +1,6 @@ #import "MWMAlertViewController.h" #import "MWMAuthorizationCommon.h" #import "MWMAuthorizationLoginViewController.h" -#import "MWMAuthorizationWebViewLoginViewController.h" #include diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm index 7d2c16d477..d509da3481 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm @@ -110,7 +110,7 @@ using namespace osm; if (auth.IsAuthorized()) { - osm_auth_ios::AuthorizationStoreCredentials(auth.GetKeySecret()); + osm_auth_ios::AuthorizationStoreCredentials(auth.GetAuthToken()); UIViewController * svc = nil; for (UIViewController * vc in self.navigationController.viewControllers) { diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h deleted file mode 100644 index fb414e0877..0000000000 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -#import "MWMViewController.h" - -typedef NS_ENUM(NSUInteger, MWMWebViewAuthorizationType) -{ - MWMWebViewAuthorizationTypeGoogle, - MWMWebViewAuthorizationTypeFacebook -}; - -@interface MWMAuthorizationWebViewLoginViewController : MWMViewController - -@property (nonatomic) MWMWebViewAuthorizationType authType; - -@end diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm deleted file mode 100644 index a46313b9f3..0000000000 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm +++ /dev/null @@ -1,194 +0,0 @@ -#import "MWMAuthorizationWebViewLoginViewController.h" -#import "MWMAlertViewController.h" -#import "MWMAuthorizationCommon.h" -#import "MWMCircularProgress.h" -#import "MWMSettingsViewController.h" - -#include "base/logging.hpp" -#include "editor/osm_auth.hpp" - -#import -#import - -using namespace osm; - -namespace -{ -NSString * const kVerifierKey = @"oauth_verifier"; - -BOOL checkURLNeedsReload(NSString * urlString) -{ - return [urlString hasSuffix:@"/"] || [urlString containsString:@"/welcome"]; -} - -NSString * getVerifier(NSString * urlString) -{ - NSString * query = [urlString componentsSeparatedByString:@"?"].lastObject; - NSArray * queryComponents = [query componentsSeparatedByString:@"&"]; - NSString * verifierValue = nil; - for (NSString * keyValuePair in queryComponents) - { - NSArray * pairComponents = [keyValuePair componentsSeparatedByString:@"="]; - NSString * key = [pairComponents.firstObject stringByRemovingPercentEncoding]; - if (![key isEqualToString:kVerifierKey]) - continue; - verifierValue = [pairComponents.lastObject stringByRemovingPercentEncoding]; - } - return verifierValue; -} -} // namespace - -@interface MWMAuthorizationWebViewLoginViewController () - -@property(weak, nonatomic) IBOutlet WKWebView * webView; -@property(weak, nonatomic) IBOutlet UIView * spinnerView; - -@property(nonatomic) MWMCircularProgress * spinner; - -@end - -@implementation MWMAuthorizationWebViewLoginViewController -{ - RequestToken m_requestToken; -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - [self configNavBar]; - [self loadAuthorizationPage]; -} - -#pragma mark - Configuration - -- (void)configNavBar -{ - self.title = L(@"login"); - self.navigationItem.leftBarButtonItem = - [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel - target:self - action:@selector(onCancel)]; - self.navigationController.navigationBar.barStyle = UIBarStyleBlack; -} - -- (void)loadAuthorizationPage -{ - [self startSpinner]; - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ - OsmOAuth const auth = OsmOAuth::ServerAuth(); - try - { - OsmOAuth::UrlRequestToken urt; - switch (self.authType) - { - case MWMWebViewAuthorizationTypeGoogle: urt = auth.GetGoogleOAuthURL(); break; - case MWMWebViewAuthorizationTypeFacebook: urt = auth.GetFacebookOAuthURL(); break; - } - self->m_requestToken = urt.second; - NSURL * url = [NSURL URLWithString:@(urt.first.c_str())]; - NSURLRequest * request = [NSURLRequest requestWithURL:url]; - dispatch_async(dispatch_get_main_queue(), ^{ - [self stopSpinner]; - self.webView.hidden = NO; - [self.webView loadRequest:request]; - }); - } - catch (std::exception const & ex) - { - dispatch_async(dispatch_get_main_queue(), ^{ - [self stopSpinner]; - [[MWMAlertViewController activeAlertController] presentInternalErrorAlert]; - }); - LOG(LWARNING, ("Can't loadAuthorizationPage", ex.what())); - } - }); -} - -- (void)startSpinner -{ - self.spinnerView.hidden = NO; - self.spinner = [[MWMCircularProgress alloc] initWithParentView:self.spinnerView]; - [self.spinner setInvertColor:YES]; - self.spinner.state = MWMCircularProgressStateSpinner; - self.webView.userInteractionEnabled = NO; -} - -- (void)stopSpinner -{ - self.spinnerView.hidden = YES; - self.spinner = nil; - self.webView.userInteractionEnabled = YES; -} - -- (void)checkAuthorization:(NSString *)verifier -{ - [self startSpinner]; - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ - OsmOAuth const auth = OsmOAuth::ServerAuth(); - KeySecret ks; - try - { - ks = auth.FinishAuthorization(self->m_requestToken, verifier.UTF8String); - } - catch (std::exception const & ex) - { - LOG(LWARNING, ("checkAuthorization error", ex.what())); - } - dispatch_async(dispatch_get_main_queue(), ^{ - [self stopSpinner]; - if (OsmOAuth::IsValid(ks)) - { - osm_auth_ios::AuthorizationStoreCredentials(ks); - UIViewController * svc = nil; - for (UIViewController * vc in self.navigationController.viewControllers) - { - if ([vc isKindOfClass:[MWMSettingsViewController class]]) - { - svc = vc; - break; - } - } - if (svc) - [self.navigationController popToViewController:svc animated:YES]; - else - [self.navigationController popToRootViewControllerAnimated:YES]; - } - else - { - [self loadAuthorizationPage]; - [self.alertController presentInvalidUserNameOrPasswordAlert]; - } - }); - }); -} - -#pragma mark - Actions - -- (void)onCancel { [self.navigationController popViewControllerAnimated:YES]; } -#pragma mark - WKWebViewNavigation - -- (void)webViewDidStartLoad:(WKWebView *)webView { [self startSpinner]; } -- (void)webViewDidFinishLoad:(WKWebView *)webView -{ - [self stopSpinner]; - NSString * urlString = webView.URL.absoluteString; - - if (checkURLNeedsReload(urlString)) - { - [self loadAuthorizationPage]; - } - else if ([urlString containsString:kVerifierKey]) - { - webView.hidden = YES; - NSString * verifier = getVerifier(urlString); - NSAssert(verifier, @"Verifier value is nil"); - [self checkAuthorization:verifier]; - } -} - -- (void)webView:(WKWebView *)webView didFailLoadWithError:(NSError *)error -{ - [[MWMAlertViewController activeAlertController] presentInternalErrorAlert]; -} - -@end diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index b881babd24..729ca9c52f 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -2,7 +2,6 @@ #import #import "EAGLView.h" #import "MWMAuthorizationCommon.h" -#import "MWMAuthorizationWebViewLoginViewController.h" #import "MWMAutoupdateController.h" #import "MWMEditorViewController.h" #import "MWMFrameworkListener.h" @@ -587,12 +586,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; MWMDownloadMapsViewController *dvc = segue.destinationViewController; NSNumber *mode = sender; dvc.mode = (MWMMapDownloaderMode)mode.integerValue; - } else if ([segue.identifier isEqualToString:kMap2FBLoginSegue]) { - MWMAuthorizationWebViewLoginViewController *dvc = segue.destinationViewController; - dvc.authType = MWMWebViewAuthorizationTypeFacebook; - } else if ([segue.identifier isEqualToString:kMap2GoogleLoginSegue]) { - MWMAuthorizationWebViewLoginViewController *dvc = segue.destinationViewController; - dvc.authType = MWMWebViewAuthorizationTypeGoogle; } } diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm index e49bd47467..8a2461d512 100644 --- a/iphone/Maps/Core/Editor/MWMEditorHelper.mm +++ b/iphone/Maps/Core/Editor/MWMEditorHelper.mm @@ -29,9 +29,9 @@ break; } }; - osm::KeySecret const keySecret = osm_auth_ios::AuthorizationGetCredentials(); + std::string const oauthToken = osm_auth_ios::AuthorizationGetCredentials(); osm::Editor::Instance().UploadChanges( - keySecret.first, keySecret.second, + oauthToken, {{"created_by", std::string("Organic Maps " OMIM_OS_NAME " ") + AppInfo.sharedInfo.bundleVersion.UTF8String}, {"bundle_id", NSBundle.mainBundle.bundleIdentifier.UTF8String}}, diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 58f4c4de2d..2ca8e0a177 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -48,7 +48,6 @@ 340E1EFB1E2F614400CE49BF /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340E1EE91E2F614400CE49BF /* Storyboard.swift */; }; 340E1EFE1E2F614400CE49BF /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EEA1E2F614400CE49BF /* Welcome.storyboard */; }; 342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */; }; - 342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342EE4101C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm */; }; 343064411E9FDC7300DC7665 /* SearchIndex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3430643F1E9FDC7300DC7665 /* SearchIndex.swift */; }; 343E75981E5B1EE20041226A /* MWMCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.m */; }; 3444DFCD1F1760B900E73099 /* WidgetsArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3444DFCB1F1760B900E73099 /* WidgetsArea.swift */; }; @@ -775,8 +774,6 @@ 3427AF0B1E49E3A500D466DB /* MWMConsts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMConsts.h; sourceTree = ""; }; 342CC5EF1C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationLoginViewController.h; sourceTree = ""; }; 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationLoginViewController.mm; sourceTree = ""; }; - 342EE40F1C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationWebViewLoginViewController.h; sourceTree = ""; }; - 342EE4101C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationWebViewLoginViewController.mm; sourceTree = ""; }; 3430643F1E9FDC7300DC7665 /* SearchIndex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchIndex.swift; sourceTree = ""; }; 343E75951E5B1EE20041226A /* MWMCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCollectionViewController.h; sourceTree = ""; }; 343E75961E5B1EE20041226A /* MWMCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMCollectionViewController.m; sourceTree = ""; }; @@ -2381,8 +2378,6 @@ 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */, 34BF0CC81C31306300D097EB /* MWMAuthorizationCommon.h */, 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */, - 342EE40F1C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.h */, - 342EE4101C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm */, ); name = Login; path = CustomViews/Login; @@ -4047,7 +4042,6 @@ F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */, 3DBD7BE42425015C00ED9FE8 /* ParntersStyleSheet.swift in Sources */, F6E2FF631E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */, - 342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */, 4715273524907F8200E91BBA /* BookmarkColorViewController.swift in Sources */, 47E3C7292111E614008B3B27 /* FadeInAnimatedTransitioning.swift in Sources */, 34AB667D1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */, diff --git a/iphone/Maps/UI/Storyboard/Authorization.storyboard b/iphone/Maps/UI/Storyboard/Authorization.storyboard index 9c4873491a..6c80ef590c 100644 --- a/iphone/Maps/UI/Storyboard/Authorization.storyboard +++ b/iphone/Maps/UI/Storyboard/Authorization.storyboard @@ -1,9 +1,9 @@ - + - + @@ -17,7 +17,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -325,7 +325,7 @@