Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ponymail.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: humbedooh@apache.org
To: commits@ponymail.incubator.apache.org
Date: Sat, 24 Dec 2016 12:14:57 -0000
Message-Id: <24130eec0ffe4a5d8fc194254e2aa7ad@git.apache.org>
In-Reply-To: <fb932f71b29549508a26bc5275534872@git.apache.org>
References: <fb932f71b29549508a26bc5275534872@git.apache.org>
Subject: [2/2] incubator-ponymail git commit: Kill off Persona login
archived-at: Sat, 24 Dec 2016 12:15:02 -0000

Kill off Persona login

it's been shut down.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/d2ce7252
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/d2ce7252
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/d2ce7252

Branch: refs/heads/master
Commit: d2ce7252d5ffd4a7090088f6eae7994ee7c7d1a9
Parents: 7737cdd
Author: Daniel Gruno <humbedooh@apache.org>
Authored: Sat Dec 24 13:14:42 2016 +0100
Committer: Daniel Gruno <humbedooh@apache.org>
Committed: Sat Dec 24 13:14:42 2016 +0100

----------------------------------------------------------------------
 CHANGELOG.md             |   1 +
 site/images/persona.png  | Bin 8021 -> 0 bytes
 site/js/config.js.sample |   3 ---
 site/js/oauth.js         |  13 ------------
 site/js/persona.js       |  47 ------------------------------------------
 site/oauth.html          |   2 --
 6 files changed, 1 insertion(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/d2ce7252/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43f8e4c..607214b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
 - import-mbox.py fails to unescape >From lines (#212)
 - Updated Google+ API for logins
 - Fixed a redirect bug with oauth
+- Removed support for Mozilla Persona
 
 ## CHANGES in 0.9b:
 

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/d2ce7252/site/images/persona.png
----------------------------------------------------------------------
diff --git a/site/images/persona.png b/site/images/persona.png
deleted file mode 100644
index cad27de..0000000
Binary files a/site/images/persona.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/d2ce7252/site/js/config.js.sample
----------------------------------------------------------------------
diff --git a/site/js/config.js.sample b/site/js/config.js.sample
index 3614229..74cdd65 100644
--- a/site/js/config.js.sample
+++ b/site/js/config.js.sample
@@ -69,9 +69,6 @@ var pm_config = {
         }
         */
     },
-    persona: {
-        enabled: false      // Is Mozilla Persona something we'd use?
-    },
     indexMode: 'table',     // front page view mode:
                             // phonebook: Standard phonebook mode, sort/list by domain name (a.org, b.org, c.org...)
                             // phonebook_short: Same as above, but sort/list by list name (dev@a.org, dev@.org, user@a.org...)

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/d2ce7252/site/js/oauth.js
----------------------------------------------------------------------
diff --git a/site/js/oauth.js b/site/js/oauth.js
index 57f5242..c6604c5 100644
--- a/site/js/oauth.js
+++ b/site/js/oauth.js
@@ -107,19 +107,6 @@ function oauthOptions() {
             oobj.appendChild(document.createElement('br'))
         }
     }
-    
-    // Mozilla Persona
-    if (pm_config.persona && pm_config.persona.enabled) {
-        var img = document.createElement('img')
-        img.setAttribute("src", "images/persona.png")
-        img.setAttribute("title", "Log on with persona")
-        img.setAttribute("onclick", "navigator.id.request();")
-        img.style.cursor = "pointer"
-        oobj.appendChild(img)
-        oobj.appendChild(document.createElement('br'))
-        oobj.appendChild(document.createTextNode(' '))
-        oobj.appendChild(document.createElement('br'))
-    }
 }
 
 // onLoad function for oauth. If args (query string or bookmark) are supplied,

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/d2ce7252/site/js/persona.js
----------------------------------------------------------------------
diff --git a/site/js/persona.js b/site/js/persona.js
deleted file mode 100644
index e0ec157..0000000
--- a/site/js/persona.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-// We need to fetch the account data, so we can determine how to set up the
-// persona stuff here
-GetAsync("/api/preferences.lua", null, setupPersona)
-
-
-function setupPersona(json) {
-  
-  navigator.id.watch({
-    loggedInUser: json.login ? json.login.email : 'not@logged.in',
-    onlogin: function(assertion) {
-      $.ajax({ 
-        type: 'POST',
-        url: '/api/oauth.lua?mode=persona',
-        data: {assertion: assertion},
-        success: function(res, status, xhr) { location.href = "/"; },
-        error: function(xhr, status, err) {
-          navigator.id.logout();
-          alert("Login failure: " + err);
-        }
-      });
-    },
-    onlogout: function() {
-      $.ajax({
-        type: 'POST',
-        url: '/api/persona.lua?mode=logout', // This does nothing atm!
-        success: function(res, status, xhr) { }
-      });
-    }
-  });
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/d2ce7252/site/oauth.html
----------------------------------------------------------------------
diff --git a/site/oauth.html b/site/oauth.html
index fa82dad..ed843ca 100644
--- a/site/oauth.html
+++ b/site/oauth.html
@@ -63,7 +63,5 @@ the License. -->
     <script src="js/ponymail.js"></script>
     <script src="js/oauth.js"></script>
     <script src="js/config.js"></script>
-    <script src="https://login.persona.org/include.js"></script>
-    <script src="js/persona.js"></script>
   </body>
 </html>
\ No newline at end of file