Merge pull request #9 from carllhw/feature-cas-url

Add support for CAS server URLs without a trailing slash, fixes the login/logout and other route generation.

.gitignore

@@ -22,3 +22,5 @@ _testmain.go
 *.exe
 *.test
 *.prof
+
+.vscode

client.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"path"
 	"sync"
 
 	"github.com/golang/glog"
@@ -90,7 +91,7 @@ func requestURL(r *http.Request) (*url.URL, error) {
 
 // LoginUrlForRequest determines the CAS login URL for the http.Request.
 func (c *Client) LoginUrlForRequest(r *http.Request) (string, error) {
-	u, err := c.url.Parse("login")
+	u, err := c.url.Parse(path.Join(c.url.Path, "login"))
 	if err != nil {
 		return "", err
 	}
@@ -109,7 +110,7 @@ func (c *Client) LoginUrlForRequest(r *http.Request) (string, error) {
 
 // LogoutUrlForRequest determines the CAS logout URL for the http.Request.
 func (c *Client) LogoutUrlForRequest(r *http.Request) (string, error) {
-	u, err := c.url.Parse("logout")
+	u, err := c.url.Parse(path.Join(c.url.Path, "logout"))
 	if err != nil {
 		return "", err
 	}
@@ -119,7 +120,7 @@ func (c *Client) LogoutUrlForRequest(r *http.Request) (string, error) {
 
 // ServiceValidateUrlForRequest determines the CAS serviceValidate URL for the ticket and http.Request.
 func (c *Client) ServiceValidateUrlForRequest(ticket string, r *http.Request) (string, error) {
-	u, err := c.url.Parse("serviceValidate")
+	u, err := c.url.Parse(path.Join(c.url.Path, "serviceValidate"))
 	if err != nil {
 		return "", err
 	}
@@ -139,7 +140,7 @@ func (c *Client) ServiceValidateUrlForRequest(ticket string, r *http.Request) (s
 
 // ValidateUrlForRequest determines the CAS validate URL for the ticket and http.Request.
 func (c *Client) ValidateUrlForRequest(ticket string, r *http.Request) (string, error) {
-	u, err := c.url.Parse("validate")
+	u, err := c.url.Parse(path.Join(c.url.Path, "validate"))
 	if err != nil {
 		return "", err
 	}