Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: google_apis/gaia/gaia_urls.cc

Issue 1344443002: Implement new password separated sign in flow for chrome desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "google_apis/gaia/gaia_urls.h" 5 #include "google_apis/gaia/gaia_urls.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "google_apis/gaia/gaia_switches.h" 10 #include "google_apis/gaia/gaia_switches.h"
(...skipping 14 matching lines...) Expand all
25 const char kServiceLogoutUrlSuffix[] = "Logout"; 25 const char kServiceLogoutUrlSuffix[] = "Logout";
26 const char kIssueAuthTokenUrlSuffix[] = "IssueAuthToken"; 26 const char kIssueAuthTokenUrlSuffix[] = "IssueAuthToken";
27 const char kGetUserInfoUrlSuffix[] = "GetUserInfo"; 27 const char kGetUserInfoUrlSuffix[] = "GetUserInfo";
28 const char kTokenAuthUrlSuffix[] = "TokenAuth"; 28 const char kTokenAuthUrlSuffix[] = "TokenAuth";
29 const char kMergeSessionUrlSuffix[] = "MergeSession"; 29 const char kMergeSessionUrlSuffix[] = "MergeSession";
30 const char kOAuthGetAccessTokenUrlSuffix[] = "OAuthGetAccessToken"; 30 const char kOAuthGetAccessTokenUrlSuffix[] = "OAuthGetAccessToken";
31 const char kOAuthWrapBridgeUrlSuffix[] = "OAuthWrapBridge"; 31 const char kOAuthWrapBridgeUrlSuffix[] = "OAuthWrapBridge";
32 const char kOAuth1LoginUrlSuffix[] = "OAuthLogin"; 32 const char kOAuth1LoginUrlSuffix[] = "OAuthLogin";
33 const char kOAuthRevokeTokenUrlSuffix[] = "AuthSubRevokeToken"; 33 const char kOAuthRevokeTokenUrlSuffix[] = "AuthSubRevokeToken";
34 const char kListAccountsSuffix[] = "ListAccounts?json=standard"; 34 const char kListAccountsSuffix[] = "ListAccounts?json=standard";
35 const char kEmbeddedSigninSuffix[] = "EmbeddedSignIn"; 35 const char kOldEmbeddedSigninSuffix[] = "EmbeddedSignIn";
36 const char kEmbeddedSigninSuffix[] = "embedded/setup/chrome/usermenu";
36 const char kAddAccountSuffix[] = "AddSession"; 37 const char kAddAccountSuffix[] = "AddSession";
37 const char kGetCheckConnectionInfoSuffix[] = "GetCheckConnectionInfo"; 38 const char kGetCheckConnectionInfoSuffix[] = "GetCheckConnectionInfo";
38 39
39 // API calls from accounts.google.com (LSO) 40 // API calls from accounts.google.com (LSO)
40 const char kGetOAuthTokenUrlSuffix[] = "o/oauth/GetOAuthToken/"; 41 const char kGetOAuthTokenUrlSuffix[] = "o/oauth/GetOAuthToken/";
41 const char kClientLoginToOAuth2UrlSuffix[] = "o/oauth2/programmatic_auth"; 42 const char kClientLoginToOAuth2UrlSuffix[] = "o/oauth2/programmatic_auth";
42 const char kOAuth2AuthUrlSuffix[] = "o/oauth2/auth"; 43 const char kOAuth2AuthUrlSuffix[] = "o/oauth2/auth";
43 const char kOAuth2RevokeUrlSuffix[] = "o/oauth2/revoke"; 44 const char kOAuth2RevokeUrlSuffix[] = "o/oauth2/revoke";
44 const char kOAuth2IFrameUrlSuffix[] = "o/oauth2/iframerpc"; 45 const char kOAuth2IFrameUrlSuffix[] = "o/oauth2/iframerpc";
45 46
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 issue_auth_token_url_ = gaia_url_.Resolve(kIssueAuthTokenUrlSuffix); 105 issue_auth_token_url_ = gaia_url_.Resolve(kIssueAuthTokenUrlSuffix);
105 get_user_info_url_ = gaia_url_.Resolve(kGetUserInfoUrlSuffix); 106 get_user_info_url_ = gaia_url_.Resolve(kGetUserInfoUrlSuffix);
106 token_auth_url_ = gaia_url_.Resolve(kTokenAuthUrlSuffix); 107 token_auth_url_ = gaia_url_.Resolve(kTokenAuthUrlSuffix);
107 merge_session_url_ = gaia_url_.Resolve(kMergeSessionUrlSuffix); 108 merge_session_url_ = gaia_url_.Resolve(kMergeSessionUrlSuffix);
108 oauth_get_access_token_url_ = 109 oauth_get_access_token_url_ =
109 gaia_url_.Resolve(kOAuthGetAccessTokenUrlSuffix); 110 gaia_url_.Resolve(kOAuthGetAccessTokenUrlSuffix);
110 oauth_wrap_bridge_url_ = gaia_url_.Resolve(kOAuthWrapBridgeUrlSuffix); 111 oauth_wrap_bridge_url_ = gaia_url_.Resolve(kOAuthWrapBridgeUrlSuffix);
111 oauth_revoke_token_url_ = gaia_url_.Resolve(kOAuthRevokeTokenUrlSuffix); 112 oauth_revoke_token_url_ = gaia_url_.Resolve(kOAuthRevokeTokenUrlSuffix);
112 oauth1_login_url_ = gaia_url_.Resolve(kOAuth1LoginUrlSuffix); 113 oauth1_login_url_ = gaia_url_.Resolve(kOAuth1LoginUrlSuffix);
113 list_accounts_url_ = gaia_url_.Resolve(kListAccountsSuffix); 114 list_accounts_url_ = gaia_url_.Resolve(kListAccountsSuffix);
115 old_embedded_signin_url_ = gaia_url_.Resolve(kOldEmbeddedSigninSuffix);
114 embedded_signin_url_ = gaia_url_.Resolve(kEmbeddedSigninSuffix); 116 embedded_signin_url_ = gaia_url_.Resolve(kEmbeddedSigninSuffix);
115 add_account_url_ = gaia_url_.Resolve(kAddAccountSuffix); 117 add_account_url_ = gaia_url_.Resolve(kAddAccountSuffix);
116 get_check_connection_info_url_ = 118 get_check_connection_info_url_ =
117 gaia_url_.Resolve(kGetCheckConnectionInfoSuffix); 119 gaia_url_.Resolve(kGetCheckConnectionInfoSuffix);
118 120
119 // URLs from accounts.google.com (LSO). 121 // URLs from accounts.google.com (LSO).
120 get_oauth_token_url_ = lso_origin_url_.Resolve(kGetOAuthTokenUrlSuffix); 122 get_oauth_token_url_ = lso_origin_url_.Resolve(kGetOAuthTokenUrlSuffix);
121 client_login_to_oauth2_url_ = 123 client_login_to_oauth2_url_ =
122 lso_origin_url_.Resolve(kClientLoginToOAuth2UrlSuffix); 124 lso_origin_url_.Resolve(kClientLoginToOAuth2UrlSuffix);
123 oauth2_auth_url_ = lso_origin_url_.Resolve(kOAuth2AuthUrlSuffix); 125 oauth2_auth_url_ = lso_origin_url_.Resolve(kOAuth2AuthUrlSuffix);
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 } 216 }
215 217
216 const GURL& GaiaUrls::oauth1_login_url() const { 218 const GURL& GaiaUrls::oauth1_login_url() const {
217 return oauth1_login_url_; 219 return oauth1_login_url_;
218 } 220 }
219 221
220 const GURL& GaiaUrls::embedded_signin_url() const { 222 const GURL& GaiaUrls::embedded_signin_url() const {
221 return embedded_signin_url_; 223 return embedded_signin_url_;
222 } 224 }
223 225
226 const GURL& GaiaUrls::old_embedded_signin_url() const {
227 return old_embedded_signin_url_;
228 }
229
224 const GURL& GaiaUrls::add_account_url() const { 230 const GURL& GaiaUrls::add_account_url() const {
225 return add_account_url_; 231 return add_account_url_;
226 } 232 }
227 233
228 const std::string& GaiaUrls::oauth2_chrome_client_id() const { 234 const std::string& GaiaUrls::oauth2_chrome_client_id() const {
229 return oauth2_chrome_client_id_; 235 return oauth2_chrome_client_id_;
230 } 236 }
231 237
232 const std::string& GaiaUrls::oauth2_chrome_client_secret() const { 238 const std::string& GaiaUrls::oauth2_chrome_client_secret() const {
233 return oauth2_chrome_client_secret_; 239 return oauth2_chrome_client_secret_;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 return source.empty() 287 return source.empty()
282 ? get_check_connection_info_url_ 288 ? get_check_connection_info_url_
283 : get_check_connection_info_url_.Resolve( 289 : get_check_connection_info_url_.Resolve(
284 base::StringPrintf("?source=%s", source.c_str())); 290 base::StringPrintf("?source=%s", source.c_str()));
285 } 291 }
286 292
287 GURL GaiaUrls::signin_completed_continue_url() const { 293 GURL GaiaUrls::signin_completed_continue_url() const {
288 return 294 return
289 GURL("chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html"); 295 GURL("chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html");
290 } 296 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698