Surface errors to web UI, ensure user has at least one SSH key

dan-v · May 30, 2017 · 6c3fce5 · 6c3fce5
1 parent 47f1bb5
commit 6c3fce5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/deploy.go b/deploy.go
@@ -2,6 +2,7 @@ package dosxvpn
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -88,6 +89,9 @@ func Deploy(accessToken string, opts ...Option) (*Droplet, error) {
 	if err != nil {
 		return nil, err
 	}
+	if len(sshKeys) == 0 {
+		return nil, errors.New("Need at least one SSH key uploaded to your DigitalOcean account. Go add an SSH key: https://cloud.digitalocean.com/settings/security")
+	}
 	for _, key := range sshKeys {
 		keyToAdd := godo.DropletCreateSSHKey{ID: key.ID}
 		createRequest.SSHKeys = append(createRequest.SSHKeys, keyToAdd)

diff --git a/static/progress_bar.js b/static/progress_bar.js
@@ -54,10 +54,13 @@ $(document).ready(function() {
               }
               $('#mobileconfig').css('display', 'block');
               $('#exit').css('display', 'block')
-              updateProgressBar(100);;
+              updateProgressBar(100);
           } else {
-              $('status-line').text('Install failed: ' + resp.status);
+              $('#status-line').text('Install failed: ' + resp.status);
               updateProgressBar(0);
+              $('#initial-ip').text('');
+              $('#initial-ip').wrap('<a href="/"/>Retry Installation</a>');
+              return;
           }
 
           if (resp.status != 'done') {