revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 14:52:41 +01:00
Code Issues Releases Wiki Activity

Further OAuth modularization.

Browse source
This commit is contained in:
epriestley 2011-02-28 10:15:42 -08:00
parent d3efdcff03
commit 2f3d98b24b
7 changed files with 76 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
conf/default.conf.php
View file

@ -181,7 +181,17 @@ return array(
// Can users login with a username/password, or by following the link from
// a password reset email? You can disable this and configure one or more
// OAuth providers instead.
'auth.password-auth-enabled' => true,
'auth.password-auth-enabled' => true,
// -- Accounts -------------------------------------------------------------- //
// Is basic account information (email, real name, profile picture) editable?
// If you set up Phabricator to automatically synchronize account information
// from some other authoritative system, you can disable this to ensure
// information remains consistent across both systems.
'account.editable' => true,
// -- Facebook ------------------------------------------------------------ //

12
src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
View file

@ -86,4 +86,16 @@ abstract class AphrontApplicationConfiguration {
final public function willBuildRequest() {
}
/**
* Hook for synchronizing account information from OAuth workflows.
*
* @task hook
*/
public function willAuthenticateUserWithOAuth(
PhabricatorUser $user,
PhabricatorUserOAuthInfo $oauth_info,
PhabricatorOAuthProvider $provider) {
return;
}
}

6
src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php
View file

@ -138,6 +138,12 @@ class PhabricatorOAuthLoginController extends PhabricatorAuthController {
if ($oauth_info->getID()) {
$known_user = id(new PhabricatorUser())->load($oauth_info->getUserID());
$request->getApplicationConfiguration()->willAuthenticateUserWithOAuth(
$known_user,
$oauth_info,
$provider);
$session_key = $known_user->establishSession('web');
$oauth_info->save();

2
src/applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php
View file

@ -71,7 +71,7 @@ class PhabricatorOAuthDefaultRegistrationController
}
if (!$errors) {
$image = $provider->retreiveUserProfileImage();
$image = $provider->retrieveUserProfileImage();
if ($image) {
$file = PhabricatorFile::newFromFileData(
$image,

2
src/applications/files/storage/file/PhabricatorFile.php
View file

@ -184,7 +184,7 @@ class PhabricatorFile extends PhabricatorFileDAO {
$mime_type = $this->getMimeType();
$mime_parts = explode(';', $mime_type);
$mime_type = reset($mime_parts);
$mime_type = trim(reset($mime_parts));
return idx($mime_map, $mime_type);
}

59
src/applications/people/controller/settings/PhabricatorUserSettingsController.php
View file

@ -19,6 +19,7 @@
class PhabricatorUserSettingsController extends PhabricatorPeopleController {
private $page;
private $accountEditable;
public function willProcessRequest(array $data) {
$this->page = idx($data, 'page');
@ -50,9 +51,15 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
$this->page = key($pages);
}
$account_editable = PhabricatorEnv::getEnvConfig('account.editable');
$this->accountEditable = $account_editable;
if ($request->isFormPost()) {
switch ($this->page) {
case 'email':
if (!$account_editable) {
return new Aphront400Response();
}
$user->setEmail($request->getStr('email'));
$user->save();
return id(new AphrontRedirectResponse())
@ -87,6 +94,10 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
return id(new AphrontRedirectResponse())
->setURI('/settings/page/arcanist/?regenerated=true');
case 'account':
if (!$account_editable) {
return new Aphront400Response();
}
if (!empty($_FILES['profile'])) {
$err = idx($_FILES['profile'], 'error');
if ($err != UPLOAD_ERR_NO_FILE) {
@ -208,6 +219,8 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
$img_src = PhabricatorFileURI::getViewURIForPHID(
$user->getProfileImagePHID());
$editable = $this->accountEditable;
$form = new AphrontFormView();
$form
->setUser($user)
@ -219,7 +232,8 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
->appendChild(
id(new AphrontFormTextControl())
->setLabel('Real Name')
->setValue($user->getRealName()))
->setValue($user->getRealName())
->setDisabled(!$editable))
->appendChild(
id(new AphrontFormMarkupControl())
->setValue('<hr />'))
@ -231,18 +245,22 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
'img',
array(
'src' => $img_src,
))))
->appendChild(
id(new AphrontFormFileControl())
->setLabel('Change Image')
->setName('profile')
->setCaption('Upload a 50x50px image.'))
->appendChild(
id(new AphrontFormMarkupControl())
->setValue('<hr />'))
->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Save'));
))));
if ($editable) {
$form
->appendChild(
id(new AphrontFormFileControl())
->setLabel('Change Image')
->setName('profile')
->setCaption('Upload a 50x50px image.'))
->appendChild(
id(new AphrontFormMarkupControl())
->setValue('<hr />'))
->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Save'));
}
$panel = new AphrontPanelView();
$panel->setHeader('Profile Settings');
@ -256,6 +274,8 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
$request = $this->getRequest();
$user = $request->getUser();
$editable = $this->accountEditable;
if ($request->getStr('saved')) {
$notice = new AphrontErrorView();
$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
@ -273,13 +293,18 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
id(new AphrontFormTextControl())
->setLabel('Email')
->setName('email')
->setDisabled(!$editable)
->setCaption(
'Note: there is no email validation yet; double-check your '.
'typing.')
->setValue($user->getEmail()))
->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Save'));
->setValue($user->getEmail()));
if ($editable) {
$form
->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Save'));
}
$panel = new AphrontPanelView();
$panel->setHeader('Email Settings');

3
src/applications/people/controller/settings/__init__.php
View file

@ -6,6 +6,7 @@
phutil_require_module('phabricator', 'aphront/response/400');
phutil_require_module('phabricator', 'aphront/response/404');
phutil_require_module('phabricator', 'aphront/response/dialog');
phutil_require_module('phabricator', 'aphront/response/redirect');
@ -19,8 +20,10 @@ phutil_require_module('phabricator', 'infrastructure/env');
phutil_require_module('phabricator', 'storage/queryfx');
phutil_require_module('phabricator', 'view/dialog');
phutil_require_module('phabricator', 'view/form/base');
phutil_require_module('phabricator', 'view/form/control/markup');
phutil_require_module('phabricator', 'view/form/control/static');
phutil_require_module('phabricator', 'view/form/control/submit');
phutil_require_module('phabricator', 'view/form/control/text');
phutil_require_module('phabricator', 'view/form/control/textarea');
phutil_require_module('phabricator', 'view/form/error');
phutil_require_module('phabricator', 'view/layout/panel');