Fix insecure flag

Author: mbilski

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,41 @@
+## Jira task - PUT_JIRA_LINK_HERE
+
+## BREAKING CHANGE - remove this line if your code doesn't introduce a breaking change
+
+## Release Notes Description (public)
+
+<!--- DESCRIPTION USED IN THE RELEASE NOTES
+
+Remove this comment and replace it with the description of your changes for an external audience. 
+This description will be pulled into public release notes.
+
+1. What changes are you introducing? Be clear and provide a detailed overview of your changes.
+2. Why are you introducing the changes? Make the intent of the changes clear.
+    - What do those changes mean for our end users?
+    - Why should they care?
+    - What is the context of your changes?
+
+Additionally:
+
+- If your changes are breaking changes, provide information on how the change affects our customers and what is required from them to be updated.
+  If you think a migration guide would be useful, let TWs know in advance.
+- If your changes deprecate an API, provide what is the alternative for our customers (if it exists). State clearly that an API became deprecated.
+-->
+
+## Implementation details (internal)
+
+<!--- Describe technical implementation details for peer reviewers -->
+
+## Information for QA
+
+<!-- [Place an '[X]' (no spaces) in all applicable fields.] -->
+
+- [ ] Is QA testing required?
+- [ ] Does PR contain unit tests?
+- [ ] Should QA create E2E tests for the change?
+
+## Additional QA Procedures (Optional)
+
+<!--- Describe what QA needs to do if needed -->
+
+## Screenshots (if appropriate):

README.md

@@ -142,9 +142,6 @@ oauth2c https://oauth2c.us.authz.cloudentity.io/oauth2c/demo \
   --assertion '{"sub":"[email protected]"}'
 ```
 
-> --signing-key can be also a local file. You can use https://mkjwk.org/ to generate it
-> remember to public part of the key in the client jwks
-
 ## Auth methods
 
 ### Client Secret Basic

cmd/oauth2.go

@@ -14,6 +14,7 @@ import (
 	"github.com/cloudentity/oauth2c/internal/oauth2"
 	"github.com/go-jose/go-jose/v3"
 	"github.com/golang-jwt/jwt"
+	"github.com/imdario/mergo"
 	"github.com/pkg/browser"
 	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"
@@ -60,7 +61,10 @@ var OAuth2Cmd = &cobra.Command{
 				os.Exit(1)
 			}
 
-			cconfig = config.ToClientConfig()
+			if err := mergo.Merge(&cconfig, config.ToClientConfig()); err != nil {
+				pterm.Error.PrintOnError(err)
+				os.Exit(1)
+			}
 		} else {
 			cconfig.IssuerURL = strings.TrimSuffix(args[0], oauth2.OpenIDConfigurationPath)
 		}
@@ -178,7 +182,7 @@ func Authorize(clientConfig oauth2.ClientConfig, hc *http.Client) error {
 		clientConfig.IssuerURL,
 		hc,
 	); err != nil {
-		LogRequestAndResponseln(serverRequest, err)
+		LogRequestln(serverRequest)
 		return err
 	}
 

go.mod

@@ -5,6 +5,7 @@ go 1.18
 require (
 	github.com/go-jose/go-jose/v3 v3.0.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
+	github.com/imdario/mergo v0.3.13
 	github.com/lithammer/shortuuid/v4 v4.0.0
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/pkg/errors v0.9.1

go.sum

@@ -28,6 +28,8 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
 github.com/gookit/color v1.5.0 h1:1Opow3+BWDwqor78DcJkJCIwnkviFi+rrOANki9BUFw=
 github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
@@ -113,5 +115,6 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=