Page MenuHomePhabricator
Files F13238809

D8045.id18212.diff
No OneTemporary
Actions

D8045.id18212.diff
View Options

Index: src/applications/auth/provider/PhabricatorAuthProvider.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProvider.php
+++ src/applications/auth/provider/PhabricatorAuthProvider.php
@@ -259,8 +259,7 @@
public function getLoginURI() {
$app = PhabricatorApplication::getByClass('PhabricatorApplicationAuth');
- $uri = $app->getApplicationURI('/login/'.$this->getProviderKey().'/');
- return PhabricatorEnv::getURI($uri);
+ return $app->getApplicationURI('/login/'.$this->getProviderKey().'/');
}
public function getSettingsURI() {
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuth.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuth.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuth.php
@@ -25,7 +25,7 @@
$adapter->setClientSecret(
new PhutilOpaqueEnvelope(
$config->getProperty(self::PROPERTY_APP_SECRET)));
- $adapter->setRedirectURI($this->getLoginURI());
+ $adapter->setRedirectURI(PhabricatorEnv::getURI($this->getLoginURI()));
return $adapter;
}
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuth1.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuth1.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuth1.php
@@ -30,7 +30,7 @@
if (strlen($secret)) {
$adapter->setConsumerSecret(new PhutilOpaqueEnvelope($secret));
}
- $adapter->setCallbackURI($this->getLoginURI());
+ $adapter->setCallbackURI(PhabricatorEnv::getURI($this->getLoginURI()));
return $adapter;
}
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuth1JIRA.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuth1JIRA.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuth1JIRA.php
@@ -21,7 +21,7 @@
"**Step 1 of 2**: Provide the name and URI for your JIRA install.\n\n".
"In the next step, you will configure JIRA.");
} else {
- $login_uri = $this->getLoginURI();
+ $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
return pht(
"**Step 2 of 2**: In this step, you will configure JIRA.\n\n".
"**Create a JIRA Application**: Log into JIRA and go to ".
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuth1Twitter.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuth1Twitter.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuth1Twitter.php
@@ -8,7 +8,7 @@
}
public function getConfigurationHelp() {
- $login_uri = $this->getLoginURI();
+ $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
return pht(
"To configure Twitter OAuth, create a new application here:".
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuthAmazon.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuthAmazon.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuthAmazon.php
@@ -8,7 +8,7 @@
}
public function getConfigurationHelp() {
- $login_uri = $this->getLoginURI();
+ $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
$uri = new PhutilURI(PhabricatorEnv::getProductionURI('/'));
$https_note = null;
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuthAsana.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuthAsana.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuthAsana.php
@@ -9,7 +9,7 @@
public function getConfigurationHelp() {
$app_uri = PhabricatorEnv::getProductionURI('/');
- $login_uri = $this->getLoginURI();
+ $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
return pht(
"To configure Asana OAuth, create a new application here:".
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuthDisqus.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuthDisqus.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuthDisqus.php
@@ -8,7 +8,7 @@
}
public function getConfigurationHelp() {
- $login_uri = $this->getLoginURI();
+ $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
return pht(
"To configure Disqus OAuth, create a new application here:".
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php
@@ -9,7 +9,7 @@
public function getConfigurationHelp() {
$uri = PhabricatorEnv::getProductionURI('/');
- $callback_uri = $this->getLoginURI();
+ $callback_uri = PhabricatorEnv::getURI($this->getLoginURI());
return pht(
"To configure GitHub OAuth, create a new GitHub Application here:".
@@ -38,7 +38,7 @@
public function getLoginURI() {
// TODO: Clean this up. See PhabricatorAuthOldOAuthRedirectController.
- return PhabricatorEnv::getURI('/oauth/github/login/');
+ return '/oauth/github/login/';
}
}
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuthGoogle.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuthGoogle.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuthGoogle.php
@@ -8,7 +8,7 @@
}
public function getConfigurationHelp() {
- $login_uri = $this->getLoginURI();
+ $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
return pht(
"To configure Google OAuth, create a new 'API Project' here:".
@@ -38,7 +38,7 @@
public function getLoginURI() {
// TODO: Clean this up. See PhabricatorAuthOldOAuthRedirectController.
- return PhabricatorEnv::getURI('/oauth/google/login/');
+ return '/oauth/google/login/';
}
}
Index: src/applications/auth/provider/PhabricatorAuthProviderOAuthTwitch.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderOAuthTwitch.php
+++ src/applications/auth/provider/PhabricatorAuthProviderOAuthTwitch.php
@@ -8,7 +8,7 @@
}
public function getConfigurationHelp() {
- $login_uri = $this->getLoginURI();
+ $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
return pht(
"To configure Twitch.tv OAuth, create a new application here:".
Index: src/applications/auth/provider/PhabricatorAuthProviderPersona.php
===================================================================
--- src/applications/auth/provider/PhabricatorAuthProviderPersona.php
+++ src/applications/auth/provider/PhabricatorAuthProviderPersona.php
@@ -29,7 +29,7 @@
Javelin::initBehavior(
'persona-login',
array(
- 'loginURI' => $this->getLoginURI(),
+ 'loginURI' => PhabricatorEnv::getURI($this->getLoginURI()),
));
return $this->renderStandardLoginButton(

File Metadata

Mime Type
text/plain
Expires
Wed, May 22, 9:24 PM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6287202
Default Alt Text
D8045.id18212.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility