oppi.li
porting all github actions from bluesky-social/indigo to tangled CI
vendor in password auth req/resp schemas
bnewbold.net
+32
-5
+32
-5
atproto/client/password_auth.go
+32
-5
atproto/client/password_auth.go
···
8
"strings"
9
"sync"
10
11
-
comatproto "github.com/bluesky-social/indigo/api/atproto"
12
"github.com/bluesky-social/indigo/atproto/identity"
13
"github.com/bluesky-social/indigo/atproto/syntax"
14
)
···
43
}
44
}
45
46
func (a *PasswordAuth) DoWithAuth(c *http.Client, req *http.Request, endpoint syntax.NSID) (*http.Response, error) {
47
accessToken, refreshToken := a.GetTokens()
48
req.Header.Set("Authorization", "Bearer "+accessToken)
···
138
return eb.APIError(resp.StatusCode)
139
}
140
141
-
var out comatproto.ServerRefreshSession_Output
142
if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
143
return err
144
}
···
219
func LoginWithPasswordHost(ctx context.Context, host, username, password, authToken string, cb RefreshCallback) (*APIClient, error) {
220
221
c := NewAPIClient(host)
222
-
reqBody := comatproto.ServerCreateSession_Input{
223
Identifier: username,
224
Password: password,
225
}
···
227
reqBody.AuthFactorToken = &authToken
228
}
229
230
-
// TODO: copy/vendor in session objects
231
-
var out comatproto.ServerCreateSession_Output
232
if err := c.Post(ctx, syntax.NSID("com.atproto.server.createSession"), &reqBody, &out); err != nil {
233
return nil, err
234
}
···
8
"strings"
9
"sync"
10
11
"github.com/bluesky-social/indigo/atproto/identity"
12
"github.com/bluesky-social/indigo/atproto/syntax"
13
)
···
42
}
43
}
44
45
+
type createSessionRequest struct {
46
+
//AllowTakendown *bool `json:"allowTakendown,omitempty" cborgen:"allowTakendown,omitempty"`
47
+
AuthFactorToken *string `json:"authFactorToken,omitempty" cborgen:"authFactorToken,omitempty"`
48
+
// identifier: Handle or other identifier supported by the server for the authenticating user.
49
+
Identifier string `json:"identifier" cborgen:"identifier"`
50
+
Password string `json:"password" cborgen:"password"`
51
+
}
52
+
53
+
type createSessionResponse struct {
54
+
AccessJwt string `json:"accessJwt" cborgen:"accessJwt"`
55
+
Active *bool `json:"active,omitempty" cborgen:"active,omitempty"`
56
+
Did string `json:"did" cborgen:"did"`
57
+
//Email *string `json:"email,omitempty" cborgen:"email,omitempty"`
58
+
//EmailAuthFactor *bool `json:"emailAuthFactor,omitempty" cborgen:"emailAuthFactor,omitempty"`
59
+
//EmailConfirmed *bool `json:"emailConfirmed,omitempty" cborgen:"emailConfirmed,omitempty"`
60
+
//Handle string `json:"handle" cborgen:"handle"`
61
+
RefreshJwt string `json:"refreshJwt" cborgen:"refreshJwt"`
62
+
Status *string `json:"status,omitempty" cborgen:"status,omitempty"`
63
+
}
64
+
65
+
type refreshSessionResponse struct {
66
+
AccessJwt string `json:"accessJwt" cborgen:"accessJwt"`
67
+
Active *bool `json:"active,omitempty" cborgen:"active,omitempty"`
68
+
Did string `json:"did" cborgen:"did"`
69
+
//Handle string `json:"handle" cborgen:"handle"`
70
+
RefreshJwt string `json:"refreshJwt" cborgen:"refreshJwt"`
71
+
Status *string `json:"status,omitempty" cborgen:"status,omitempty"`
72
+
}
73
+
74
func (a *PasswordAuth) DoWithAuth(c *http.Client, req *http.Request, endpoint syntax.NSID) (*http.Response, error) {
75
accessToken, refreshToken := a.GetTokens()
76
req.Header.Set("Authorization", "Bearer "+accessToken)
···
166
return eb.APIError(resp.StatusCode)
167
}
168
169
+
var out refreshSessionResponse
170
if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
171
return err
172
}
···
247
func LoginWithPasswordHost(ctx context.Context, host, username, password, authToken string, cb RefreshCallback) (*APIClient, error) {
248
249
c := NewAPIClient(host)
250
+
reqBody := createSessionRequest{
251
Identifier: username,
252
Password: password,
253
}
···
255
reqBody.AuthFactorToken = &authToken
256
}
257
258
+
var out createSessionResponse
259
if err := c.Post(ctx, syntax.NSID("com.atproto.server.createSession"), &reqBody, &out); err != nil {
260
return nil, err
261
}