diff --git a/workflow/engine/classes/model/map/EmailServerMapBuilder.php b/workflow/engine/classes/model/map/EmailServerMapBuilder.php index b9e5729a0..efba152f9 100644 --- a/workflow/engine/classes/model/map/EmailServerMapBuilder.php +++ b/workflow/engine/classes/model/map/EmailServerMapBuilder.php @@ -95,6 +95,14 @@ class EmailServerMapBuilder $tMap->addColumn('MESS_DEFAULT', 'MessDefault', 'int', CreoleTypes::INTEGER, true, null); + $tMap->addColumn('OAUTH_CLIENT_ID', 'OauthClientId', 'string', CreoleTypes::VARCHAR, true, 256); + + $tMap->addColumn('OAUTH_CLIENT_SECRET', 'OauthClientSecret', 'string', CreoleTypes::VARCHAR, true, 256); + + $tMap->addColumn('OAUTH_REFRESH_TOKEN', 'OauthRefreshToken', 'string', CreoleTypes::VARCHAR, true, 256); + + $tMap->addValidator('MESS_ENGINE', 'validValues', 'propel.validator.ValidValuesValidator', 'MAIL|PHPMAILER|XOAUTH2', 'Please enter a valid value for MESS_ENGINE'); + } // doBuild() } // EmailServerMapBuilder diff --git a/workflow/engine/classes/model/om/BaseEmailServer.php b/workflow/engine/classes/model/om/BaseEmailServer.php index 82716bab4..69cb5d10c 100644 --- a/workflow/engine/classes/model/om/BaseEmailServer.php +++ b/workflow/engine/classes/model/om/BaseEmailServer.php @@ -117,6 +117,24 @@ abstract class BaseEmailServer extends BaseObject implements Persistent */ protected $mess_default = 0; + /** + * The value for the oauth_client_id field. + * @var string + */ + protected $oauth_client_id = ''; + + /** + * The value for the oauth_client_secret field. + * @var string + */ + protected $oauth_client_secret = ''; + + /** + * The value for the oauth_refresh_token field. + * @var string + */ + protected $oauth_refresh_token = ''; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -296,6 +314,39 @@ abstract class BaseEmailServer extends BaseObject implements Persistent return $this->mess_default; } + /** + * Get the [oauth_client_id] column value. + * + * @return string + */ + public function getOauthClientId() + { + + return $this->oauth_client_id; + } + + /** + * Get the [oauth_client_secret] column value. + * + * @return string + */ + public function getOauthClientSecret() + { + + return $this->oauth_client_secret; + } + + /** + * Get the [oauth_refresh_token] column value. + * + * @return string + */ + public function getOauthRefreshToken() + { + + return $this->oauth_refresh_token; + } + /** * Set the value of [mess_uid] column. * @@ -626,6 +677,72 @@ abstract class BaseEmailServer extends BaseObject implements Persistent } // setMessDefault() + /** + * Set the value of [oauth_client_id] column. + * + * @param string $v new value + * @return void + */ + public function setOauthClientId($v) + { + + // Since the native PHP type for this column is string, + // we will cast the input to a string (if it is not). + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + + if ($this->oauth_client_id !== $v || $v === '') { + $this->oauth_client_id = $v; + $this->modifiedColumns[] = EmailServerPeer::OAUTH_CLIENT_ID; + } + + } // setOauthClientId() + + /** + * Set the value of [oauth_client_secret] column. + * + * @param string $v new value + * @return void + */ + public function setOauthClientSecret($v) + { + + // Since the native PHP type for this column is string, + // we will cast the input to a string (if it is not). + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + + if ($this->oauth_client_secret !== $v || $v === '') { + $this->oauth_client_secret = $v; + $this->modifiedColumns[] = EmailServerPeer::OAUTH_CLIENT_SECRET; + } + + } // setOauthClientSecret() + + /** + * Set the value of [oauth_refresh_token] column. + * + * @param string $v new value + * @return void + */ + public function setOauthRefreshToken($v) + { + + // Since the native PHP type for this column is string, + // we will cast the input to a string (if it is not). + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + + if ($this->oauth_refresh_token !== $v || $v === '') { + $this->oauth_refresh_token = $v; + $this->modifiedColumns[] = EmailServerPeer::OAUTH_REFRESH_TOKEN; + } + + } // setOauthRefreshToken() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -673,12 +790,18 @@ abstract class BaseEmailServer extends BaseObject implements Persistent $this->mess_default = $rs->getInt($startcol + 14); + $this->oauth_client_id = $rs->getString($startcol + 15); + + $this->oauth_client_secret = $rs->getString($startcol + 16); + + $this->oauth_refresh_token = $rs->getString($startcol + 17); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 15; // 15 = EmailServerPeer::NUM_COLUMNS - EmailServerPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 18; // 18 = EmailServerPeer::NUM_COLUMNS - EmailServerPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating EmailServer object", $e); @@ -927,6 +1050,15 @@ abstract class BaseEmailServer extends BaseObject implements Persistent case 14: return $this->getMessDefault(); break; + case 15: + return $this->getOauthClientId(); + break; + case 16: + return $this->getOauthClientSecret(); + break; + case 17: + return $this->getOauthRefreshToken(); + break; default: return null; break; @@ -962,6 +1094,9 @@ abstract class BaseEmailServer extends BaseObject implements Persistent $keys[12] => $this->getMessTrySendInmediatly(), $keys[13] => $this->getMailTo(), $keys[14] => $this->getMessDefault(), + $keys[15] => $this->getOauthClientId(), + $keys[16] => $this->getOauthClientSecret(), + $keys[17] => $this->getOauthRefreshToken(), ); return $result; } @@ -1038,6 +1173,15 @@ abstract class BaseEmailServer extends BaseObject implements Persistent case 14: $this->setMessDefault($value); break; + case 15: + $this->setOauthClientId($value); + break; + case 16: + $this->setOauthClientSecret($value); + break; + case 17: + $this->setOauthRefreshToken($value); + break; } // switch() } @@ -1121,6 +1265,18 @@ abstract class BaseEmailServer extends BaseObject implements Persistent $this->setMessDefault($arr[$keys[14]]); } + if (array_key_exists($keys[15], $arr)) { + $this->setOauthClientId($arr[$keys[15]]); + } + + if (array_key_exists($keys[16], $arr)) { + $this->setOauthClientSecret($arr[$keys[16]]); + } + + if (array_key_exists($keys[17], $arr)) { + $this->setOauthRefreshToken($arr[$keys[17]]); + } + } /** @@ -1192,6 +1348,18 @@ abstract class BaseEmailServer extends BaseObject implements Persistent $criteria->add(EmailServerPeer::MESS_DEFAULT, $this->mess_default); } + if ($this->isColumnModified(EmailServerPeer::OAUTH_CLIENT_ID)) { + $criteria->add(EmailServerPeer::OAUTH_CLIENT_ID, $this->oauth_client_id); + } + + if ($this->isColumnModified(EmailServerPeer::OAUTH_CLIENT_SECRET)) { + $criteria->add(EmailServerPeer::OAUTH_CLIENT_SECRET, $this->oauth_client_secret); + } + + if ($this->isColumnModified(EmailServerPeer::OAUTH_REFRESH_TOKEN)) { + $criteria->add(EmailServerPeer::OAUTH_REFRESH_TOKEN, $this->oauth_refresh_token); + } + return $criteria; } @@ -1274,6 +1442,12 @@ abstract class BaseEmailServer extends BaseObject implements Persistent $copyObj->setMessDefault($this->mess_default); + $copyObj->setOauthClientId($this->oauth_client_id); + + $copyObj->setOauthClientSecret($this->oauth_client_secret); + + $copyObj->setOauthRefreshToken($this->oauth_refresh_token); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseEmailServerPeer.php b/workflow/engine/classes/model/om/BaseEmailServerPeer.php index a020a0763..7486104a6 100644 --- a/workflow/engine/classes/model/om/BaseEmailServerPeer.php +++ b/workflow/engine/classes/model/om/BaseEmailServerPeer.php @@ -25,7 +25,7 @@ abstract class BaseEmailServerPeer const CLASS_DEFAULT = 'classes.model.EmailServer'; /** The total number of columns. */ - const NUM_COLUMNS = 15; + const NUM_COLUMNS = 18; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -76,6 +76,15 @@ abstract class BaseEmailServerPeer /** the column name for the MESS_DEFAULT field */ const MESS_DEFAULT = 'EMAIL_SERVER.MESS_DEFAULT'; + /** the column name for the OAUTH_CLIENT_ID field */ + const OAUTH_CLIENT_ID = 'EMAIL_SERVER.OAUTH_CLIENT_ID'; + + /** the column name for the OAUTH_CLIENT_SECRET field */ + const OAUTH_CLIENT_SECRET = 'EMAIL_SERVER.OAUTH_CLIENT_SECRET'; + + /** the column name for the OAUTH_REFRESH_TOKEN field */ + const OAUTH_REFRESH_TOKEN = 'EMAIL_SERVER.OAUTH_REFRESH_TOKEN'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -87,10 +96,10 @@ abstract class BaseEmailServerPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('MessUid', 'MessEngine', 'MessServer', 'MessPort', 'MessIncomingServer', 'MessIncomingPort', 'MessRauth', 'MessAccount', 'MessPassword', 'MessFromMail', 'MessFromName', 'Smtpsecure', 'MessTrySendInmediatly', 'MailTo', 'MessDefault', ), - BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID, EmailServerPeer::MESS_ENGINE, EmailServerPeer::MESS_SERVER, EmailServerPeer::MESS_PORT, EmailServerPeer::MESS_INCOMING_SERVER, EmailServerPeer::MESS_INCOMING_PORT, EmailServerPeer::MESS_RAUTH, EmailServerPeer::MESS_ACCOUNT, EmailServerPeer::MESS_PASSWORD, EmailServerPeer::MESS_FROM_MAIL, EmailServerPeer::MESS_FROM_NAME, EmailServerPeer::SMTPSECURE, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY, EmailServerPeer::MAIL_TO, EmailServerPeer::MESS_DEFAULT, ), - BasePeer::TYPE_FIELDNAME => array ('MESS_UID', 'MESS_ENGINE', 'MESS_SERVER', 'MESS_PORT', 'MESS_INCOMING_SERVER', 'MESS_INCOMING_PORT', 'MESS_RAUTH', 'MESS_ACCOUNT', 'MESS_PASSWORD', 'MESS_FROM_MAIL', 'MESS_FROM_NAME', 'SMTPSECURE', 'MESS_TRY_SEND_INMEDIATLY', 'MAIL_TO', 'MESS_DEFAULT', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ) + BasePeer::TYPE_PHPNAME => array ('MessUid', 'MessEngine', 'MessServer', 'MessPort', 'MessIncomingServer', 'MessIncomingPort', 'MessRauth', 'MessAccount', 'MessPassword', 'MessFromMail', 'MessFromName', 'Smtpsecure', 'MessTrySendInmediatly', 'MailTo', 'MessDefault', 'OauthClientId', 'OauthClientSecret', 'OauthRefreshToken', ), + BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID, EmailServerPeer::MESS_ENGINE, EmailServerPeer::MESS_SERVER, EmailServerPeer::MESS_PORT, EmailServerPeer::MESS_INCOMING_SERVER, EmailServerPeer::MESS_INCOMING_PORT, EmailServerPeer::MESS_RAUTH, EmailServerPeer::MESS_ACCOUNT, EmailServerPeer::MESS_PASSWORD, EmailServerPeer::MESS_FROM_MAIL, EmailServerPeer::MESS_FROM_NAME, EmailServerPeer::SMTPSECURE, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY, EmailServerPeer::MAIL_TO, EmailServerPeer::MESS_DEFAULT, EmailServerPeer::OAUTH_CLIENT_ID, EmailServerPeer::OAUTH_CLIENT_SECRET, EmailServerPeer::OAUTH_REFRESH_TOKEN, ), + BasePeer::TYPE_FIELDNAME => array ('MESS_UID', 'MESS_ENGINE', 'MESS_SERVER', 'MESS_PORT', 'MESS_INCOMING_SERVER', 'MESS_INCOMING_PORT', 'MESS_RAUTH', 'MESS_ACCOUNT', 'MESS_PASSWORD', 'MESS_FROM_MAIL', 'MESS_FROM_NAME', 'SMTPSECURE', 'MESS_TRY_SEND_INMEDIATLY', 'MAIL_TO', 'MESS_DEFAULT', 'OAUTH_CLIENT_ID', 'OAUTH_CLIENT_SECRET', 'OAUTH_REFRESH_TOKEN', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -100,10 +109,10 @@ abstract class BaseEmailServerPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('MessUid' => 0, 'MessEngine' => 1, 'MessServer' => 2, 'MessPort' => 3, 'MessIncomingServer' => 4, 'MessIncomingPort' => 5, 'MessRauth' => 6, 'MessAccount' => 7, 'MessPassword' => 8, 'MessFromMail' => 9, 'MessFromName' => 10, 'Smtpsecure' => 11, 'MessTrySendInmediatly' => 12, 'MailTo' => 13, 'MessDefault' => 14, ), - BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID => 0, EmailServerPeer::MESS_ENGINE => 1, EmailServerPeer::MESS_SERVER => 2, EmailServerPeer::MESS_PORT => 3, EmailServerPeer::MESS_INCOMING_SERVER => 4, EmailServerPeer::MESS_INCOMING_PORT => 5, EmailServerPeer::MESS_RAUTH => 6, EmailServerPeer::MESS_ACCOUNT => 7, EmailServerPeer::MESS_PASSWORD => 8, EmailServerPeer::MESS_FROM_MAIL => 9, EmailServerPeer::MESS_FROM_NAME => 10, EmailServerPeer::SMTPSECURE => 11, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY => 12, EmailServerPeer::MAIL_TO => 13, EmailServerPeer::MESS_DEFAULT => 14, ), - BasePeer::TYPE_FIELDNAME => array ('MESS_UID' => 0, 'MESS_ENGINE' => 1, 'MESS_SERVER' => 2, 'MESS_PORT' => 3, 'MESS_INCOMING_SERVER' => 4, 'MESS_INCOMING_PORT' => 5, 'MESS_RAUTH' => 6, 'MESS_ACCOUNT' => 7, 'MESS_PASSWORD' => 8, 'MESS_FROM_MAIL' => 9, 'MESS_FROM_NAME' => 10, 'SMTPSECURE' => 11, 'MESS_TRY_SEND_INMEDIATLY' => 12, 'MAIL_TO' => 13, 'MESS_DEFAULT' => 14, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ) + BasePeer::TYPE_PHPNAME => array ('MessUid' => 0, 'MessEngine' => 1, 'MessServer' => 2, 'MessPort' => 3, 'MessIncomingServer' => 4, 'MessIncomingPort' => 5, 'MessRauth' => 6, 'MessAccount' => 7, 'MessPassword' => 8, 'MessFromMail' => 9, 'MessFromName' => 10, 'Smtpsecure' => 11, 'MessTrySendInmediatly' => 12, 'MailTo' => 13, 'MessDefault' => 14, 'OauthClientId' => 15, 'OauthClientSecret' => 16, 'OauthRefreshToken' => 17, ), + BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID => 0, EmailServerPeer::MESS_ENGINE => 1, EmailServerPeer::MESS_SERVER => 2, EmailServerPeer::MESS_PORT => 3, EmailServerPeer::MESS_INCOMING_SERVER => 4, EmailServerPeer::MESS_INCOMING_PORT => 5, EmailServerPeer::MESS_RAUTH => 6, EmailServerPeer::MESS_ACCOUNT => 7, EmailServerPeer::MESS_PASSWORD => 8, EmailServerPeer::MESS_FROM_MAIL => 9, EmailServerPeer::MESS_FROM_NAME => 10, EmailServerPeer::SMTPSECURE => 11, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY => 12, EmailServerPeer::MAIL_TO => 13, EmailServerPeer::MESS_DEFAULT => 14, EmailServerPeer::OAUTH_CLIENT_ID => 15, EmailServerPeer::OAUTH_CLIENT_SECRET => 16, EmailServerPeer::OAUTH_REFRESH_TOKEN => 17, ), + BasePeer::TYPE_FIELDNAME => array ('MESS_UID' => 0, 'MESS_ENGINE' => 1, 'MESS_SERVER' => 2, 'MESS_PORT' => 3, 'MESS_INCOMING_SERVER' => 4, 'MESS_INCOMING_PORT' => 5, 'MESS_RAUTH' => 6, 'MESS_ACCOUNT' => 7, 'MESS_PASSWORD' => 8, 'MESS_FROM_MAIL' => 9, 'MESS_FROM_NAME' => 10, 'SMTPSECURE' => 11, 'MESS_TRY_SEND_INMEDIATLY' => 12, 'MAIL_TO' => 13, 'MESS_DEFAULT' => 14, 'OAUTH_CLIENT_ID' => 15, 'OAUTH_CLIENT_SECRET' => 16, 'OAUTH_REFRESH_TOKEN' => 17, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -234,6 +243,12 @@ abstract class BaseEmailServerPeer $criteria->addSelectColumn(EmailServerPeer::MESS_DEFAULT); + $criteria->addSelectColumn(EmailServerPeer::OAUTH_CLIENT_ID); + + $criteria->addSelectColumn(EmailServerPeer::OAUTH_CLIENT_SECRET); + + $criteria->addSelectColumn(EmailServerPeer::OAUTH_REFRESH_TOKEN); + } const COUNT = 'COUNT(EMAIL_SERVER.MESS_UID)'; @@ -564,6 +579,9 @@ abstract class BaseEmailServerPeer } } else { + if ($obj->isNew() || $obj->isColumnModified(EmailServerPeer::MESS_ENGINE)) + $columns[EmailServerPeer::MESS_ENGINE] = $obj->getMessEngine(); + } return BasePeer::doValidate(EmailServerPeer::DATABASE_NAME, EmailServerPeer::TABLE_NAME, $columns); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index a9b23a22b..f4fb66b9c 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -5004,6 +5004,12 @@ + + + + + + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 0d2445581..b89e52241 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -2781,6 +2781,9 @@ CREATE TABLE `EMAIL_SERVER` `MESS_TRY_SEND_INMEDIATLY` INTEGER default 0 NOT NULL, `MAIL_TO` VARCHAR(256) default '', `MESS_DEFAULT` INTEGER default 0 NOT NULL, + `OAUTH_CLIENT_ID` VARCHAR(256) default '' NOT NULL, + `OAUTH_CLIENT_SECRET` VARCHAR(256) default '' NOT NULL, + `OAUTH_REFRESH_TOKEN` VARCHAR(256) default '' NOT NULL, PRIMARY KEY (`MESS_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8'; #-----------------------------------------------------------------------------