abs3nt
/
gospt
1
2
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 20 Wiki Activity

adds trace log to http, fixes login flow (#14)
ci/woodpecker/push/woodpecker Pipeline was successful Details 

Reviewed-on: https://gitea.asdf.cafe/abs3nt/gospt/pulls/14
Co-authored-by: a <a@tuxpa.in>
Co-committed-by: a <a@tuxpa.in>
This commit is contained in:
a 2023-03-07 11:22:18 -08:00 committed by abs3nt
parent 7e65581333
commit a1e9cc6dee
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/auth/auth.go
View File

@ -1,15 +1,16 @@
package auth
import (
"context"
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"os"
"os/exec"
"path/filepath"
"tuxpa.in/a/zlog/log"
"gitea.asdf.cafe/abs3nt/gospt/src/config"
"gitea.asdf.cafe/abs3nt/gospt/src/gctx"
@ -25,6 +26,12 @@ var (
configDir, _ = os.UserConfigDir()
)
type roundTripperFunc func(*http.Request) (*http.Response, error)
func (fn roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
return fn(req)
}
func GetClient(ctx *gctx.Context) (*spotify.Client, error) {
if config.Values.ClientId == "" || config.Values.ClientSecret == "" || config.Values.Port == "" {
fmt.Println("PLEASE WRITE YOUR CONFIG FILE IN", filepath.Join(configDir, "gospt/client.yml"))
@ -57,42 +64,36 @@ func GetClient(ctx *gctx.Context) (*spotify.Client, error) {
),
)
if _, err := os.Stat(filepath.Join(configDir, "gospt/auth.json")); err == nil {
authFile, err := os.Open(filepath.Join(configDir, "gospt/auth.json"))
authFilePath := filepath.Join(configDir, "gospt/auth.json")
authFile, err := os.Open(authFilePath)
if err != nil {
return nil, err
}
defer authFile.Close()
authValue, err := io.ReadAll(authFile)
tok := &oauth2.Token{}
err = json.NewDecoder(authFile).Decode(tok)
if err != nil {
return nil, err
}
var tok *oauth2.Token
err = json.Unmarshal(authValue, &tok)
if err != nil {
return nil, err
}
client := spotify.New(auth.Client(ctx, tok))
ctx.Context = context.WithValue(ctx.Context, oauth2.HTTPClient, &http.Client{
Transport: roundTripperFunc(func(r *http.Request) (*http.Response, error) {
log.Trace().Interface("path", r.URL.Path).Msg("request")
return http.DefaultTransport.RoundTrip(r)
}),
})
authClient := auth.Client(ctx, tok)
client := spotify.New(authClient)
new_token, err := client.Token()
if err != nil {
return nil, err
}
if new_token != tok {
out, err := json.MarshalIndent(new_token, "", " ")
if err != nil {
panic(err.Error())
}
err = os.WriteFile(filepath.Join(configDir, "gospt/auth.json"), out, 0o644)
if err != nil {
panic("FAILED TO SAVE AUTH")
}
}
out, err := json.MarshalIndent(tok, "", " ")
out, err := json.MarshalIndent(new_token, "", " ")
if err != nil {
panic(err.Error())
return nil, err
}
err = os.WriteFile(filepath.Join(configDir, "gospt/auth.json"), out, 0o644)
err = os.WriteFile(authFilePath, out, 0o644)
if err != nil {
panic("FAILED TO SAVE AUTH")
return nil, fmt.Errorf("failed to save auth")
}
return client, nil
}
@ -104,7 +105,7 @@ func GetClient(ctx *gctx.Context) (*spotify.Client, error) {
go func() {
err := http.ListenAndServe(fmt.Sprintf(":%s", config.Values.Port), nil)
if err != nil {
log.Fatal(err)
panic(err)
}
}()
url := auth.AuthURL(state)
@ -127,7 +128,6 @@ func completeAuth(w http.ResponseWriter, r *http.Request) {
tok, err := auth.Token(r.Context(), state, r)
if err != nil {
http.Error(w, "Couldn't get token", http.StatusForbidden)
log.Fatal(err)
}
if st := r.FormValue("state"); st != state {
http.NotFound(w, r)