[GinR] Invite Collaborator with mail

closes #11

conf/locale/locale_en-US.ini

@@ -778,6 +778,9 @@ settings.collaborator_deletion = Collaborator Deletion
 settings.collaborator_deletion_desc = This user will no longer have collaboration access to this repository after deletion. Do you want to continue?
 settings.remove_collaborator_success = Collaborator has been removed.
 settings.search_user_placeholder = Search user...
+settings.invite_collaborator=Invite Collaborator
+settings.invite_placeholder=Enter mail adress to invite
+settings.invite_collaborator_warn=Be aware! This will send out invitation mails!
 settings.org_not_allowed_to_be_collaborator = Organization is not allowed to be added as a collaborator.
 settings.add_webhook = Add Webhook
 settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in GIN, we will handle the notification to the target host you specify. Learn more in this <a target="_blank" href="%s">Webhooks Guide</a>.

pkg/mailer/mail.go

@@ -21,6 +21,7 @@ const (
 	MAIL_AUTH_ACTIVATE_EMAIL  = "auth/activate_email"
 	MAIL_AUTH_RESET_PASSWORD  = "auth/reset_passwd"
 	MAIL_AUTH_REGISTER_NOTIFY = "auth/register_notify"
+	MAIL_AUTH_INVITE_NOTIFY   = "auth/invite_email"
 
 	MAIL_ISSUE_COMMENT = "issue/comment"
 	MAIL_ISSUE_MENTION = "issue/mention"
@@ -84,6 +85,9 @@ func SendUserMail(c *macaron.Context, u User, tpl, code, subject, info string) {
 		"ActiveCodeLives":   setting.Service.ActiveCodeLives / 60,
 		"ResetPwdCodeLives": setting.Service.ResetPwdCodeLives / 60,
 		"Code":              code,
+		"Account":           c.Data["Account"],
+		"Inviter":           c.Data["Inviter"],
+		"Pw":                c.Data["Pw"],
 	}
 	body, err := mailRender.HTMLString(string(tpl), data)
 	if err != nil {
@@ -101,6 +105,10 @@ func SendActivateAccountMail(c *macaron.Context, u User) {
 	SendUserMail(c, u, MAIL_AUTH_ACTIVATE, u.GenerateActivateCode(), c.Tr("mail.activate_account"), "activate account")
 }
 
+func SendInviteMail(c *macaron.Context, u User) {
+	SendUserMail(c, u, MAIL_AUTH_INVITE_NOTIFY, u.GenerateActivateCode(), c.Tr("mail.invite_account"), "invite account")
+}
+
 func SendResetPasswordMail(c *macaron.Context, u User) {
 	SendUserMail(c, u, MAIL_AUTH_RESET_PASSWORD, u.GenerateActivateCode(), c.Tr("mail.reset_password"), "reset password")
 }

public/css/gogs.css

@@ -2364,6 +2364,11 @@ footer .ui.language .menu {
 .repository.settings.collaboration #repo-collab-form #search-user-box .results {
   left: 7px;
 }
+
+.ui.segment.results.hide {
+  z-index: 1000;
+}
+
 .repository.settings.collaboration #repo-collab-form .ui.button {
   margin-left: 5px;
   margin-top: -3px;

routes/repo/setting.go

@@ -19,6 +19,9 @@ import (
 	"github.com/G-Node/gogs/pkg/form"
 	"github.com/G-Node/gogs/pkg/mailer"
 	"github.com/G-Node/gogs/pkg/setting"
+	"github.com/dustinkirkland/golang-petname"
+
+
 )
 
 const (
@@ -304,8 +307,40 @@ func SettingsCollaboration(c *context.Context) {
 	c.HTML(200, SETTINGS_COLLABORATION)
 }
 
+func inviteWithMail(c *context.Context, mail string) (*models.User, error) {
+	name := petname.Generate(2, "_")
+	pw := petname.Generate(3, "")
+	user := models.User{
+		Name:     name,
+		Passwd:   pw,
+		Email:    mail,
+		IsActive: true}
+	err := models.CreateUser(&user)
+	if err != nil {
+		return nil, err
+	}
+	log.Info("User: %s created", user.Name, pw)
+	c.Context.Data["Account"] = user.Name
+	c.Context.Data["Inviter"] = c.User.Name
+	c.Context.Data["Pw"] = pw
+	mailer.SendInviteMail(c.Context, models.NewMailerUser(&user))
+	return &user, nil
+}
 func SettingsCollaborationPost(c *context.Context) {
-	name := strings.ToLower(c.Query("collaborator"))
+	var name string
+	new := strings.ToLower(c.Query("invite"))
+	if len(new) > 0 {
+		u, err := inviteWithMail(c, new)
+		if err != nil {
+			log.Info("Problem with inviting user:%s, %+v", new, err)
+			c.Flash.Error(c.Tr("form.user_not_invitable"))
+			c.Redirect(setting.AppSubURL + c.Req.URL.Path)
+			return
+		}
+		name = u.Name
+	} else {
+		name = strings.ToLower(c.Query("collaborator"))
+	}
 	if len(name) == 0 || c.Repo.Owner.LowerName == name {
 		c.Redirect(setting.AppSubURL + c.Req.URL.Path)
 		return
@@ -321,7 +356,6 @@ func SettingsCollaborationPost(c *context.Context) {
 		}
 		return
 	}
-
 	// Organization is not allowed to be added as a collaborator
 	if u.IsOrganization() {
 		c.Flash.Error(c.Tr("repo.settings.org_not_allowed_to_be_collaborator"))
@@ -329,7 +363,7 @@ func SettingsCollaborationPost(c *context.Context) {
 		return
 	}
 
-	if err = c.Repo.Repository.AddCollaborator(u); err != nil {
+	if err := c.Repo.Repository.AddCollaborator(u); err != nil {
 		c.Handle(500, "AddCollaborator", err)
 		return
 	}

templates/repo/settings/collaboration.tmpl

@@ -38,7 +38,7 @@
 						</div>
 					{{end}}
 				</div>
-				<div class="ui bottom attached segment">
+				<div class="ui attached segment">
 					<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
 						{{.CSRFTokenHTML}}
 						<div class="inline field ui left">
@@ -52,6 +52,21 @@
 						<button class="ui green button">{{.i18n.Tr "repo.settings.add_collaborator"}}</button>
 					</form>
 				</div>
+				<div class="ui bottom attached segment">
+					<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
+						{{.CSRFTokenHTML}}
+						<div class="inline field ui left">
+							<div id="invite">
+								<div class="ui input">
+									<input class="prompt" name="invite" type="email" placeholder="{{.i18n.Tr "repo.settings.invite_placeholder"}}"
+									autocomplete="off" autofocus required>
+								</div>
+							</div>
+						</div>
+						<button class="ui yellow button"
+										data-tooltip="{{.i18n.Tr "repo.settings.invite_collaborator_warn"}}">{{.i18n.Tr "repo.settings.invite_collaborator"}}</button>
+					</form>
+				</div>
 			</div>
 		</div>
 	</div>

vendor/github.com/dustinkirkland/golang-petname/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

vendor/github.com/dustinkirkland/golang-petname/README.md

@@ -0,0 +1,109 @@
+# petname
+
+## NAME []()
+
+**petname** − a utility to generate "pet names", consisting of a random combination of adverbs, an adjective, and an animal name
+
+## SYNOPSIS []()
+
+**petname** \[-w|--words INT\] \[-l|--letters INT\] \[-s|--separator STR\] \[-d|--dir STR\] \[-c|--complexity INT\] \[-u|--ubuntu\]
+
+## OPTIONS []()
+- -w|--words number of words in the name, default is 2
+- -l|--letters maximum number of letters in each word, default is unlimited
+- -s|--separator string used to separate name words, default is ’-’
+- -d|--dir directory containing adverbs.txt, adjectives.txt, names.txt, default is */usr/share/petname/*
+- -c|--complexity \[0, 1, 2\]; 0 = easy words, 1 = standard words, 2 = complex words, default=1
+- -u|--ubuntu generate ubuntu-style names, alliteration of first character of each word
+
+## DESCRIPTION []()
+
+This utility will generate "pet names", consisting of a random combination of an adverb, adjective, and an animal name. These are useful for unique hostnames or container names, for instance.
+
+As such, PetName tries to follow the tenets of Zooko’s triangle. Names are:
+
+- human meaningful
+- decentralized
+- secure
+
+## EXAMPLES []()
+
+```
+$ petname
+wiggly-yellowtail
+
+$ petname --words 1
+robin
+
+$ petname --words 3
+primly-lasting-toucan
+
+$ petname --words 4
+angrily-impatiently-sage-longhorn
+
+$ petname --separator ":"
+cool:gobbler
+
+$ petname --separator "" --words 3
+comparablyheartylionfish
+
+$ petname --ubuntu
+amazed-asp
+
+$ petname --complexity 0
+massive-colt
+```
+
+## CODE []()
+
+Besides this shell utility, there are also native libraries: python-petname, python3-petname, and golang-petname. Here are some programmatic examples in code:
+
+**Golang Example**
+```golang
+package main
+
+import (
+	"flag"
+	"fmt"
+	"github.com/dustinkirkland/golang-petname"
+)
+
+var (
+	words = flag.Int("words", 2, "The number of words in the pet name")
+	separator = flag.String("separator", "-", "The separator between words in the pet name")
+)
+
+func main() {
+	flag.Parse()
+	fmt.Println(petname.Generate(\*words, \*separator))
+}
+```
+
+**Python Example**
+See: https://pypi.golang.org/pypi/petname
+
+```
+$ pip3 install petname
+$ sudo apt-get install python3-petname
+```
+
+```python
+#!/usr/bin/python3
+import argparse
+import petname
+
+parser = argparse.ArgumentParser(description="Generate human readable random names")
+parser.add_argument("-w", "--words", help="Number of words in name, default=2", default=2)
+parser.add_argument("-s", "--separator", help="Separator between words, default='-'", default="-")
+parser.options = parser.parse_args()
+
+print petname.Generate(int(parser.options.words), parser.options.separator)
+```
+
+## AUTHOR []()
+
+This manpage and the utility were written by Dustin Kirkland <dustin.kirkland@gmail.com> for Ubuntu systems (but may be used by others). Permission is granted to copy, distribute and/or modify this document and the utility under the terms of the Apache2 License.
+
+The complete text of the Apache2 License can be found in */usr/share/common-licenses/Apache-2.0* on Debian/Ubuntu systems.
+
+------------------------------------------------------------------------

vendor/github.com/dustinkirkland/golang-petname/golang-petname.1

@@ -0,0 +1,51 @@
+.TH golang-petname 1 "15 December 2014" golang-petname "golang-petname"
+.SH NAME
+golang-petname \- utility to generate "pet names", consisting of a random combination of adverbs, an adjective, and a proper name
+
+.SH SYNOPSIS
+\fBgolang-petname\fP [-w|--words INT] [-s|--separator STR]
+
+.SH OPTIONS
+
+    --words            number of words in the name, default is 2
+    --separator        string used to separate name words, default is '-'
+
+.SH DESCRIPTION
+
+This utility will generate "pet names", consisting of a random combination of an adverb, adjective, and proper name.  These are useful for unique hostnames, for instance.
+
+The default packaging contains about 2000 names, 1300 adjectives, and 4000 adverbs, yielding nearly 10 billion unique combinations, covering over 32 bits of unique namespace.
+
+As such, PetName tries to follow the tenets of Zooko's triangle.  Names are:
+
+ - human meaningful
+ - decentralized
+ - secure
+
+.SH EXAMPLES
+
+    $ golang-petname
+    wiggly-Anna
+
+    $ golang-petname --words 1
+    Marco
+
+    $ golang-petname --words 3
+    quickly-scornful-Johnathan
+
+    $ golang-petname --words 4
+    dolorously-leisurely-wee-Susan
+
+    $ golang-petname --separator ":"
+    hospitable:Isla
+
+    $ golang-petname --separator "" --words 3
+    adeptlystaticNicole
+
+.SH SEE ALSO
+\fIpetname\fP(1)
+
+.SH AUTHOR
+This manpage and the utility were written by Dustin Kirkland <dustin.kirkland@gmail.com> for Ubuntu systems (but may be used by others).  Permission is granted to copy, distribute and/or modify this document and the utility under the terms of the Apache2 License.
+
+The complete text of the Apache2 License can be found in \fI/usr/share/common-licenses/Apache-2.0\fP on Debian/Ubuntu systems.

vendor/vendor.json

@@ -103,6 +103,12 @@
 			"revision": "9e40d9d5d325edfaa84d3374bfde6e1adce02d58",
 			"revisionTime": "2017-01-17T17:39:00Z"
 		},
+		{
+			"checksumSHA1": "PvxFk8o4Lr9oqxkdJmuEfh4gaS0=",
+			"path": "github.com/dustinkirkland/golang-petname",
+			"revision": "d3c2ba80e75eeef10c5cf2fc76d2c809637376b3",
+			"revisionTime": "2017-09-21T22:06:37Z"
+		},
 		{
 			"checksumSHA1": "XEBl9iQQvfXNlwCSzyAOCqAlYEA=",
 			"path": "github.com/fatih/color",