1
=== modified file 'softwareproperties/GoaAuth.py'
2
--- softwareproperties/GoaAuth.py	2018-04-17 11:36:55 +0000
3
+++ softwareproperties/GoaAuth.py	2019-03-07 18:28:33 +0000
4
@@ -21,7 +21,9 @@
5
21
21
6
22
import gi
22
import gi
7
23
gi.require_version('Goa', '1.0')
23
gi.require_version('Goa', '1.0')
9
24
from gi.repository import Gio, Goa, GObject
24
from gi.repository import Gio, GLib, Goa, GObject
10
25
11
26
import logging
12
25
27
13
26
class GoaAuth(GObject.GObject):
28
class GoaAuth(GObject.GObject):
14
27
29
15
@@ -32,12 +34,21 @@
16
32
    def __init__(self):
34
    def __init__(self):
17
33
        GObject.GObject.__init__(self)
35
        GObject.GObject.__init__(self)
18
34
36
19
35
        self.goa_client = Goa.Client.new_sync(None)
20
36
        self.account = None
37
        self.account = None
21
38
        self.cancellable = Gio.Cancellable()
22
39
        Goa.Client.new(self.cancellable, self._on_goa_client_ready)
23
37
40
24
38
        self.settings = Gio.Settings.new('com.ubuntu.SoftwareProperties')
41
        self.settings = Gio.Settings.new('com.ubuntu.SoftwareProperties')
25
39
        self.settings.connect('changed::goa-account-id', self._on_settings_changed)
42
        self.settings.connect('changed::goa-account-id', self._on_settings_changed)
27
40
        self._load()
43
28
44
    def _on_goa_client_ready(self, source, res):
29
45
        try:
30
46
            self.goa_client = Goa.Client.new_finish(res)
31
47
        except GLib.Error as e:
32
48
            logging.error('Failed to get a Gnome Online Account: {}'.format(e.message))
33
49
            self.goa_client = None
34
50
        else:
35
51
            self._load()
36
41
52
37
42
    def login(self, account):
53
    def login(self, account):
38
43
        assert(account)
54
        assert(account)
39
@@ -50,7 +61,7 @@
40
50
61
41
51
    @GObject.Property
62
    @GObject.Property
42
52
    def token(self):
63
    def token(self):
44
53
        if self.account is None:
64
        if self.account is None or self.goa_client is None:
45
54
            return None
65
            return None
46
55
66
47
56
        obj = self.goa_client.lookup_by_id(self.account.props.id)
67
        obj = self.goa_client.lookup_by_id(self.account.props.id)
48
@@ -64,7 +75,7 @@
49
64
        return pbased.call_get_password_sync('livepatch')
75
        return pbased.call_get_password_sync('livepatch')
50
65
76
51
66
    def _update_state_from_account_id(self, account_id):
77
    def _update_state_from_account_id(self, account_id):
53
67
        if account_id:
78
        if account_id and self.goa_client is not None:
54
68
            # Make sure the account-id is valid
79
            # Make sure the account-id is valid
55
69
            obj = self.goa_client.lookup_by_id(account_id)
80
            obj = self.goa_client.lookup_by_id(account_id)
56
70
            if obj is None:
81
            if obj is None:
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher		2019-03-07	Approve on 2019-03-14
Review via email: mp+364112@code.launchpad.net
1	=== modified file 'softwareproperties/GoaAuth.py'
2	--- softwareproperties/GoaAuth.py 2018-04-17 11:36:55 +0000
3	+++ softwareproperties/GoaAuth.py 2019-03-07 18:28:33 +0000
4	@@ -21,7 +21,9 @@
5	21		21
6	22	import gi	22	import gi
7	23	gi.require_version('Goa', '1.0')	23	gi.require_version('Goa', '1.0')
9	24	from gi.repository import Gio, Goa, GObject	24	from gi.repository import Gio, GLib, Goa, GObject
10			25
11			26	import logging
12	25		27
13	26	class GoaAuth(GObject.GObject):	28	class GoaAuth(GObject.GObject):
14	27		29
15	@@ -32,12 +34,21 @@
16	32	def __init__(self):	34	def __init__(self):
17	33	GObject.GObject.__init__(self)	35	GObject.GObject.__init__(self)
18	34		36
19	35	self.goa_client = Goa.Client.new_sync(None)
20	36	self.account = None	37	self.account = None
21			38	self.cancellable = Gio.Cancellable()
22			39	Goa.Client.new(self.cancellable, self._on_goa_client_ready)
23	37		40
24	38	self.settings = Gio.Settings.new('com.ubuntu.SoftwareProperties')	41	self.settings = Gio.Settings.new('com.ubuntu.SoftwareProperties')
25	39	self.settings.connect('changed::goa-account-id', self._on_settings_changed)	42	self.settings.connect('changed::goa-account-id', self._on_settings_changed)
27	40	self._load()	43
28			44	def _on_goa_client_ready(self, source, res):
29			45	try:
30			46	self.goa_client = Goa.Client.new_finish(res)
31			47	except GLib.Error as e:
32			48	logging.error('Failed to get a Gnome Online Account: {}'.format(e.message))
33			49	self.goa_client = None
34			50	else:
35			51	self._load()
36	41		52
37	42	def login(self, account):	53	def login(self, account):
38	43	assert(account)	54	assert(account)
39	@@ -50,7 +61,7 @@
40	50		61
41	51	@GObject.Property	62	@GObject.Property
42	52	def token(self):	63	def token(self):
44	53	if self.account is None:	64	if self.account is None or self.goa_client is None:
45	54	return None	65	return None
46	55		66
47	56	obj = self.goa_client.lookup_by_id(self.account.props.id)	67	obj = self.goa_client.lookup_by_id(self.account.props.id)
48	@@ -64,7 +75,7 @@
49	64	return pbased.call_get_password_sync('livepatch')	75	return pbased.call_get_password_sync('livepatch')
50	65		76
51	66	def _update_state_from_account_id(self, account_id):	77	def _update_state_from_account_id(self, account_id):
53	67	if account_id:	78	if account_id and self.goa_client is not None:
54	68	# Make sure the account-id is valid	79	# Make sure the account-id is valid
55	69	obj = self.goa_client.lookup_by_id(account_id)	80	obj = self.goa_client.lookup_by_id(account_id)
56	70	if obj is None:	81	if obj is None: