Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: OAuth Echo was redirecting to home page (#628)

Guilherme Oenningaec4f7cec41e
diff --git a/app/handlers/oauth.go b/app/handlers/oauth.go
index 1ce93fe17..e899df4ad 100644
--- a/app/handlers/oauth.go
+++ b/app/handlers/oauth.go
@@ -205,7 +205,14 @@ func SignInByOAuth() web.HandlerFunc {
provider := c.Param("provider")
redirect := c.QueryParam("redirect")
- if c.IsAuthenticated() {
+ if redirect == "" {
+ redirect = c.BaseURL()
+ }
+
+ redirectURL, _ := url.ParseRequestURI(redirect)
+ redirectURL.ResolveReference(c.Request.URL)
+
+ if c.IsAuthenticated() && redirectURL.Path != fmt.Sprintf("/oauth/%s/echo", provider) {
return c.Redirect(redirect)
}
diff --git a/app/handlers/oauth_test.go b/app/handlers/oauth_test.go
index 83ef95ba3..fe7d0ca7a 100644
--- a/app/handlers/oauth_test.go
+++ b/app/handlers/oauth_test.go
@@ -40,10 +40,11 @@ func TestSignInByOAuthHandler(t *testing.T) {
AddParam("provider", oauth.FacebookProvider).
AddHeader("User-Agent", "Chrome").
WithClientIP("1.1.1.1").
+ WithURL("http://avengers.test.fider.io/oauth/facebook").
Execute(handlers.SignInByOAuth())
Expect(code).Equals(http.StatusTemporaryRedirect)
- Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io/oauth/token?provider=facebook&redirect=|656e0c3864ae014bcaf370c2b2d265a7cc969ac50fe82a67c97f3042393a84dfd251596997d09e4f0f5a184e1b3dfccf24b193c2347e22c2b895d251290df162")
+ Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io/oauth/token?provider=facebook&redirect=http://avengers.test.fider.io|656e0c3864ae014bcaf370c2b2d265a7cc969ac50fe82a67c97f3042393a84dfd251596997d09e4f0f5a184e1b3dfccf24b193c2347e22c2b895d251290df162")
}
func TestSignInByOAuthHandler_AuthenticatedUser(t *testing.T) {
@@ -62,6 +63,22 @@ func TestSignInByOAuthHandler_AuthenticatedUser(t *testing.T) {
Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io")
}
+func TestSignInByOAuthHandler_AuthenticatedUser_UsingEcho(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ code, response := server.
+ AsUser(mock.JonSnow).
+ AddParam("provider", oauth.FacebookProvider).
+ WithURL("http://avengers.test.fider.io/oauth/facebook?redirect=http://avengers.test.fider.io/oauth/facebook/echo").
+ AddHeader("User-Agent", "Chrome").
+ WithClientIP("1.1.1.1").
+ Execute(handlers.SignInByOAuth())
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
+ Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io/oauth/token?provider=facebook&redirect=http://avengers.test.fider.io/oauth/facebook/echo|656e0c3864ae014bcaf370c2b2d265a7cc969ac50fe82a67c97f3042393a84dfd251596997d09e4f0f5a184e1b3dfccf24b193c2347e22c2b895d251290df162")
+}
+
func TestCallbackHandler_InvalidState(t *testing.T) {
RegisterT(t)
diff --git a/public/pages/Administration/components/OAuthForm.tsx b/public/pages/Administration/components/OAuthForm.tsx
index 0e22fcea3..527346675 100644
--- a/public/pages/Administration/components/OAuthForm.tsx
+++ b/public/pages/Administration/components/OAuthForm.tsx
@@ -76,7 +76,7 @@ export class OAuthForm extends React.Component<OAuthFormProps, OAuthFormState> {
logo: this.state.logo
});
if (result.ok) {
- navigator.goTo("/admin/authentication");
+ location.reload();
} else {
this.setState({ error: result.error });
}