protonmail: fix /auth/refresh, remove Client{ID,Secret}
ClientID and ClientSecret are no longer used. Closes: https://github.com/emersion/hydroxide/issues/68
This commit is contained in:
parent
10cb8dbf40
commit
75984c4ff4
|
@ -30,8 +30,6 @@ func newClient() *protonmail.Client {
|
||||||
return &protonmail.Client{
|
return &protonmail.Client{
|
||||||
RootURL: "https://dev.protonmail.com/api",
|
RootURL: "https://dev.protonmail.com/api",
|
||||||
AppVersion: "Web_3.16.2",
|
AppVersion: "Web_3.16.2",
|
||||||
ClientID: "Web",
|
|
||||||
ClientSecret: "4957cc9a2e0a2a49d02475c9d013478d",
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,6 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type authInfoReq struct {
|
type authInfoReq struct {
|
||||||
ClientID string
|
|
||||||
ClientSecret string
|
|
||||||
Username string
|
Username string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,8 +51,6 @@ func (resp *AuthInfoResp) authInfo() *AuthInfo {
|
||||||
|
|
||||||
func (c *Client) AuthInfo(username string) (*AuthInfo, error) {
|
func (c *Client) AuthInfo(username string) (*AuthInfo, error) {
|
||||||
reqData := &authInfoReq{
|
reqData := &authInfoReq{
|
||||||
ClientID: c.ClientID,
|
|
||||||
ClientSecret: c.ClientSecret,
|
|
||||||
Username: username,
|
Username: username,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,8 +68,6 @@ func (c *Client) AuthInfo(username string) (*AuthInfo, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
type authReq struct {
|
type authReq struct {
|
||||||
ClientID string
|
|
||||||
ClientSecret string
|
|
||||||
Username string
|
Username string
|
||||||
SRPSession string
|
SRPSession string
|
||||||
ClientEphemeral string
|
ClientEphemeral string
|
||||||
|
@ -126,8 +120,6 @@ func (c *Client) Auth(username, password, twoFactorCode string, info *AuthInfo)
|
||||||
}
|
}
|
||||||
|
|
||||||
reqData := &authReq{
|
reqData := &authReq{
|
||||||
ClientID: c.ClientID,
|
|
||||||
ClientSecret: c.ClientSecret,
|
|
||||||
Username: username,
|
Username: username,
|
||||||
SRPSession: info.srpSession,
|
SRPSession: info.srpSession,
|
||||||
ClientEphemeral: base64.StdEncoding.EncodeToString(proofs.clientEphemeral),
|
ClientEphemeral: base64.StdEncoding.EncodeToString(proofs.clientEphemeral),
|
||||||
|
@ -153,7 +145,6 @@ func (c *Client) Auth(username, password, twoFactorCode string, info *AuthInfo)
|
||||||
}
|
}
|
||||||
|
|
||||||
type authRefreshReq struct {
|
type authRefreshReq struct {
|
||||||
ClientID string
|
|
||||||
UID string `json:"Uid"`
|
UID string `json:"Uid"`
|
||||||
RefreshToken string
|
RefreshToken string
|
||||||
|
|
||||||
|
@ -161,14 +152,14 @@ type authRefreshReq struct {
|
||||||
ResponseType string
|
ResponseType string
|
||||||
GrantType string
|
GrantType string
|
||||||
RedirectURI string
|
RedirectURI string
|
||||||
State string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) AuthRefresh(expiredAuth *Auth) (*Auth, error) {
|
func (c *Client) AuthRefresh(expiredAuth *Auth) (*Auth, error) {
|
||||||
reqData := &authRefreshReq{
|
reqData := &authRefreshReq{
|
||||||
ClientID: c.ClientID,
|
|
||||||
UID: expiredAuth.UID,
|
UID: expiredAuth.UID,
|
||||||
RefreshToken: expiredAuth.RefreshToken,
|
RefreshToken: expiredAuth.RefreshToken,
|
||||||
|
ResponseType: "token",
|
||||||
|
GrantType: "refresh_token",
|
||||||
}
|
}
|
||||||
|
|
||||||
req, err := c.newJSONRequest(http.MethodPost, "/auth/refresh", reqData)
|
req, err := c.newJSONRequest(http.MethodPost, "/auth/refresh", reqData)
|
||||||
|
|
|
@ -54,9 +54,6 @@ type Client struct {
|
||||||
RootURL string
|
RootURL string
|
||||||
AppVersion string
|
AppVersion string
|
||||||
|
|
||||||
ClientID string
|
|
||||||
ClientSecret string
|
|
||||||
|
|
||||||
HTTPClient *http.Client
|
HTTPClient *http.Client
|
||||||
ReAuth func() error
|
ReAuth func() error
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue