You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2016/12/28 23:38:07 UTC
[1/2] incubator-ponymail git commit: More stale persona references
Repository: incubator-ponymail
Updated Branches:
refs/heads/master cf8aa407b -> 77bb141a9
More stale persona references
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/33d5ea54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/33d5ea54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/33d5ea54
Branch: refs/heads/master
Commit: 33d5ea54264d7e0984622c225f871e38e4d21883
Parents: cf8aa40
Author: Sebb <se...@apache.org>
Authored: Wed Dec 28 23:37:44 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Wed Dec 28 23:37:44 2016 +0000
----------------------------------------------------------------------
site/api/oauth.lua | 8 +-------
site/js/oauth.js | 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/33d5ea54/site/api/oauth.lua
----------------------------------------------------------------------
diff --git a/site/api/oauth.lua b/site/api/oauth.lua
index e198d89..8a1c991 100644
--- a/site/api/oauth.lua
+++ b/site/api/oauth.lua
@@ -45,14 +45,8 @@ function handle(r)
end
end
- -- Persona callback
- if get.mode and get.mode == "persona" then
- oauth_domain = "verifier.login.persona.org"
- local result = https.request("https://verifier.login.persona.org/verify", ("assertion=%s&audience=%s://%s:%u/"):format(post.assertion, scheme, r.hostname, r.port))
- valid, json = pcall(function() return JSON.decode(result) end)
-
-- Google Auth callback
- elseif get.oauth_token and get.oauth_token:match("^https://www.google") and get.code then
+ if get.oauth_token and get.oauth_token:match("^https://www.google") and get.code then
oauth_domain = "www.googleapis.com"
local result = https.request("https://www.googleapis.com/oauth2/v4/token",
("client_secret=%s&code=%s&client_id=%s&grant_type=authorization_code&redirect_uri=%s" ):format(
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/33d5ea54/site/js/oauth.js
----------------------------------------------------------------------
diff --git a/site/js/oauth.js b/site/js/oauth.js
index c6604c5..feef6f7 100644
--- a/site/js/oauth.js
+++ b/site/js/oauth.js
@@ -138,7 +138,7 @@ function oauthWelcome(args) {
} else {
alert("Key missing or invalid! " + key)
}
- // Not a callback, let's just show which oauth/persona options are enabled.
+ // Not a callback, let's just show which oauth options are enabled.
} else {
window.sessionStorage.setItem("ponymail_redirect_oauth", document.referrer)
oauthOptions()
[2/2] incubator-ponymail git commit: More stale persona references
Posted by se...@apache.org.
More stale persona references
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/77bb141a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/77bb141a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/77bb141a
Branch: refs/heads/master
Commit: 77bb141a9ebb8dde3fe1dab4aabd344912310066
Parents: 33d5ea5
Author: Sebb <se...@apache.org>
Authored: Wed Dec 28 23:37:48 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Wed Dec 28 23:37:48 2016 +0000
----------------------------------------------------------------------
aaa_examples/README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/77bb141a/aaa_examples/README.md
----------------------------------------------------------------------
diff --git a/aaa_examples/README.md b/aaa_examples/README.md
index 560df2c..cf95425 100644
--- a/aaa_examples/README.md
+++ b/aaa_examples/README.md
@@ -11,8 +11,8 @@ authorities, as such:
~~~
...,
--- This adds Persona and Google OAuth as authorities
-admin_oauth = { "verifier.login.persona.org", "www.googleapis.com" }
+-- This Google OAuth as an authority
+admin_oauth = { "www.googleapis.com" }
...
~~~