Merge pull request #23 from tristanwietsma/newkey

newkey

keymakers.go

@@ -33,3 +33,17 @@ func NewHOTPKey(label, secret, issuer string, algo Hash, digits, counter int) (*
 	k, err := newKey("hotp", label, secret, issuer, algo, digits, 0, counter)
 	return k, err
 }
+
+// Returns a new Key given a OTPAUTH URI.
+func NewKey(uri string) (*Key, error) {
+	k := Key{}
+	if err := k.FromURI(uri); err != nil {
+		return &k, err
+	}
+
+	if _, err := k.IsValid(); err != nil {
+		return &k, err
+	}
+
+	return &k, nil
+}

keymakers_test.go

@@ -56,3 +56,21 @@ func TestNewHOTPKey(t *testing.T) {
 		t.Error("failed to build new hotp key")
 	}
 }
+
+func TestNewKeyFromURI(t *testing.T) {
+	uri := "otpauth://totp/label?secret=MFRGGZDFMZTWQ2LK&issuer=theIssuer&algo=SHA512"
+	if _, err := NewKey(uri); err != nil {
+		t.Errorf("Constructor failed:\n%v", err)
+	}
+
+	uri = "blahblah"
+	if _, err := NewKey(uri); err == nil {
+		t.Error("Should have failed...")
+	}
+
+	uri = "otpauth://totp/label?secret=MFRGGZDFMZTWQ2LK&issuer=theIssuer&algo=SHA512&period=0"
+	if _, err := NewKey(uri); err == nil {
+		t.Error("Should have failed...")
+	}
+
+}