fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More OAuth2 updates (not functional yet)

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-09-26 15:01:15 -04:00
parent cf56a7be60
commit ba39a27904
4 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.bootstrap.php
View File

@@ -1078,7 +1078,7 @@ class Bootstrap
$rest->setSupportedFormats('JsonFormat', 'XmlFormat'); //, 'HtmlFormat'); $rest->setSupportedFormats('JsonFormat', 'XmlFormat'); //, 'HtmlFormat');
//$rest->setOverridingFormats('UploadFormat', 'JsonFormat', 'XmlFormat', 'HtmlFormat'); //$rest->setOverridingFormats('UploadFormat', 'JsonFormat', 'XmlFormat', 'HtmlFormat');
$rest->setOverridingFormats('HtmlFormat'); $rest->setOverridingFormats('HtmlFormat', 'JsonFormat', 'UploadFormat');
$_SERVER['REQUEST_URI'] = $uri; $_SERVER['REQUEST_URI'] = $uri;

15
workflow/engine/classes/model/om/BaseConfiguration.php
View File

@@ -823,20 +823,5 @@ abstract class BaseConfiguration extends BaseObject implements Persistent
} }
return self::$peer; return self::$peer;
} }
/**
* Set properties related to Configuration table
*
* @return void
*/
public function setProperties()
{
$this->cfg_uid = '';
$this->obj_uid = '';
$this->cfg_value = '';
$this->pro_uid = '';
$this->usr_uid = '';
$this->app_uid = '';
}
} }

4
workflow/engine/classes/model/om/BaseTask.php
View File

@@ -103,7 +103,7 @@ abstract class BaseTask extends BaseObject implements Persistent
* The value for the tas_group_variable field. * The value for the tas_group_variable field.
* @var string * @var string
*/ */
protected $tas_group_variable = '@@SYS_GROUP_TO_BE_ASSIGNED'; protected $tas_group_variable;
/** /**
* The value for the tas_mi_instance_variable field. * The value for the tas_mi_instance_variable field.
@@ -1090,7 +1090,7 @@ abstract class BaseTask extends BaseObject implements Persistent
$v = (string) $v; $v = (string) $v;
} }
if ($this->tas_group_variable !== $v || $v === '@@SYS_GROUP_TO_BE_ASSIGNED') { if ($this->tas_group_variable !== $v) {
$this->tas_group_variable = $v; $this->tas_group_variable = $v;
$this->modifiedColumns[] = TaskPeer::TAS_GROUP_VARIABLE; $this->modifiedColumns[] = TaskPeer::TAS_GROUP_VARIABLE;
} }

33
workflow/engine/config/schema.xml
View File

@@ -3009,4 +3009,37 @@
<index-column name="ID"/> <index-column name="ID"/>
</index> </index>
</table> </table>
<table name="OAUTH_ACCESS_TOKENS">
<column name="ACCESS_TOKEN" type="VARCHAR" size="40" required="true" primaryKey="true" />
<column name="CLIENT_ID" type="VARCHAR" size="80" required="true" />
<column name="USER_ID" type="VARCHAR" size="32" required="true" />
<column name="EXPIRES" type="TIMESTAMP" required="true" />
<column name="SCOPE" type="VARCHAR" size="2000" required="false" />
</table>
<table name="OAUTH_AUTHORIZATION_CODES">
<column name="AUTHORIZATION_CODE" type="VARCHAR" size="40" required="true" primaryKey="true" />
<column name="CLIENT_ID" type="VARCHAR" size="80" required="true" />
<column name="USER_ID" type="VARCHAR" size="32" required="false" />
<column name="REDIRECT_URI" type="VARCHAR" size="2000" required="false" />
<column name="EXPIRES" type="TIMESTAMP" required="true" />
<column name="SCOPE" type="VARCHAR" size="2000" required="false" />
</table>
<table name="OAUTH_CLIENTS">
<column name="CLIENT_ID" type="VARCHAR" size="80" required="true" primaryKey="true" />
<column name="CLIENT_SECRET" type="VARCHAR" size="80" required="true" />
<column name="REDIRECT_URI" type="VARCHAR" size="2000" required="true" />
</table>
<table name="OAUTH_REFRESH_TOKENS">
<column name="REFRESH_TOKES" type="VARCHAR" size="40" required="true" primaryKey="true" />
<column name="CLIENT_ID" type="VARCHAR" size="80" required="true" />
<column name="USER_ID" type="VARCHAR" size="32" required="false" />
<column name="EXPIRES" type="TIMESTAMP" required="true" />
<column name="SCOPE" type="VARCHAR" size="2000" required="false" />
</table>
<table name="OAUTH_SCOPES">
<column name="TYPE" type="VARCHAR" size="40" required="true" />
<column name="SCOPE" type="VARCHAR" size="2000" required="false" />
<column name="CLIENT_ID" type="VARCHAR" size="80" required="true" />
</table>
</database> </database>