Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.SpamasaurusRex

## [1.0.8](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.7...v1.0.8) (2024-03-09)

### Bug Fixes

* Replace bogus scope with correct value ([44bf4e4](44bf4e4888))

.gitea/workflows/actions.yaml

@@ -54,6 +54,7 @@ jobs:
       - name: Kaniko build
         uses: aevea/action-kaniko@master
         with:
+          extra_args: -x
           registry: code.spamasaurus.com
           image: djpbessems/spamasaurusrex
           username: ${{ secrets.GIT_USERNAME }}

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.0.8](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.7...v1.0.8) (2024-03-09)
+
+
+### Bug Fixes
+
+* Replace bogus scope with correct value ([44bf4e4](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/44bf4e4888738afebd28ad717153113753afd5f2))
+
+## [1.0.7](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.6...v1.0.7) (2024-03-09)
+
+
+### Bug Fixes
+
+* Expand scope of debugging variable ([3dbfb4a](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/3dbfb4a917fa5f886c52f0ae11c1cab73ecb7713))
+
+## [1.0.6](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.5...v1.0.6) (2024-03-09)
+
+
+### Bug Fixes
+
+* Add verbose debugging output ([b4d866b](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/b4d866bbe8cf3f9632fdf69de4f15779c0099a9f))
+
 ## [1.0.5](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.4...v1.0.5) (2024-03-08)
 
 

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
 	github.com/cjlapao/common-go v0.0.39 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect

pkg/spamasaurusrex/main.go

@@ -14,36 +14,41 @@ import (
 	_ "github.com/breml/rootcerts"
 	"github.com/gorilla/mux"
 
-    "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
+	"github.com/davecgh/go-spew/spew"
+
+	"github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
 	clientId := "dccb4b93-3f75-4775-a94a-da39216d7daf"
 	tenantId := "ceeae22e-f163-4ac9-b7c2-45972d3aed4f"
-	// redirectURI := "https://alias.spamasaurus.com/"
-	scopes := []string{"email"}
+	redirectURI := "https://alias.spamasaurus.com/"
+	scopes := []string{"user.read"}
+	queryParams := r.URL.Query()
+
+	ctx := context.Background()
 
 	// confidential clients have a credential, such as a secret or a certificate
 	cred, err := confidential.NewCredFromSecret("client_secret")
 	if err != nil {
 		// TODO: handle error
 	}
-
-	confidentialClient, err := confidential.New("https://login.microsoftonline.com/" + tenantId, clientId, cred)
+	confidentialClient, err := confidential.New("https://login.microsoftonline.com/"+tenantId, clientId, cred)
 	if err != nil {
 		// TODO: handle error
 	}
 
-	result, err := confidentialClient.AcquireTokenSilent(context.TODO(), scopes)
+	result, err := confidentialClient.AcquireTokenSilent(ctx, scopes)
 	if err != nil {
 		// cache miss, authenticate with another AcquireToken... method
-		result, err = confidentialClient.AcquireTokenByCredential(context.TODO(), scopes)
+		// result, err = confidentialClient.AcquireTokenByCredential(ctx, scopes)
+		result, err = confidentialClient.AcquireTokenByAuthCode(ctx, queryParams["code"][0], redirectURI, scopes)
 		if err != nil {
 			// TODO: handle error
 		}
 	}
 	// accessToken := result.AccessToken
-	w.Write([]byte(fmt.Sprintf("Hello, %s\n", result.AccessToken)))
+	w.Write([]byte(fmt.Sprintf("Hello, %s\n", spew.Sdump(result))))
 }
 
 func healthHandler(w http.ResponseWriter, r *http.Request) {