summaryrefslogtreecommitdiffstats
path: root/api4/oauth.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-04-25 12:38:33 -0400
committerCorey Hulen <corey@hulen.com>2017-04-25 09:38:33 -0700
commit8d1a132eda861f3e491a406233b726ff953cdffd (patch)
treef4739b7357c2887a339cebe739abca62a8744e99 /api4/oauth.go
parent83ca76f8f2bfef819ba928dd1e5c94d65eed46cf (diff)
downloadchat-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/oauth.go')
-rw-r--r--api4/oauth.go3
1 files changed, 3 insertions, 0 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 {