1 files changed, 14 insertions, 1 deletions
diff --git a/internal/server/common.go b/internal/server/common.go
index fcba07f..2ab282d 100644
--- a/internal/server/common.go
+++ b/internal/server/common.go
@@ -253,8 +253,21 @@ func ShouldRenewButton(server Server) bool {
 	return true
 }
 
+func GetISS(server Server) (string, error) {
+	base, baseErr := server.GetBase()
+	if baseErr != nil {
+		return "", &types.WrappedErrorMessage{Message: "failed getting server ISS", Err: baseErr}
+	}
+	// The base URL does not end with a /, but the ISS does
+	return base.URL + "/", nil
+}
+
 func GetOAuthURL(server Server, name string) (string, error) {
-	return server.GetOAuth().GetAuthURL(name, server.GetTemplateAuth())
+	iss, issErr := GetISS(server)
+	if issErr != nil {
+		return "", issErr
+	}
+	return server.GetOAuth().GetAuthURL(name, iss, server.GetTemplateAuth())
 }
 
 func OAuthExchange(server Server) error {