From d7990807f019c23dba7b349e2b112199a0e7667c Mon Sep 17 00:00:00 2001
From: "David J. Allen" <allend@lanl.gov>
Date: Wed, 17 Apr 2024 17:24:56 -0600
Subject: [PATCH] Minor changes

---
 internal/login.go              | 5 +++--
 internal/new.go                | 4 ++++
 internal/oauth/authenticate.go | 3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/internal/login.go b/internal/login.go
index 2ab0b04..e9c6374 100644
--- a/internal/login.go
+++ b/internal/login.go
@@ -41,7 +41,7 @@ func Login(config *Config, client *oauth.Client, provider *oidc.IdentityProvider
 		// print the authorization URL for sharing
 		var authorizationUrl = client.BuildAuthorizationUrl(provider.Endpoints.Authorization, state)
 		s := NewServerWithConfig(config)
-		fmt.Printf("Login with identity provider:\n\n  %s/login\n  %s\n\n",
+		fmt.Printf("Login with external identity provider:\n\n  %s/login\n  %s\n\n",
 			s.GetListenAddr(), authorizationUrl,
 		)
 
@@ -87,7 +87,7 @@ func Login(config *Config, client *oauth.Client, provider *oidc.IdentityProvider
 				Client: authzClient,
 			},
 		}
-		err = s.Start(button, provider, client, params)
+		err = s.StartLogin(button, provider, client, params)
 		if errors.Is(err, http.ErrServerClosed) {
 			fmt.Printf("\n=========================================\nServer closed.\n=========================================\n\n")
 		} else if err != nil {
@@ -110,6 +110,7 @@ func Login(config *Config, client *oauth.Client, provider *oidc.IdentityProvider
 }
 
 func MakeButton(url string, text string) string {
+	// check if we have http:// a
 	html := "<input type=\"button\" "
 	html += "class=\"button\" "
 	html += fmt.Sprintf("onclick=\"window.location.href='%s';\" ", url)
diff --git a/internal/new.go b/internal/new.go
index 7447ad1..2b2bad8 100644
--- a/internal/new.go
+++ b/internal/new.go
@@ -90,6 +90,10 @@ func NewServerWithConfig(conf *Config) *server.Server {
 		},
 		Host: host,
 		Port: port,
+		Issuer: server.Issuer{
+			Host: conf.Server.Issuer.Host,
+			Port: conf.Server.Issuer.Port,
+		},
 	}
 	return server
 }
diff --git a/internal/oauth/authenticate.go b/internal/oauth/authenticate.go
index 16cff56..5724526 100644
--- a/internal/oauth/authenticate.go
+++ b/internal/oauth/authenticate.go
@@ -21,8 +21,7 @@ func (client *Client) BuildAuthorizationUrl(issuer string, state string) string
 		"&redirect_uri=" + url.QueryEscape(strings.Join(client.RedirectUris, ",")) +
 		"&response_type=code" + // this has to be set to "code"
 		"&state=" + state +
-		"&scope=" + strings.Join(client.Scope, "+") +
-		"&resource=" + url.QueryEscape("http://127.0.0.1:4444/oauth2/token")
+		"&scope=" + strings.Join(client.Scope, "+")
 }
 
 func (client *Client) InitiateLoginFlow(loginUrl string) error {