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

## [1.0.5](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.4...v1.0.5) (2024-03-08)

### Bug Fixes

* Rebase to MSAL library for authentication ([3a0c288](3a0c288e55))

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.0.5](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.4...v1.0.5) (2024-03-08)
+
+
+### Bug Fixes
+
+* Rebase to MSAL library for authentication ([3a0c288](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/3a0c288e55d4a717fa89f9548c5006e6c6bd7969))
+
 ## [1.0.4](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.3...v1.0.4) (2024-03-08)
 
 

Dockerfile

@@ -14,6 +14,6 @@ WORKDIR /app
 
 COPY --from=builder /app/main .
 
-EXPOSE 80
+EXPOSE 8080
 
 CMD ["./main"]

go.mod

@@ -3,13 +3,13 @@ module pkg/spamasaurusrex
 go 1.19
 
 require (
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1
 	github.com/breml/rootcerts v0.2.16
 	github.com/gorilla/mux v1.8.1
 	github.com/microsoftgraph/msgraph-sdk-go v1.34.0
 )
 
 require (
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
@@ -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

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