You can close this window and return to the application.
- -`) + f.authSuccess <- tokens } // RefreshTokens refreshes the access token using the stored refresh token @@ -245,7 +235,7 @@ func RefreshTokens(cfg *config.Config) (*StoredTokens, error) { var newTokens *oauth.TokenResponse if tokens == nil { - return nil, flow.Authenticate() + return flow.Authenticate() } if tokens.NeedsRefresh() { ctx := context.Background() @@ -279,8 +269,8 @@ func GetPDSFromToken(accessToken string) (string, error) { } // Convert did:web:... to https://... - if strings.HasPrefix(aud, "did:web:") { - pdsHost := strings.TrimPrefix(aud, "did:web:") + if after, ok0 :=strings.CutPrefix(aud, "did:web:"); ok0 { + pdsHost := after return "https://" + pdsHost, nil } diff --git a/internal/config/config.go b/internal/config/config.go index 78ffc56..6b16d84 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -2,43 +2,27 @@ package config import ( "encoding/json" - "fmt" - "net/url" "os" "path/filepath" "strings" ) type Config struct { - ClientID string `json:"client_id"` - ClientSecret string `json:"client_secret"` - RedirectURI string `json:"redirect_uri"` - Scope string `json:"scope"` AuthserverIss string `json:"auth_server"` PDSHost string `json:"pds_host"` Handle string `json:"handle"` } func LoadConfig() (*Config, error) { - configPath := filepath.Join(getConfigDir(), "config.json") + configPath := getConfigFile() // Default configuration cfg := &Config{ - RedirectURI: "http://127.0.0.1:8080/callback", - Scope: "atproto transition:generic", AuthserverIss: "https://bsky.social", } - params := url.Values{} - params.Set("redirect_uri", cfg.RedirectURI) - params.Set("scope", cfg.Scope) - cfg.ClientID = fmt.Sprintf("http://localhost?%s", params.Encode()) - data, err := os.ReadFile(configPath) if err != nil { - if os.IsNotExist(err) { - return cfg, nil - } return nil, err } @@ -49,26 +33,21 @@ func LoadConfig() (*Config, error) { return cfg, nil } -func SaveConfig(cfg *Config) error { - configDir := getConfigDir() - if err := os.MkdirAll(configDir, 0700); err != nil { - return err - } - +func SaveConfig(cfg *Config) (*Config, error) { if cfg.Handle != "" { cfg.Handle = strings.TrimPrefix(cfg.Handle, "@") } - configPath := filepath.Join(configDir, "config.json") + configPath := getConfigFile() data, err := json.MarshalIndent(cfg, "", " ") if err != nil { - return err + return cfg, err } - return os.WriteFile(configPath, data, 0600) + return cfg, os.WriteFile(configPath, data, 0600) } -func getConfigDir() string { +func getConfigFile() string { home, _ := os.UserHomeDir() - return filepath.Join(home, ".atproto-image-host") + return filepath.Join(home, ".blup.conf") } diff --git a/internal/server/server.go b/internal/server/server.go deleted file mode 100644 index 3364993..0000000 --- a/internal/server/server.go +++ /dev/null @@ -1,193 +0,0 @@ -package server - -import ( - "bytes" - "context" - "encoding/json" - "fmt" - "io" - "log" - - "net/http" - "strings" - "time" - - indigo_util "github.com/bluesky-social/indigo/util" - "github.com/gorilla/mux" - "tangled.sh/evan.jarrett.net/blup/internal/auth" - "tangled.sh/evan.jarrett.net/blup/internal/util" -) - -type Server struct { - router *mux.Router -} - -func NewServer() *Server { - s := &Server{} - - s.setupRoutes() - return s -} - -func (s *Server) setupRoutes() { - r := mux.NewRouter() - - // Health check - r.HandleFunc("/health", s.handleHealth).Methods("GET") - - // Image serving - r.HandleFunc("/i/{did}/{cid}", s.handleServeImage).Methods("GET") - - // Simple home page - r.HandleFunc("/", s.handleHome).Methods("GET") - - s.router = r -} - -func (s *Server) Router() http.Handler { - return s.router -} - -func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(map[string]string{ - "status": "ok", - "timestamp": time.Now().Format(time.RFC3339), - }) -} - -func (s *Server) handleHome(w http.ResponseWriter, r *http.Request) { - html := ` - - -This server renders images uploaded to AT Protocol.
-Usage: /i/{blob-cid}
Upload images using: atimg upload image.png