Merge branch 'master' of github.com:ASKBOT/askbot-devel

Author: dzbee

.gitignore

@@ -5,6 +5,8 @@
 fetch
 push
 propagate
+askbot/media/style/.sass-cache/
+.sass-cache
 db
 rebuild-locales.pl
 /src

askbot/conf/external_keys.py

@@ -244,3 +244,24 @@
         description=_('Windows Live secret key'),
     )
 )
+
+settings.register(
+    livesettings.StringValue(
+        EXTERNAL_KEYS,
+        'MICROSOFT_AZURE_KEY',
+        description=_('Microsoft Azure client id'),
+        help_text=_(
+            'Please register your client application at <a href="%(url)s">'
+            'windows applications site</a>'
+        ) % {'url': const.DEPENDENCY_URLS['microsoft-azure-apps']},
+
+    )
+)
+
+settings.register(
+    livesettings.StringValue(
+        EXTERNAL_KEYS,
+        'MICROSOFT_AZURE_SECRET',
+        description=_('Microsoft Azure secret key'),
+    )
+)

askbot/conf/login_providers.py

@@ -222,12 +222,13 @@
     'OpenStackID',
     'Yammer',
     'Windows Live',
+    'Microsoft Azure',
 )
 
 DISABLED_BY_DEFAULT = ('LaunchPad', 'Mozilla Persona', 'OpenStackID')
 
 NEED_EXTRA_SETUP = ('Google Plus', 'Twitter', 'MediaWiki', 'Facebook',
-                    'LinkedIn', 'identi.ca', 'Yammer', 'Windows Live',)
+                    'LinkedIn', 'identi.ca', 'Yammer', 'Windows Live', 'Microsoft Azure',)
 
 for provider in providers:
     if provider == 'local':

askbot/const/__init__.py

@@ -523,6 +523,7 @@
     'mediawiki-oauth-extension': 'https://www.mediawiki.org/wiki/Extension:OAuth',
     'yammer-apps': 'https://www.yammer.com/client_applications',
     'windows-live-apps': 'https://apps.dev.microsoft.com/#/appList',
+    'microsoft-azure-apps': 'https://apps.dev.microsoft.com/#/appList',
 }
 
 PASSWORD_MIN_LENGTH = 8

askbot/deps/django_authopenid/util.py

@@ -484,7 +484,6 @@ def get_facebook_user_id(client):
             'response_parser': lambda data: simplejson.loads(data),
         }
 
-
     if askbot_settings.WINDOWS_LIVE_KEY and askbot_settings.WINDOWS_LIVE_SECRET:
         data['windows-live'] = {
             'name': 'windows-live',
@@ -499,6 +498,31 @@ def get_facebook_user_id(client):
             'extra_auth_params': {'scope': ('wl.basic',)},
         }
 
+    def get_microsoft_azure_user_id(client):
+        conn = httplib.HTTPSConnection('graph.microsoft.com')
+        headers = {
+            'Authorization' : 'Bearer {0}'.format(client.access_token),
+            'Accept' : 'application/json',
+        }
+        conn.request('GET', '/v1.0/me', '', headers)
+        response = conn.getresponse()
+        profile = simplejson.loads(response.read())
+        return profile['id']
+
+    if askbot_settings.MICROSOFT_AZURE_KEY and askbot_settings.MICROSOFT_AZURE_SECRET:
+        data['microsoft-azure'] = {
+            'name': 'microsoft-azure',
+            'display_name': 'Microsoft Azure',
+            'type': 'oauth2',
+            'auth_endpoint': 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
+            'token_endpoint': 'https://login.microsoftonline.com/common/oauth2/v2.0/token',
+            'resource_endpoint': 'https://graph.microsoft.com/v1.0/',
+            'icon_media_path': 'images/jquery-openid/microsoft-azure.png',
+            'get_user_id_function': get_microsoft_azure_user_id,
+            'response_parser': lambda data: simplejson.loads(data),
+            'extra_auth_params': {'scope': ('User.Read',),},
+        }
+
     if askbot_settings.SIGNIN_FEDORA_ENABLED:
         data['fedora'] = {
             'name': 'fedora',
@@ -854,6 +878,9 @@ def get_oauth_parameters(provider_name):
     elif provider_name == 'windows-live':
         consumer_key = askbot_settings.WINDOWS_LIVE_KEY
         consumer_secret = askbot_settings.WINDOWS_LIVE_SECRET
+    elif provider_name == 'microsoft-azure':
+        consumer_key = askbot_settings.MICROSOFT_AZURE_KEY
+        consumer_secret = askbot_settings.MICROSOFT_AZURE_SECRET
     elif provider_name != 'mediawiki':
         raise ValueError('unexpected oauth provider %s' % provider_name)