6 Commits

Author SHA1 Message Date
c33b246cf2 chore(release): 1.0.14 [skip ci]
## [1.0.14](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.13...v1.0.14) (2024-03-10)

### Bug Fixes

* Add more extensive oauth scope ([9a6e8e2](9a6e8e25f2))
2024-03-10 06:08:38 +00:00
6d5b17515a Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.SpamasaurusRex
All checks were successful
Container & Helm chart / Semantic Release (Dry-run) (push) Successful in 32s
Container & Helm chart / Helm chart (push) Successful in 17s
Container & Helm chart / Container image (push) Successful in 1m41s
Container & Helm chart / Semantic Release (push) Successful in 33s
2024-03-10 17:05:49 +11:00
9a6e8e25f2 fix: Add more extensive oauth scope 2024-03-10 17:05:47 +11:00
9126817665 chore(release): 1.0.13 [skip ci]
## [1.0.13](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.12...v1.0.13) (2024-03-10)

### Bug Fixes

* Replace clientSecret value ([446999a](446999ac69))
2024-03-10 05:49:55 +00:00
dccca37237 Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.SpamasaurusRex
All checks were successful
Container & Helm chart / Semantic Release (Dry-run) (push) Successful in 34s
Container & Helm chart / Helm chart (push) Successful in 17s
Container & Helm chart / Container image (push) Successful in 1m43s
Container & Helm chart / Semantic Release (push) Successful in 32s
2024-03-10 16:47:01 +11:00
446999ac69 fix: Replace clientSecret value 2024-03-10 16:46:59 +11:00
2 changed files with 20 additions and 5 deletions

View File

@ -1,3 +1,17 @@
## [1.0.14](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.13...v1.0.14) (2024-03-10)
### Bug Fixes
* Add more extensive oauth scope ([9a6e8e2](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/9a6e8e25f29d38dd3e66530d37445a5d5902db56))
## [1.0.13](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.12...v1.0.13) (2024-03-10)
### Bug Fixes
* Replace clientSecret value ([446999a](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/446999ac69b38271c15a907beaad5f25b3363d5f))
## [1.0.12](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.11...v1.0.12) (2024-03-10)

View File

@ -20,10 +20,10 @@ import (
var config = oauth2.Config{
ClientID: "dccb4b93-3f75-4775-a94a-da39216d7daf",
ClientSecret: "tiL8Q~qahoaZUck4ZG4sc5w.V_I.1c60bwkW6aYJ",
ClientSecret: "XN98Q~Wrp1RfakkihA1BaTKfokOSX9fuB01unanr",
Endpoint: microsoft.AzureADEndpoint("ceeae22e-f163-4ac9-b7c2-45972d3aed4f"),
RedirectURL: "https://alias.spamasaurus.com/callback",
Scopes: []string{"User.Read"},
Scopes: []string{"User.Read", "Profile"},
}
func rootHandler(w http.ResponseWriter, r *http.Request) {
@ -33,10 +33,11 @@ func rootHandler(w http.ResponseWriter, r *http.Request) {
func callbackHandler(w http.ResponseWriter, r *http.Request) {
// Handle the callback after successful authentication
code := r.URL.Query().Get("code")
token, err := config.Exchange(r.Context(), code)
token, err := config.Exchange(r.Context(), r.URL.Query().Get("code"))
if err != nil {
w.Write([]byte(spew.Sdump(err)))
if retrieveErr, ok := err.(*oauth2.RetrieveError); ok {
w.Write([]byte(retrieveErr.ErrorDescription + " (" + retrieveErr.ErrorCode + ")"))
}
http.Error(w, "Error exchanging code for token", http.StatusInternalServerError)
return
}