don't use getAdmin to get identities roles

This commit is contained in:
fpeters 2004-07-18 17:49:16 +00:00
parent b0269e4271
commit 96f3d3206f
3 changed files with 12 additions and 1 deletions

View File

@ -412,6 +412,9 @@ class IdentitiesServer(commonIdentities.IdentitiesCommonMixin,
virtualServer.markObjectAsDirty(identity)
virtualServer.markCoreAsDirty()
def getAdminIdentitiesRoles(self):
return (self.getAdminCore(check = 0).identitiesRoles) or []
def getElectionVoteToken(self, electionId):
clientToken = context.getVar('clientToken')
clientId = getApplicationId(clientToken)
@ -565,6 +568,7 @@ class IdentitiesServer(commonIdentities.IdentitiesCommonMixin,
self.registerPublicMethod('checkIdentityPeerNameIdentifierIDP')
self.registerPublicMethod('checkIdentityPeerNameIdentifierSP')
self.registerPublicMethod('deleteUserToken')
self.registerPublicMethod('getAdminIdentitiesRoles')
self.registerPublicMethod('getElectionVoteToken')
self.registerPublicMethod('getLocalNameIdentifierIdentityProvider')
self.registerPublicMethod('getLocalNameIdentifierServiceProvider')

View File

@ -135,7 +135,7 @@ class Identity(objects.ObjectCommon):
label = N_('Person')
def getServerRoles(self, slot):
from glasnost.proxy.IdentitiesProxy import IdentitiesProxy
return IdentitiesProxy().getAdmin().identitiesRoles
return IdentitiesProxy().getAdminIdentitiesRoles()
serverRole = 'identities'

View File

@ -142,6 +142,13 @@ class IdentitiesProxy(commonIdentities.IdentitiesCommonMixin,
'deleteUserToken',
[serverId, getApplicationToken(), userToken])
def getAdminIdentitiesRoles(self, serverId = None):
userToken = context.getVar('userToken', default = '')
return callServer(
serverId,
'getAdminIdentitiesRoles',
[serverId, getApplicationToken(), userToken])
def getDefaultAssertionConsumerServiceUrl(self, electionId):
userToken = context.getVar('userToken', default = '')
serverId = self.computeServerIdFromUserToken(userToken)