[stable10] Backport of Make email field as default to create user

Make email field as default to create user.
Previously we had username, password. With
this change it becomes username, email. This
would help admins to create users with email
address.

Signed-off-by: Sujith H <sharidasan@owncloud.com>

lib/public/InvalidUserTokenException.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @author Sujith Haridasan <sharidasan@owncloud.com>
+ *
+ * @copyright Copyright (c) 2018, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP;
+
+/**
+ * Class InvalidUserTokenException
+ *
+ * @package OCP
+ * @since 10.0.10
+ */
+class InvalidUserTokenException extends UserTokenException {
+	/**
+	 * InvalidUserTokenException constructor.
+	 *
+	 * @param string $message
+	 * @param int $code
+	 * @since 10.0.10
+	 */
+	public function __construct($message = "", $code = 0) {
+		parent::__construct($message, $code, $this);
+	}
+}

lib/public/UserTokenException.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * @author Sujith Haridasan <sharidasan@owncloud.com>
+ *
+ * @copyright Copyright (c) 2018, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP;
+
+/**
+ * Class UserTokenException
+ *
+ * @package OCP
+ * @since 10.0.10
+ */
+class UserTokenException extends \Exception {
+	/**
+	 * UserTokenException constructor.
+	 *
+	 * @param string $message
+	 * @param $code
+	 * @param \Exception|null $previous
+	 * @since 10.0.10
+	 */
+	public function __construct($message = "", $code, \Exception $previous = null) {
+		parent::__construct($message, $code, $previous);
+	}
+}

lib/public/UserTokenExpiredException.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @author Sujith Haridasan <sharidasan@owncloud.com>
+ *
+ * @copyright Copyright (c) 2018, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP;
+
+/**
+ * Class UserTokenExpiredException
+ *
+ * @package OCP
+ * @since 10.0.10
+ */
+class UserTokenExpiredException extends UserTokenException {
+	/**
+	 * UserTokenExpiredException constructor.
+	 *
+	 * @param string $message
+	 * @param int $code
+	 * @since 10.0.10
+	 */
+	public function __construct($message = "", $code = 0) {
+		parent::__construct($message, $code, $this);
+	}
+}

lib/public/UserTokenMismatchException.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @author Sujith Haridasan <sharidasan@owncloud.com>
+ *
+ * @copyright Copyright (c) 2018, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP;
+
+/**
+ * Class UserTokenMismatchException
+ *
+ * @package OCP
+ * @since 10.0.10
+ */
+class UserTokenMismatchException extends UserTokenException {
+	/**
+	 * UserTokenMismatchException constructor.
+	 *
+	 * @param string $message
+	 * @param int $code
+	 * @since 10.0.10
+	 */
+	public function __construct($message = "", $code = 0) {
+		parent::__construct($message, $code, $this);
+	}
+}

settings/Application.php

@@ -158,7 +158,8 @@ public function __construct(array $urlParams=[]) {
 				$c->query('DefaultMailAddress'),
 				$c->query('URLGenerator'),
 				$c->query('OCP\\App\\IAppManager'),
-				$c->query('OCP\\IAvatarManager')
+				$c->query('OCP\\IAvatarManager'),
+				$c->query('ServerContainer')->getEventDispatcher()
 			);
 		});
 		$container->registerService('LogSettingsController', function (IContainer $c) {