Added social auth...

.bowerrc

@@ -0,0 +1,3 @@
+{
+    "directory": "./openbudgets/commons/static/vendor"
+}

.gitignore

@@ -9,7 +9,6 @@
 *.pyc
 .coverage
 openbudgets/settings/deploy.py
-openbudgets/settings/local.py
 fabfile/sensitive.yaml
 docs/_build
 docs/_static

bower.json

@@ -0,0 +1,24 @@
+{
+  "name": "openmuni-budgets",
+  "version": "0.0.1",
+  "dependencies": {
+    "uijet": "~0.0.30",
+    "eventbox": "~0.1.2",
+    "mustache": "0.7.3",
+    "jquery": "~2.1.0",
+    "adaptabl": "latest",
+    "jquery-mousewheel": "~3.1.3",
+    "jqScroll": "ydaniv/jqScroll",
+    "spin": "spinjs#~1.3.3",
+    "requirejs": "~2.1.11",
+    "q": "~1.0.0",
+    "backbone": "amdjs/backbone#~1.1.0",
+    "setImmediate": "git://github.com/NobleJS/setImmediate.git#1.0.1",
+    "backbone-fetch-cache": "~1.4.0",
+    "d3": "~3.4.1",
+    "underscore": "lodash#~2.4.1"
+  },
+  "resolutions": {
+    "jquery": "~2.1.0"
+  }
+}

docs/guide/start.rst

@@ -8,8 +8,7 @@ Start
 
 .. image:: https://coveralls.io/repos/prjts/openbudgets/badge.png?branch=develop
    :alt: Coverage Status
-   :target: https://coveralls.io/r/prjts/openbudgets?branch=develop
-
+   :target: https://coveralls.io/r/prjts/openbudgets?branch=developboo
 
 Open Budgets is a web app and web API for storing, accessing, visualizing and comparing budgetary data.
 
@@ -25,13 +24,11 @@ Server
 
 The server is written in Python using Django and Django REST Framework.
 
-
 Client
 ------
 
 The client is written in Javascript makes use of Uijet, Backbone, JQuery, and D3.
 
-
 System requirements
 ===================
 
@@ -371,7 +368,7 @@ Ok, so contining, let's bootstrap the environment. Run the following commands::
     fab e local.db.createuser
 
     # build out the project
-    fab e local.bootstrap:initial=yes    
+    fab e local.bootstrap:initial=yes
 
 Now, Let's start the server:
 

openbudgets/apps/accounts/middleware.py

@@ -0,0 +1,7 @@
+from social_auth.middleware import SocialAuthExceptionMiddleware
+from django.conf import settings
+
+
+class OpenBudgetsSocialAuthExceptionMiddleware(SocialAuthExceptionMiddleware):
+	def get_redirect_uri(self, request, exception):
+		return settings.LOGIN_URL

openbudgets/apps/accounts/social_exceptions.py

@@ -0,0 +1,7 @@
+from social_auth.exceptions import SocialAuthBaseException
+from django.utils.translation import ugettext as _
+
+
+class NonIdenticalEmailAddress(SocialAuthBaseException):
+    def __unicode__(self):
+        return _(u'Identical email error: {message}').format(message=self.message)

openbudgets/apps/accounts/social_pipeline.py

@@ -0,0 +1,56 @@
+from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
+from django.utils.translation import ugettext
+from social_auth.models import UserSocialAuth
+from .models import Account
+from social_auth.exceptions import AuthException
+from social_exceptions import NonIdenticalEmailAddress
+
+
+def associate_by_email(details, user=None, *args, **kwargs):
+    """Return user entry with same email address as one returned on details."""
+    email = details.get('email', None)
+
+    if user and user.email == email:
+        return None
+    elif not email or (user and user.email != email):
+        msg = ugettext('Social email address and account email ' +
+                       'address must be idnetical')
+        raise NonIdenticalEmailAddress(msg)
+    if email:
+        # Try to associate accounts registered with the same email address,
+        # only if it's a single object. AuthException is raised if multiple
+        # objects are returned.
+        try:
+            return {'user': UserSocialAuth.get_user_by_email(email=email)}
+        except MultipleObjectsReturned:
+            raise AuthException(kwargs['backend'], 'Not unique email address.')
+        except ObjectDoesNotExist:
+            pass
+
+
+def create_user(backend, details, response, uid, username, user=None, *args,
+                **kwargs):
+    """Create user. Depends on get_username pipeline."""
+    if user:
+        return {'user': user}
+    if not username:
+        return None
+
+    # Avoid hitting field max length
+    email = details.get('email')
+    original_email = None
+    if email and UserSocialAuth.email_max_length() < len(email):
+        original_email = email
+        email = ''
+    first_name = details.get('first_name', 'John')
+    last_name = details.get('last_name', 'Doe')
+    password = Account.objects.make_random_password()
+
+    return {
+        'user': UserSocialAuth.create_user(username=username, email=email,
+                                           first_name=first_name,
+                                           last_name=last_name,
+                                           password=password),
+        'original_email': original_email,
+        'is_new': True
+    }

