← Back to branch summary

~mapclient.devs/mapclient/stable

« back to all changes in this revision

Viewing changes to mapclient/settings/info.py

  • Committer: musculoskeletal
  • Date: 2014-06-25 05:38:05 UTC
  • mfrom: (1.6.35 testing)
  • Revision ID: musculoskeletal@bioeng1033-20140625053805-jkqhi5oq74vmlntl
Merging testing into stable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mapclient/settings/info.py
20
20
from PySide import QtCore
21
21
 
22
22
VERSION_MAJOR = 0
23
 
VERSION_MINOR = 10
24
 
VERSION_PATCH = 1
 
23
VERSION_MINOR = 11
 
24
VERSION_PATCH = 0
25
25
VERSION_STRING = str(VERSION_MAJOR) + "." + str(VERSION_MINOR) + "." + str(VERSION_PATCH)
26
26
GPL_VERSION = '3'
27
27
APPLICATION_NAME = 'MAP Client'
28
28
ORGANISATION_NAME = 'Musculo Skeletal'
29
29
ORGANISATION_DOMAIN = 'musculoskeletal.org'
30
30
 
31
 
DEFAULT_PMR_IPADDRESS = 'teaching.physiomeproject.org'
 
31
DEFAULT_PMR_IPADDRESS = 'http://teaching.physiomeproject.org'
32
32
DEFAULT_CONSUMER_PUBLIC_TOKEN = 'ghRsy25tpMnt36Aj7R_LsxUS'
33
33
DEFAULT_CONSUMER_SECRET_TOKEN = '41IgdRjQS1HsO_mq8VN2M2Dg'
34
34
 
 
35
# Credentials follows:
 
36
#
 
37
# Key    OP8AKmDIlH7OkHaPWNbnb-zf
 
38
# Secret    QQcKMnyCjjb7JNDHA-Lwdu7p
 
39
#
 
40
# The scope that should be used
 
41
#
 
42
# from urllib import quote_plus
 
43
# DEFAULT_SCOPE = quote_plus(
 
44
#     'http://localhost:8280/pmr/scope/collection,'
 
45
#     'http://localhost:8280/pmr/scope/search,'
 
46
#     'http://localhost:8280/pmr/scope/workspace_tempauth,'
 
47
#     'http://localhost:8280/pmr/scope/workspace_full'
 
48
# )
 
49
 
35
50
# Contributors list
36
51
HS = {'name': 'Hugh Sorby', 'email': 'h.sorby@auckland.ac.nz'}
37
52
 
60
75
    def readSettings(self):
61
76
        settings = QtCore.QSettings()
62
77
        settings.beginGroup('PMR')
63
 
        self._ipaddress = settings.value('pmr-website', DEFAULT_PMR_IPADDRESS)
64
 
        self._consumer_public_token = settings.value('consumer-public-token', DEFAULT_CONSUMER_PUBLIC_TOKEN)
65
 
        self._consumer_secret_token = settings.value('consumer-secret-token', DEFAULT_CONSUMER_SECRET_TOKEN)
66
 
        self._user_public_token = settings.value('user-public-token', '')
67
 
        self._user_secret_token = settings.value('user-secret-token', '')
68
 
        if not self._user_public_token:
69
 
            self._user_public_token = None
70
 
        if not self._user_secret_token:
71
 
            self._user_secret_token = None
 
78
        # pmr_host?  this is a domain name...
 
79
        self.ipaddress = settings.value('pmr-website', DEFAULT_PMR_IPADDRESS)
 
80
        self.host = self.ipaddress
 
81
        self.consumer_public_token = settings.value('consumer-public-token', DEFAULT_CONSUMER_PUBLIC_TOKEN)
 
82
        self.consumer_secret_token = settings.value('consumer-secret-token', DEFAULT_CONSUMER_SECRET_TOKEN)
 
83
        self.user_public_token = settings.value('user-public-token', None)
 
84
        self.user_secret_token = settings.value('user-secret-token', None)
72
85
        settings.endGroup()
73
86
 
74
87
    def writeSettings(self):
75
88
        settings = QtCore.QSettings()
76
89
        settings.beginGroup('PMR')
77
 
        temp_public = ''
78
 
        if self._user_public_token:
79
 
            temp_public = self._user_public_token
80
 
        temp_secret = ''
81
 
        if self._user_secret_token:
82
 
            temp_secret = self._user_secret_token
 
90
 
 
91
        temp_public = self.user_public_token or ''
 
92
        temp_secret = self.user_secret_token or ''
 
93
 
83
94
        settings.setValue('user-public-token', temp_public)
84
95
        settings.setValue('user-secret-token', temp_secret)
85
96
        settings.endGroup()
86
97
 
87
 
    def ipAddress(self):
88
 
        return self._ipaddress
89
 
 
90
 
    def consumerPublicToken(self):
91
 
        return self._consumer_public_token
92
 
 
93
 
    def consumerSecretToken(self):
94
 
        return self._consumer_secret_token
95
 
 
96
 
    def userPublicToken(self):
97
 
        return self._user_public_token
98
 
 
99
 
    def userSecretToken(self):
100
 
        return self._user_secret_token
101
 
 
102
 
    def setUserPublicToken(self, token):
103
 
        self._user_public_token = token
104
 
 
105
 
    def setUserSecretToken(self, token):
106
 
        self._user_secret_token = token
107
 
 
108
 
 
109
 
 
110
 
 
 
98
    def update_token(self, oauth_token, oauth_token_secret):
 
99
        self.user_public_token = oauth_token
 
100
        self.user_secret_token = oauth_token_secret
 
101
        self.writeSettings()
 
102
 
 
103
    def has_access(self):
 
104
        return bool(self.user_public_token and self.user_secret_token)
 
105
 
 
106
    def get_session_kwargs(self):
 
107
        return {
 
108
            'client_key': self.consumer_public_token,
 
109
            'client_secret': self.consumer_secret_token,
 
110
            'resource_owner_key': self.user_public_token,
 
111
            'resource_owner_secret': self.user_secret_token,
 
112
        }