#102 Use class variables for initialization of OpenIDC Extensions
Merged 7 years ago by puiterwijk. Opened 7 years ago by puiterwijk.

@@ -7,12 +7,14 @@ 

  

  

  class OpenidCExtensionBase(Log):

- 

-     def __init__(self, provider, name, display_name, scopes):

-         self.name = name

-         self.display_name = display_name

-         # A mapping of scope to display string for supported scopes

-         self.scopes = scopes

+     name = None

+     display_name = None

+     # A mapping of scope to dict with scope info

+     scopes = {}

+ 

+     def __init__(self, provider):

+         if self.name is None:

+             raise NotImplementedError('Name missing for OpenIDC extensions')

          self.enabled = False

          self.provider = None

  
@@ -23,7 +25,10 @@ 

          return self.scopes.keys()

  

      def get_display_name(self):

-         return self.display_name

+         if self.display_name:

+             return self.display_name

+         else:

+             return self.name

  

      def get_display_data(self, scopes):

          if not self.enabled:

@@ -6,15 +6,10 @@ 

  

  

  class OpenidCExtension(OpenidCExtensionBase):

- 

-     def __init__(self, provider, *pargs):

-         name = 'ipsilon'

-         display_name = 'Ipsilon Token API'

-         scopes = {

-             'ipsilon_token': 'Ipsilon token verification'

+     name = 'ipsilon'

+     display_name = 'Ipsilon Token API'

+     scopes = {

+         'ipsilon_token': {

+             'display_name': 'Ipsilon token verification'

          }

- 

-         super(OpenidCExtension, self).__init__(provider,

-                                                name,

-                                                display_name,

-                                                scopes)

+     }

This allows for easier extension definitions since they don't need
to write code if the extension is only used for defining additional
token scopes.

Signed-off-by: Patrick Uiterwijk puiterwijk@redhat.com

rebased

7 years ago

Pull-Request has been merged by puiterwijk

7 years ago