commit 831e1eb34a284ec978139787f5c637aae914778c · hailey.at/atproto-oauth-golang

+2 -12

oauth.go

···

       88
       88
        
       		return "", fmt.Errorf("received non-200 response from pds. code was %d", resp.StatusCode)

     

       89
       89
        
       	}

     

       90
       90
        
       

     

       91
       91
       -
       	b, err := io.ReadAll(resp.Body)

     

       92
       92
       -
       	if err != nil {

     

       93
       93
       -
       		return "", fmt.Errorf("could not read body: %w", err)

     

       94
       94
       -
       	}

     

       95
       95
       -
       

     

       96
       91
        
       	var resource OauthProtectedResource

     

       97
       97
       -
       	if err := resource.UnmarshalJSON(b); err != nil {

     

       92
       92
       +
       	if err := json.NewDecoder(resp.Body).Decode(&resource); err != nil {

     

       98
       93
        
       		return "", fmt.Errorf("could not unmarshal json: %w", err)

     

       99
       94
        
       	}

     

       100
       95
        
       

     
···

       129
       124
        
       		return nil, fmt.Errorf("received non-200 response from pds. status code was %d", resp.StatusCode)

     

       130
       125
        
       	}

     

       131
       126
        
       

     

       132
       132
       -
       	b, err := io.ReadAll(resp.Body)

     

       133
       133
       -
       	if err != nil {

     

       134
       134
       -
       		return nil, fmt.Errorf("could not read body for authserver metadata response: %w", err)

     

       135
       135
       -
       	}

     

       136
       136
       -
       

     

       137
       127
        
       	var metadata OauthAuthorizationMetadata

     

       138
       138
       -
       	if err := metadata.UnmarshalJSON(b); err != nil {

     

       128
       128
       +
       	if err := json.NewDecoder(resp.Body).Decode(&metadata); err != nil {

     

       139
       129
        
       		return nil, fmt.Errorf("could not unmarshal authserver metadata: %w", err)

     

       140
       130
        
       	}

     

       141
       131

-27

types.go

···

       1
       1
        
       package oauth

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"fmt"

     

       6
       5
        
       	"net/url"

     

       7
       6
        
       	"slices"

     
···

       38
       37
        
       	ScopesSupported        []string `json:"scopes_supported"`

     

       39
       38
        
       	BearerMethodsSupported []string `json:"bearer_methods_supported"`

     

       40
       39
        
       	ResourceDocumentation  string   `json:"resource_documentation"`

     

       41
       41
       -
       }

     

       42
       42
       -
       

     

       43
       43
       -
       func (opr *OauthProtectedResource) UnmarshalJSON(b []byte) error {

     

       44
       44
       -
       	type Tmp OauthProtectedResource

     

       45
       45
       -
       	var tmp Tmp

     

       46
       46
       -
       

     

       47
       47
       -
       	if err := json.Unmarshal(b, &tmp); err != nil {

     

       48
       48
       -
       		return err

     

       49
       49
       -
       	}

     

       50
       50
       -
       

     

       51
       51
       -
       	*opr = OauthProtectedResource(tmp)

     

       52
       52
       -
       

     

       53
       53
       -
       	return nil

     

       54
       40
        
       }

     

       55
       41
        
       

     

       56
       42
        
       type OauthAuthorizationMetadata struct {

     
···

       82
       68
        
       	DpopSigningAlgValuesSupported              []string `json:"dpop_signing_alg_values_supported"`

     

       83
       69
        
       	ProtectedResources                         []string `json:"protected_resources"`

     

       84
       70
        
       	ClientIDMetadataDocumentSupported          bool     `json:"client_id_metadata_document_supported"`

     

       85
       85
       -
       }

     

       86
       86
       -
       

     

       87
       87
       -
       func (oam *OauthAuthorizationMetadata) UnmarshalJSON(b []byte) error {

     

       88
       88
       -
       	type Tmp OauthAuthorizationMetadata

     

       89
       89
       -
       	var tmp Tmp

     

       90
       90
       -
       

     

       91
       91
       -
       	if err := json.Unmarshal(b, &tmp); err != nil {

     

       92
       92
       -
       		return err

     

       93
       93
       -
       	}

     

       94
       94
       -
       

     

       95
       95
       -
       	*oam = OauthAuthorizationMetadata(tmp)

     

       96
       96
       -
       

     

       97
       97
       -
       	return nil

     

       98
       71
        
       }

     

       99
       72
        
       

     

       100
       73
        
       func (oam *OauthAuthorizationMetadata) Validate(fetch_url *url.URL) error {