···

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
	"github.com/bluesky-social/indigo/atproto/syntax"

     

       
11
       
11
       
 
       
	"github.com/gorilla/sessions"

     

       
12
       
12
       
-
       
	oauth "github.com/haileyok/atproto-oauth-golang"

     

       
12
       
12
       
+
       
	oauth_helpers "github.com/haileyok/atproto-oauth-golang/helpers"

     

       
13
       
13
       
 
       
	"github.com/labstack/echo-contrib/session"

     

       
14
       
14
       
 
       
	"github.com/labstack/echo/v4"

     

       
15
       
15
       
 
       
	"gorm.io/gorm/clause"

     
···

       
71
       
71
       
 
       
		return err

     

       
72
       
72
       
 
       
	}

     

       
73
       
73
       
 
       


     

       
74
       
74
       
-
       
	dpopPrivateKey, err := oauth.GenerateKey(nil)

     

       
74
       
74
       
+
       
	dpopPrivateKey, err := oauth_helpers.GenerateKey(nil)

     

       
75
       
75
       
 
       
	if err != nil {

     

       
76
       
76
       
 
       
		return err

     

       
77
       
77
       
 
       
	}

     
···

       
159
       
159
       
 
       
		return fmt.Errorf("incoming iss did not match authserver iss")

     

       
160
       
160
       
 
       
	}

     

       
161
       
161
       
 
       


     

       
162
       
162
       
-
       
	jwk, err := oauth.ParseJWKFromBytes([]byte(oauthRequest.DpopPrivateJwk))

     

       
162
       
162
       
+
       
	jwk, err := oauth_helpers.ParseJWKFromBytes([]byte(oauthRequest.DpopPrivateJwk))

     

       
163
       
163
       
 
       
	if err != nil {

     

       
164
       
164
       
 
       
		return err

     

       
165
       
165
       
 
       
	}