add userinfo (username/password) (#25)

* add userinfo (username/password)

* add go 1.18 and 1.19 tests

* update authority to include userinfo instead of scheme

Author: jbsmith7741

.github/workflows/test.yml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.13.x, 1.14.x, 1.15.x, 1.16.x, 1.17.x]
+        go-version: [1.13.x, 1.14.x, 1.15.x, 1.16.x, 1.17.x, 1.18.x, 1.19.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:

README.md

@@ -12,15 +12,21 @@ Known Issues:
 
 # uri
 
-A convenient and easy way to convert from a uri to a struct or vic-versa.
+A convenient and easy way to convert from a uri to a struct or vic-versa. [wikipedia](https://en.wikipedia.org/wiki/Uniform_Resource_Identifier)
 
-## keywords
+![](./assets/URI_syntax_diagram.svg.png)
 
+## special keywords
+
+- origin (scheme:host/path) 
 - scheme
-- host
-- path
-- authority (schema:host)
-- origin (schema:host/path)
+- authority (userinfo@host)
+  - userinfo
+    - username
+    - password 
+  - host (includes port)
+  - port 
+- fragment 
 
 ## struct tags
 

assets/URI_syntax_diagram.svg.png

@@ -25,9 +25,12 @@ const (
 	scheme    = "scheme"
 	host      = "host"
 	path      = "path"
+	userinfo  = "userinfo"
+	password  = "password"
+	username  = "username"
 	filename  = "filename"
-	authority = "authority" // scheme://host
-	origin    = "origin"    // scheme://host/path
+	authority = "authority" // userinfo@host
+	origin    = "origin"    // scheme://host/path - see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin
 	fragment  = "fragment"  // anything after hash #
 )
 
@@ -101,6 +104,20 @@ func parseStruct(u *url.URL, uVal *url.Values, vStruct reflect.Value) {
 		case fragment:
 			u.Fragment = fs
 			continue
+		case userinfo:
+			u.User = url.User(fs)
+			continue
+		case username:
+			p, set := u.User.Password()
+			if set {
+				u.User = url.UserPassword(fs, p)
+			} else {
+				u.User = url.User(fs)
+			}
+			continue
+		case password:
+			u.User = url.UserPassword(u.User.Username(), fs)
+			continue
 		case origin: // scheme://host/path
 			l, err := url.Parse(fs)
 			if err == nil {
@@ -109,11 +126,11 @@ func parseStruct(u *url.URL, uVal *url.Values, vStruct reflect.Value) {
 				u.Path = l.Path
 			}
 			continue
-		case authority: // scheme://host
+		case authority: //userinfo@host
 			l, err := url.Parse(fs)
 			if err == nil {
+				u.User = l.User
 				u.Host = l.Host
-				u.Scheme = l.Scheme
 			}
 			continue
 		case "-": // skip disabled fields

marshal.go

@@ -211,9 +211,27 @@ func TestMarshal(t *testing.T) {
 			Input: struct {
 				Authority string `uri:"authority"`
 			}{
-				Authority: "http://localhost:8080/path/to/file.txt",
+				Authority: "http://user:pass@localhost:8080/path/to/file.txt",
 			},
-			Expected: "http://localhost:8080",
+			Expected: "//user:pass@localhost:8080",
+		},
+		"username_password": {
+			Input: struct {
+				Password string `uri:"password"`
+				Username string `uri:"username"`
+			}{
+				Username: "user",
+				Password: "pass",
+			},
+			Expected: "//user:pass@",
+		},
+		"userinfo": {
+			Input: struct {
+				UserInfo string `uri:"userinfo"`
+			}{
+				UserInfo: "userinfo:asd",
+			},
+			Expected: "//userinfo:asd@",
 		},
 		/* how should this case be handled?
 		"origin override": {

marshal_test.go

@@ -80,6 +80,12 @@ func Unmarshal(uri string, v interface{}) error {
 			data = u.Host
 		case path:
 			data = u.Path
+		case userinfo:
+			data = u.User.String()
+		case username:
+			data = u.User.Username()
+		case password:
+			data, _ = u.User.Password()
 		case filename:
 			_, data = filepath.Split(u.Path)
 		case origin:
@@ -88,7 +94,10 @@ func Unmarshal(uri string, v interface{}) error {
 				data = u.Path
 			}
 		case authority:
-			data = fmt.Sprintf("%s://%s", u.Scheme, u.Host)
+			data = u.Host
+			if userinfo := u.User.String(); userinfo != "" {
+				data = fmt.Sprintf("%s@%s", userinfo, u.Host)
+			}
 		case fragment:
 			data = u.Fragment
 		default:

unmarshal.go

@@ -375,20 +375,40 @@ func TestTags(t *testing.T) {
 			uri: "https://localhost:8080/usr/bin",
 			expected: &struct {
 				Authority string `uri:"authority"`
-			}{Authority: "https://localhost:8080"},
+			}{Authority: "localhost:8080"},
+		},
+		"Authority with userinfo": {
+			uri: "https://user:pass@localhost:8080/usr/bin",
+			expected: &struct {
+				Authority string `uri:"authority"`
+			}{Authority: "user:pass@localhost:8080"},
 		},
 		"Origin uri tag": {
 			uri: "https://localhost:8080/usr/bin",
 			expected: &struct {
 				Origin string `uri:"Origin"`
 			}{Origin: "https://localhost:8080/usr/bin"},
 		},
+		"Origin with userinfo": {
+			uri: "https://user:pass@localhost:8080/usr/bin",
+			expected: &struct {
+				Origin string `uri:"Origin"`
+			}{Origin: "https://localhost:8080/usr/bin"},
+		},
 		"Origin uri tag without authority": {
 			uri: "/usr/bin",
 			expected: &struct {
 				Origin string `uri:"Origin"`
 			}{Origin: "/usr/bin"},
 		},
+		"userinfo": {
+			uri: "//user:pass@localhost:8080/usr/bin",
+			expected: &struct {
+				Username string `uri:"username"`
+				Password string `uri:"password"`
+				UserInfo string `uri:"userinfo"`
+			}{Username: "user", Password: "pass", UserInfo: "user:pass"},
+		},
 		"Custom int name": {
 			uri: "?NewInt=10",
 			expected: &struct {