openbudgets/apps/accounts/templates/accounts/account_detail.html

@@ -30,7 +30,19 @@
     </div>
 </div>
 
-
+<div class="social-accounts">
+  {% for provider,account in social_auth.items %}
+	  {% if account and provider %}
+	  		<div class="account">
+		  		<form method="POST" action="{% url "socialauth_disconnect_individual" provider account.id %}"
+		  			  class="social-revoke-form">
+		  		   {% csrf_token %}
+				   <input type="submit" class="social-revoke-control" value="-"> {{ provider }}
+				 </form>
+			</div>
+	   {% endif %}
+   {% endfor %}
+ </div>
 
 
 

openbudgets/apps/accounts/templates/accounts/partials/account_tools.html

@@ -3,6 +3,7 @@
 
 <div class="account{% if user.is_authenticated %} auth{% endif %}">
     {% if user.is_authenticated %}
+    <div class="dead-area-catcher"></div>
     <a class="avatar" href="{% url 'account_detail' user.uuid %}"><img src="{{ user.avatar }}" /></a>
     <div class="name">
         {{ user.first_name }}

openbudgets/apps/accounts/urls/ui.py

@@ -11,6 +11,7 @@
 
 urlpatterns = patterns('',
 
+
     url(r'^activate/complete/$',
        TemplateView.as_view(template_name='registration/activation_complete.html'),
        name='registration_activation_complete'),

openbudgets/apps/accounts/views/ui.py

@@ -27,6 +27,7 @@
     CustomRegistrationForm, CustomAuthenticationForm, CustomPasswordChangeForm,\
     CustomPasswordResetForm
 from openbudgets.commons.mixins.views import UserDataObjectMixin, JSONResponseMixin
+from django.contrib.messages import get_messages
 
 
 class AccountDetailView(LoginRequiredMixin, UserDataObjectMixin, DetailView):
@@ -153,7 +154,6 @@ def account_login(request, template_name='registration/login.html',
                   redirect_field_name=REDIRECT_FIELD_NAME,
                   authentication_form=CustomAuthenticationForm,
                   current_app=None, extra_context=None):
-
     redirect_to = request.REQUEST.get(redirect_field_name, '')
 
     if request.method == "POST":

openbudgets/apps/entities/static/entities/explorer/controllers/ItemsList.js

@@ -39,11 +39,11 @@ define([
 
             return this.publish('scope_changed', item_model);
         },
-        setScope            : function (scope) {
+        setScope            : function (scope){
             scope = scope || null;
             if ( scope !== this.scope ) {
                 this.scope = scope;
-                if ( this.has_data ) {
+                if ( this.resource.length ) {
                     this._publishScope();
                 }
                 else {
@@ -52,21 +52,21 @@ define([
             }
             return this;
         },
-        redraw              : function (scope) {
-            var filter = this.active_filters ?
-                    this.resource.byAncestor :
-                    this.resource.byParent; 
-            this.setScope(scope);
-            return this.filter(filter, this.scope)
-                       .render();
-        },
+//        redraw              : function (scope) {
+//            var filter = this.active_filters ?
+//                    this.resource.byAncestor :
+//                    this.resource.byParent; 
+//            this.setScope(scope);
+//            return this.filter(filter, this.scope)
+//                       .render();
+//        },
         sortItems           : function (data) {
             var sorting_key = (data.desc ? '-' : '') + data.column,
                 is_comparator_function = uijet.utils.isFunc(this.options.sorting[sorting_key]);
             this.desc = data.desc;
             this.sort(sorting_key);
 
-            if ( this.has_data ) {
+            if ( this.resource.length ) {
                 if ( ! this.filtered ) {
                     this.filtered = this.resource.models;
                 }

openbudgets/apps/entities/static/entities/explorer/css/main.css

@@ -3,7 +3,7 @@
 @import url(http://fonts.googleapis.com/css?family=Alef:400,700);
 @import url(http://fonts.googleapis.com/earlyaccess/alefhebrew.css);
 
-@import url('/static/vendor/uijet/uijet.css');
+@import url('/static/vendor/uijet/src/uijet.css');
 @import url('globals.css');
 @import url('right.css');
 @import url('main-section.css');

openbudgets/apps/entities/static/entities/explorer/main.js

@@ -1,26 +1,40 @@
 requirejs.config({
     baseUrl : '/static/vendor',
     paths   : {
-        jqscroll            : 'jqScroll/jqscroll',
-        'jquery.mousewheel' : 'jquery-mousewheel',
-        uijet_dir           : 'uijet',
-        widgets             : 'uijet/widgets',
-        composites          : 'uijet/composites',
-        modules             : 'uijet/modules',
-        explorer            : '../entities/explorer/explorer',
-        ui                  : '../entities/explorer/ui',
-        resources           : '../entities/explorer/resources',
-        controllers         : '../entities/explorer/controllers',
-        project_modules     : '../entities/explorer/modules',
-        project_widgets     : '../entities/explorer/widgets',
-        project_mixins      : '../entities/explorer/mixins',
-        dictionary          : '../entities/explorer/dictionary',
-        api                 : '../src/api',
-        i18n                : '../src/i18n'
+        jquery                 : 'jquery/dist/jquery',
+        jqscroll               : 'jqScroll/jqscroll',
+        'jquery.mousewheel'    : 'jquery-mousewheel/jquery.mousewheel',
+        backbone               : 'backbone/backbone',
+        'backbone-fetch-cache' : 'backbone-fetch-cache/backbone.fetch-cache',
+        d3                     : 'd3/d3',
+        underscore             : 'underscore/dist/lodash.underscore',
+        mustache               : 'mustache/mustache',
+        q                      : 'q/q',
+        spin                   : 'spin/spin',
+        setImmediate           : 'setImmediate/setImmediate',
+        eventbox               : 'eventbox/eventbox',
+        uijet_dir              : 'uijet/src',
+        widgets                : 'uijet/src/widgets',
+        composites             : 'uijet/src/composites',
+        modules                : 'uijet/src/modules',
+        explorer               : '../entities/explorer/explorer',
+        ui                     : '../entities/explorer/ui',
+        resources              : '../entities/explorer/resources',
+        controllers            : '../entities/explorer/controllers',
+        project_modules        : '../entities/explorer/modules',
+        project_widgets        : '../entities/explorer/widgets',
+        project_mixins         : '../entities/explorer/mixins',
+        dictionary             : '../entities/explorer/dictionary',
+        api                    : '../src/api',
+        i18n                   : '../src/i18n'
     },
     shim    : {
         eventbox                : ['setImmediate'],
-        'backbone-fetch-cache'  : 'modules/data/backbone'
+        'backbone-fetch-cache'  : 'modules/data/backbone',
+        backbone                : {
+            deps: ['underscore', 'jquery'],
+            exports: 'Backbone'
+        }
     }
 });
 requirejs([

openbudgets/apps/entities/static/entities/explorer/templates/items_breadcrumbs.ms

@@ -3,7 +3,7 @@
 {{/stache}}
 
 {{^stache}}
-{{#.}}
+{{#Breadcrumbs}}
 <li data-id="{{attributes.node}}">{{attributes.name}}</li>
-{{/.}}
+{{/Breadcrumbs}}
 {{/stache}}

openbudgets/apps/entities/static/entities/explorer/templates/items_list.ms

@@ -13,19 +13,19 @@
 {{/stache}}
 
 {{^stache}}
-{{#.}}
-{{#attributes}}
-<li data-id="{{node}}" data-item="{{id}}" {{#leaf_item}}data-leaf{{/leaf_item}}>
-    <span class="item_cell item_cell_type"></span><span
-    class="item_cell item_cell_code">{{code}}</span><span
-    class="item_cell item_cell_name">{{name}}</span><span
-    class="item_cell item_cell_direction">{{direction}}</span><span
-    class="item_cell item_cell_budget amount{{#is_empty}}{{budget}}{{/is_empty}}">{{#commas}}{{budget}}{{/commas}}</span><span
-    class="item_cell item_cell_actual amount{{#is_empty}}{{actual}}{{/is_empty}}">{{#commas}}{{actual}}{{/commas}}</span><span
-    class="item_cell item_cell_comment"><span class="td_filler">
-        <span class="item_comment_button {{#has_comments}}has_comments{{/has_comments}}">{{comment_count}}</span>
-    </span></span>
-</li>
-{{/attributes}}
-{{/.}}
+{{#LatestSheet}}
+    {{#attributes}}
+        <li data-id="{{node}}" data-item="{{id}}" {{#leaf_item}}data-leaf{{/leaf_item}}>
+            <span class="item_cell item_cell_type"></span><span
+            class="item_cell item_cell_code">{{code}}</span><span
+            class="item_cell item_cell_name">{{name}}</span><span
+            class="item_cell item_cell_direction">{{direction}}</span><span
+            class="item_cell item_cell_budget amount{{#is_empty}}{{budget}}{{/is_empty}}">{{#commas}}{{budget}}{{/commas}}</span><span
+            class="item_cell item_cell_actual amount{{#is_empty}}{{actual}}{{/is_empty}}">{{#commas}}{{actual}}{{/commas}}</span><span
+            class="item_cell item_cell_comment"><span class="td_filler">
+                <span class="item_comment_button {{#has_comments}}has_comments{{/has_comments}}">{{comment_count}}</span>
+            </span></span>
+        </li>
+    {{/attributes}}
+{{/LatestSheet}}
 {{/stache}}