added basic auth
This commit is contained in:
parent
46bece79dc
commit
9bc284c291
2 changed files with 10 additions and 20 deletions
|
@ -13,7 +13,7 @@ class Tentia:
|
||||||
self.preferences = Windows.Preferences(self)
|
self.preferences = Windows.Preferences(self)
|
||||||
self.preferences.show()
|
self.preferences.show()
|
||||||
|
|
||||||
self.timeline = Windows.Timeline(self)
|
#self.timeline = Windows.Timeline(self)
|
||||||
self.mentions = Windows.Timeline(self, "mentions", "Mentions")
|
self.mentions = Windows.Timeline(self, "mentions", "Mentions")
|
||||||
|
|
||||||
if self.controller.stringForKey("user_access_token") != "":
|
if self.controller.stringForKey("user_access_token") != "":
|
||||||
|
@ -37,7 +37,7 @@ class Tentia:
|
||||||
self.init_web_views()
|
self.init_web_views()
|
||||||
|
|
||||||
def init_web_views(self):
|
def init_web_views(self):
|
||||||
self.timeline.show()
|
#self.timeline.show()
|
||||||
self.mentions.show()
|
self.mentions.show()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from PyQt4 import QtCore, QtGui, QtWebKit
|
from PyQt4 import QtCore, QtGui, QtWebKit
|
||||||
import Helper, urllib
|
import Helper, urllib, urllib2
|
||||||
|
|
||||||
class Preferences:
|
class Preferences:
|
||||||
|
|
||||||
|
@ -116,28 +116,18 @@ class Oauth:
|
||||||
|
|
||||||
old_manager = self.auth_view.page().networkAccessManager()
|
old_manager = self.auth_view.page().networkAccessManager()
|
||||||
new_manager = Helper.NetworkAccessManager(old_manager, self.tentia_callback)
|
new_manager = Helper.NetworkAccessManager(old_manager, self.tentia_callback)
|
||||||
|
new_manager.authenticationRequired.connect(self.authentication_required)
|
||||||
self.auth_view.page().setNetworkAccessManager(new_manager)
|
self.auth_view.page().setNetworkAccessManager(new_manager)
|
||||||
|
|
||||||
self.auth_view.show()
|
self.auth_view.show()
|
||||||
|
self.auth_view.load_url(url)
|
||||||
|
return False
|
||||||
|
|
||||||
if self.is_basic_auth(url):
|
def authentication_required(self, reply, authenticator):
|
||||||
print "Basic auth"
|
|
||||||
else:
|
|
||||||
self.auth_view.load_url(url)
|
|
||||||
|
|
||||||
|
authenticator.setUser("jeena")
|
||||||
def is_basic_auth(self, url):
|
authenticator.setPassword("")
|
||||||
url_opener = urllib.URLopener()
|
|
||||||
|
|
||||||
try:
|
|
||||||
url_opener.open(url)
|
|
||||||
except IOError, error_code:
|
|
||||||
if error_code[0] == "http error" :
|
|
||||||
if error_code[1] == 401:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
def tentia_callback(self, url):
|
def tentia_callback(self, url):
|
||||||
script = "tentia_instance.requestAccessToken('" + url.toString() + "');"
|
script = "tentia_instance.requestAccessToken('" + url.toString() + "');"
|
||||||
self.core.page().mainFrame().evaluateJavaScript(script)
|
self.core.page().mainFrame().evaluateJavaScript(script)
|
||||||
|
|
||||||
|
|
Reference in a new issue