hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 21:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix oauth app creation bug

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-02-22 16:55:50 +01:00
parent 35d6d86756
commit 33b225a290
6 changed files with 179 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
lib/classes/API/OAuth2/Form/DevAppDesktop.class.php
View File

@@ -51,6 +51,14 @@ class API_OAuth2_Form_DevAppDesktop
*/
public $callback;
/**
*
* @var string
*/
public $type;
public $scheme_website;
public $urlwebsite;
/**
*
* @param Request $request
@@ -58,10 +66,14 @@ class API_OAuth2_Form_DevAppDesktop
*/
public function __construct(Request $request)
{
$this->name = $request->get('name', null);
$this->description = $request->get('description', null);
$this->website = $request->get('website', null);
$this->callback = $request->get('callback', null);
$this->name = $request->get('name', '');
$this->description = $request->get('description', '');
$this->scheme_website = $request->get('scheme-website', 'http://');
$this->website = $request->get('website', '');
$this->callback = API_OAuth2_Application::NATIVE_APP_REDIRECT_URI;
$this->type = API_OAuth2_Application::DESKTOP_TYPE;
$this->urlwebsite = $this->scheme_website . $this->website;
return $this;
}
@@ -75,18 +87,6 @@ class API_OAuth2_Form_DevAppDesktop
return $this->name;
}
/**
*
* @param string $callback
* @return API_OAuth2_Form_DevApp
*/
public function setName($name)
{
$this->name = $name;
return $this;
}
/**
*
* @return string
@@ -96,18 +96,6 @@ class API_OAuth2_Form_DevAppDesktop
return $this->description;
}
/**
*
* @param string $callback
* @return API_OAuth2_Form_DevApp
*/
public function setDescription($description)
{
$this->description = $description;
return $this;
}
/**
*
* @return string
@@ -117,18 +105,6 @@ class API_OAuth2_Form_DevAppDesktop
return $this->website;
}
/**
*
* @param string $callback
* @return API_OAuth2_Form_DevApp
*/
public function setWebsite($website)
{
$this->website = $website;
return $this;
}
/**
*
* @return string
@@ -140,17 +116,29 @@ class API_OAuth2_Form_DevAppDesktop
/**
*
* @param string $callback
* @return API_OAuth2_Form_DevApp
* @return string
*/
public function setCallback($callback)
public function getType()
{
$this->callback = $callback;
return $this;
return $this->type;
}
/**
public function getSchemeWebsite()
{
return $this->scheme_website;
}
public function getUrlwebsite()
{
return $this->urlwebsite;
}
public function getSchemeCallback()
{
return '';
}
/**
*
* @param ClassMetadata $metadata
* @return API_OAuth2_Form_DevApp
@@ -162,8 +150,8 @@ class API_OAuth2_Form_DevAppDesktop
$metadata->addPropertyConstraint('name', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('description', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('website', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('website', new Constraints\Url($url));
$metadata->addPropertyConstraint('urlwebsite', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('urlwebsite', new Constraints\Url($url));
return;
}

95
lib/classes/API/OAuth2/Form/DevAppInternet.class.php
View File

@@ -50,6 +50,12 @@ class API_OAuth2_Form_DevAppInternet
* @var string
*/
public $callback;
public $scheme_website;
public $scheme_callback;
public $urlwebsite;
public $urlcallback;
/**
*
@@ -58,11 +64,17 @@ class API_OAuth2_Form_DevAppInternet
*/
public function __construct(Request $request)
{
$this->name = $request->get('name', null);
$this->description = $request->get('description', null);
$this->website = $request->get('website', null);
$this->callback = $request->get('callback', null);
$this->name = $request->get('name', '');
$this->description = $request->get('description', '');
$this->website = $request->get('website', '');
$this->callback = $request->get('callback', '');
$this->scheme_website = $request->get('scheme-website', 'http://');
$this->scheme_callback = $request->get('scheme-callback', 'http://');
$this->type = API_OAuth2_Application::WEB_TYPE;
$this->urlwebsite = $this->scheme_website.$this->website;
$this->urlcallback = $this->scheme_callback.$this->callback;
return $this;
}
@@ -75,18 +87,6 @@ class API_OAuth2_Form_DevAppInternet
return $this->name;
}
/**
*
* @param string $callback
* @return API_OAuth2_Form_DevApp
*/
public function setName($name)
{
$this->name = $name;
return $this;
}
/**
*
* @return string
@@ -96,18 +96,6 @@ class API_OAuth2_Form_DevAppInternet
return $this->description;
}
/**
*
* @param string $callback
* @return API_OAuth2_Form_DevApp
*/
public function setDescription($description)
{
$this->description = $description;
return $this;
}
/**
*
* @return string
@@ -117,18 +105,6 @@ class API_OAuth2_Form_DevAppInternet
return $this->website;
}
/**
*
* @param string $callback
* @return API_OAuth2_Form_DevApp
*/
public function setWebsite($website)
{
$this->website = $website;
return $this;
}
/**
*
* @return string
@@ -140,17 +116,34 @@ class API_OAuth2_Form_DevAppInternet
/**
*
* @param string $callback
* @return API_OAuth2_Form_DevApp
* @return string
*/
public function setCallback($callback)
public function getType()
{
$this->callback = $callback;
return $this;
return $this->type;
}
/**
public function getSchemeWebsite()
{
return $this->scheme_website;
}
public function getSchemeCallback()
{
return $this->scheme_callback;
}
public function getUrlwebsite()
{
return $this->urlwebsite;
}
public function getUrlcallback()
{
return $this->urlcallback;
}
/**
*
* @param ClassMetadata $metadata
* @return API_OAuth2_Form_DevApp
@@ -162,8 +155,10 @@ class API_OAuth2_Form_DevAppInternet
$metadata->addPropertyConstraint('name', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('description', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('website', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('website', new Constraints\Url($url));
$metadata->addPropertyConstraint('urlwebsite', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('urlwebsite', new Constraints\Url($url));
$metadata->addPropertyConstraint('urlcallback', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('urlcallback', new Constraints\Url($url));
return;
}