!426 · krz/gitbay

.gitbay/wiki/Quickstart.org +12 −1

	@@ -1,6 +1,17 @@
1	#+title: Quickstart	1	#+title: Quickstart
2		2
3	1. Install the CLI: =go install gitbay.org/gitbay/cmd/gitbay@latest=	3	* From the browser
		4
		5	1. Create an account at https://gitbay.org/register with your SSH public key
		6	2. Verify the code from the mail under Settings
		7	3. + New repository
		8	4. Clone with the SSH command the repository shows
		9	5. Push
		10
		11	* From the terminal
		12
		13	1. Install the CLI: =brew install krz/tap/gitbay= on a Mac, or
		14	=go install gitbay.org/gitbay/cmd/gitbay@latest=
4	2. =ssh git@gitbay.org whoami= — your key is your identity	15	2. =ssh git@gitbay.org whoami= — your key is your identity
5	3. =gitbay repo create you/hello= then push	16	3. =gitbay repo create you/hello= then push
6	4. =gitbay issue create --title "first"= from inside the clone	17	4. =gitbay issue create --title "first"= from inside the clone

.gitbay/wiki/SSH-keys.org +1 −1

	@@ -25,7 +25,7 @@ whole line is what the registration form and =register= want.
25	* Check it works	25	* Check it works
26		26
27	#+begin_src sh	27	#+begin_src sh
28	ssh git@<host> whoami	28	ssh git@gitbay.org whoami
29	#+end_src	29	#+end_src
30		30
31	More keys, labels and scopes: [[Users][the user guide]] under "SSH keys".	31	More keys, labels and scopes: [[Users][the user guide]] under "SSH keys".

e2e/registration_test.go +3

 	if !strings.Contains(msg, "To: dana@example.test") || !strings.Contains(msg, "From: noreply@gitbay.test") {
 		t.Fatalf("mail headers:\n%s", msg)
 	}
+	if !strings.Contains(msg, "/login") {
+		t.Fatalf("mail missing web sign-in path:\n%s", msg)
+	}
 	// Pending: the key authenticates, whoami works, but everything else is
 	// gated — control commands and git alike.

e2e/websignup_test.go +2 −1

 	// The real thing: account is active immediately (invite proves the mailbox).
 	status, body = browserPost(t, browser, inst.base()+"/register", url.Values{
 		"username": {"erin"}, "invite": {inviteCode}, "key": {string(pub)}})
-	if status != 200 || !strings.Contains(body, "welcome, erin") {
+	if status != 200 || !strings.Contains(body, "welcome, erin") ||
+		!strings.Contains(body, `href="/settings"`) || !strings.Contains(body, "paste the code") {
 		t.Fatalf("signup: %d\n%s", status, body)
 	}
 	out, errOut, code := inst.ssh(t, key, "", "whoami")

internal/control/register.go +2 −1

 	body := fmt.Sprintf(
 		"Someone (hopefully you) added this address to an account on %s.\n\n"+
 			"To verify it, run:\n\n    ssh git@%s email verify %s\n\n"+
+			"Or sign in at https://%s/login with this address and paste the code under Settings.\n\n"+
 			"The code expires in 24 hours. If this wasn't you, ignore this mail.\n",
-		siteHost(cfg), siteHost(cfg), code)
+		siteHost(cfg), siteHost(cfg), code, siteHost(cfg))
 	return mail.Send(cfg, address, "verify your email on "+siteHost(cfg), body)
 }

internal/web/templates/registered.html +5 −1

 <div class="landing">
 <h1>Welcome, {{.Username}}</h1>
 <pre class="quickstart">{{.Message}}</pre>
-<p>Everything runs over SSH with the key you registered:</p>
+<h2>On the web</h2>
+<p>Check your mail for the code, <a href="/login">sign in</a> with an emailed
+link, and paste the code under <a href="/settings">Settings</a>. Then +
+creates your first repository.</p>
+<h2>From the terminal</h2>
 <pre class="quickstart">ssh git@{{.Host}} whoami
 ssh git@{{.Host}} repo create {{.Username}}/hello
 gitbay web login        # mints a browser session from your terminal</pre>

web, wiki: the newcomer route says where the code goes !426