diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-04-25 12:38:33 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-04-25 09:38:33 -0700 |
commit | 8d1a132eda861f3e491a406233b726ff953cdffd (patch) | |
tree | f4739b7357c2887a339cebe739abca62a8744e99 /api4 | |
parent | 83ca76f8f2bfef819ba928dd1e5c94d65eed46cf (diff) | |
download | chat-8d1a132eda861f3e491a406233b726ff953cdffd.tar.gz chat-8d1a132eda861f3e491a406233b726ff953cdffd.tar.bz2 chat-8d1a132eda861f3e491a406233b726ff953cdffd.zip |
Fix OAuth SSO first account creation, add mobile support, and fix refresh tokens (#6181)
Diffstat (limited to 'api4')
-rw-r--r-- | api4/oauth.go | 3 | ||||
-rw-r--r-- | api4/params.go | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/api4/oauth.go b/api4/oauth.go index 3ace501e4..33c166da4 100644 --- a/api4/oauth.go +++ b/api4/oauth.go @@ -417,6 +417,9 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { } else if action == model.OAUTH_ACTION_SSO_TO_EMAIL { redirectUrl = app.GetProtocol(r) + "://" + r.Host + "/claim?email=" + url.QueryEscape(props["email"]) + } else if action == model.OAUTH_ACTION_MOBILE { + ReturnStatusOK(w) + return } else { session, err := app.DoLogin(w, r, user, "") if err != nil { diff --git a/api4/params.go b/api4/params.go index 5febf06fb..785b2267b 100644 --- a/api4/params.go +++ b/api4/params.go @@ -105,7 +105,7 @@ func ApiParamsFromRequest(r *http.Request) *ApiParams { } if val, ok := props["service"]; ok { - params.Category = val + params.Service = val } if val, ok := props["preference_name"]; ok { |