virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 8)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

2 new commits in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/e163ed0bcad8/
Changeset:   e163ed0bcad8
User:        alllee
Date:        2013-05-01 23:54:48
Summary:     fixing bug in lighterprints api login
Affected #:  2 files

diff -r 82bc16b1b4e9ff4bbc4a554bb8ab14577b42821c -r e163ed0bcad882df6fc02f405f417f0c2953b816 vcweb/core/tests.py

--- a/vcweb/core/tests.py
+++ b/vcweb/core/tests.py
@@ -48,7 +48,7 @@
 
     @property
     def participant_group_relationships(self):
-        return ParticipantGroupRelationship.objects.filter(group__experiment=self.experiment)
+        return self.experiment.participant_group_relationships
 
     def create_new_experiment(self, experiment_metadata, experimenter=None):
         if experimenter is None:

diff -r 82bc16b1b4e9ff4bbc4a554bb8ab14577b42821c -r e163ed0bcad882df6fc02f405f417f0c2953b816 vcweb/lighterprints/views.py
--- a/vcweb/lighterprints/views.py
+++ b/vcweb/lighterprints/views.py
@@ -278,7 +278,7 @@
             participant = user.participant
 # FIXME: defaulting to first active experiment... need to revisit this.
             active_experiment = get_active_experiment(participant, experiment_metadata=get_lighterprints_experiment_metadata())
-            participant_group_relationship = participant.get_participant_group_relationship(active_experiment)
+            participant_group_relationship = active_experiment.get_participant_group_relationship(participant)
             return JsonResponse(dumps({'success': True, 'participant_group_id': participant_group_relationship.id}))
         else:
             logger.debug("invalid form %s", form)


https://bitbucket.org/virtualcommons/vcweb/commits/5812d8de0878/
Changeset:   5812d8de0878
User:        alllee
Date:        2013-05-02 00:07:02
Summary:     moving /lighterprints/api/login to /api/login (for participants only)

refactor eventually, merge with LoginView / LogoutView
Affected #:  4 files

diff -r e163ed0bcad882df6fc02f405f417f0c2953b816 -r 5812d8de087899fbe9a7a2b5078b7436a5fc80f3 vcweb/core/urls.py
--- a/vcweb/core/urls.py
+++ b/vcweb/core/urls.py
@@ -3,7 +3,8 @@
 from vcweb import settings
 from vcweb.core.views import (Dashboard, LoginView, LogoutView, RegistrationView, monitor, CloneExperimentView,
         RegisterEmailListView, RegisterTestParticipantsView, ClearParticipantsExperimentView, add_experiment,
-        Participate, download_data, export_configuration, api_logger, participant_ready, get_number_of_ready_participants, deactivate)
+        Participate, download_data, export_configuration, api_logger, participant_api_login, api_logout,
+        participant_ready, get_number_of_ready_participants, deactivate)
 import logging
 import urllib
 
@@ -35,6 +36,8 @@
 # experiment controller actions are the most general, needs to be matched at the very end
     # deliberately match any prefix to api/2525/log
     url(r'api/log/(?P<participant_group_id>\d+)$', api_logger, name='api-logger'),
+    url(r'api/login', participant_api_login, name='participant_api_login'),
+    url(r'api/logout', api_logout, name='api_logout'),
     )
 
 def foursquare_auth_dict(**kwargs):

diff -r e163ed0bcad882df6fc02f405f417f0c2953b816 -r 5812d8de087899fbe9a7a2b5078b7436a5fc80f3 vcweb/core/views.py
--- a/vcweb/core/views.py
+++ b/vcweb/core/views.py
@@ -129,6 +129,33 @@
         return pers[0].experiment
     return None
 
+# FIXME: merge these with LogoutView / LoginView
+def api_logout(request):
+    user = request.user
+    set_authentication_token(user)
+    auth.logout(request)
+    return JsonResponse(dumps({'success': True}))
+
+# FIXME: assumes participant login
+def participant_api_login(request):
+    form = LoginForm(request.POST or None)
+    try:
+        if form.is_valid():
+            user = form.user_cache
+            logger.debug("user was authenticated as %s, attempting to login", user)
+            auth.login(request, user)
+            set_authentication_token(user, request.session.session_key)
+            participant = user.participant
+# FIXME: defaulting to first active experiment... need to revisit this.
+            active_experiment = get_active_experiment(participant)
+            participant_group_relationship = active_experiment.get_participant_group_relationship(participant)
+            return JsonResponse(dumps({'success': True, 'participant_group_id': participant_group_relationship.pk}))
+        else:
+            logger.debug("invalid form %s", form)
+    except Exception as e:
+        logger.debug("Invalid login: %s", e)
+    return JsonResponse(dumps({'success': False, 'message': "Invalid login"}))
+
 
 class LoginView(FormView, AnonymousMixin):
     form_class = LoginForm

diff -r e163ed0bcad882df6fc02f405f417f0c2953b816 -r 5812d8de087899fbe9a7a2b5078b7436a5fc80f3 vcweb/lighterprints/urls.py
--- a/vcweb/lighterprints/urls.py
+++ b/vcweb/lighterprints/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls.defaults import url, patterns
 from django.views.generic.base import TemplateView
 
-from vcweb.lighterprints.views import (post_chat_message, post_comment, perform_activity, login, participate,
+from vcweb.lighterprints.views import (post_chat_message, post_comment, perform_activity, participate,
         group_activity, like, get_notifications, update_notifications_since, group_score, CsvExportView, checkin,
         activity_performed_counts, get_view_model, mobile_participate)
 
@@ -16,7 +16,6 @@
     url(r'^api/message', post_chat_message),
     url(r'^api/comment', post_comment),
     url(r'^api/like', like),
-    url(r'^api/login', login),
     url(r'^api/group-score/(?P<participant_group_id>\d+)', group_score),
     url(r'^api/notifications/clear', update_notifications_since),
     url(r'^api/notifications/(?P<participant_group_id>\d+)', get_notifications),

diff -r e163ed0bcad882df6fc02f405f417f0c2953b816 -r 5812d8de087899fbe9a7a2b5078b7436a5fc80f3 vcweb/lighterprints/views.py
--- a/vcweb/lighterprints/views.py
+++ b/vcweb/lighterprints/views.py
@@ -1,21 +1,19 @@
 from datetime import datetime, timedelta
-from django.contrib import auth
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
-from django.http import HttpResponse, Http404
-from django.shortcuts import get_object_or_404, render, redirect
-from django.utils.html import escape
+from django.http import Http404
+from django.shortcuts import get_object_or_404, render
 from django.views.decorators.csrf import csrf_exempt
-from django.views.generic.detail import DetailView, BaseDetailView
+from django.views.generic.detail import BaseDetailView
 from django.views.generic.list import BaseListView, MultipleObjectTemplateResponseMixin
 
 from vcweb.core import unicodecsv
 from vcweb.core.decorators import participant_required
-from vcweb.core.forms import (ChatForm, LoginForm, CommentForm, LikeForm, ParticipantGroupIdForm, GeoCheckinForm)
+from vcweb.core.forms import (ChatForm, CommentForm, LikeForm, ParticipantGroupIdForm, GeoCheckinForm)
 from vcweb.core.http import JsonResponse
 from vcweb.core.models import (ChatMessage, Comment, Experiment, ParticipantGroupRelationship, ParticipantRoundDataValue, Like)
 from vcweb.core.services import foursquare_venue_search
-from vcweb.core.views import JSONResponseMixin, DataExportMixin, dumps, set_authentication_token, json_response, get_active_experiment
+from vcweb.core.views import JSONResponseMixin, DataExportMixin, dumps, json_response
 from vcweb.lighterprints.forms import ActivityForm
 from vcweb.lighterprints.models import (Activity, get_all_activities_tuple, do_activity, get_group_activity,
         can_view_other_groups, get_lighterprints_experiment_metadata, is_experiment_completed,
@@ -266,26 +264,6 @@
         logger.debug("invalid form: %s from request: %s", form, request)
         return JsonResponse(dumps({'success': False, 'message': 'Invalid post comment'}))
 
-@csrf_exempt
-def login(request):
-    form = LoginForm(request.POST or None)
-    try:
-        if form.is_valid():
-            user = form.user_cache
-            logger.debug("user was authenticated as %s, attempting to login", user)
-            auth.login(request, user)
-            set_authentication_token(user, request.session.session_key)
-            participant = user.participant
-# FIXME: defaulting to first active experiment... need to revisit this.
-            active_experiment = get_active_experiment(participant, experiment_metadata=get_lighterprints_experiment_metadata())
-            participant_group_relationship = active_experiment.get_participant_group_relationship(participant)
-            return JsonResponse(dumps({'success': True, 'participant_group_id': participant_group_relationship.id}))
-        else:
-            logger.debug("invalid form %s", form)
-    except Exception as e:
-        logger.debug("Invalid login: %s", e)
-    return JsonResponse(dumps({'success': False, 'message': "Invalid login"}))
-
 class CsvExportView(DataExportMixin, BaseDetailView):
     def export_data(self, response, experiment):
         logger.debug("exporting data for %s", experiment)

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.




2008	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (21)	Aug (31)	Sep (6)	Oct (15)	Nov (2)	Dec (9)
2009	Jan (4)	Feb (6)	Mar (12)	Apr (52)	May (14)	Jun (19)	Jul (81)	Aug (115)	Sep (36)	Oct (88)	Nov (46)	Dec (58)
2010	Jan (52)	Feb (55)	Mar (48)	Apr (15)	May (5)	Jun (38)	Jul (27)	Aug (24)	Sep (28)	Oct (1)	Nov (2)	Dec (29)
2011	Jan (87)	Feb (39)	Mar (63)	Apr (42)	May (26)	Jun (53)	Jul (23)	Aug (43)	Sep (37)	Oct (25)	Nov (4)	Dec (7)
2012	Jan (73)	Feb (79)	Mar (62)	Apr (28)	May (12)	Jun (2)	Jul (9)	Aug (1)	Sep (8)	Oct	Nov (3)	Dec (3)
2013	Jan (8)	Feb (16)	Mar (38)	Apr (74)	May (62)	Jun (15)	Jul (49)	Aug (19)	Sep (9)	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr (2)	May (25)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 8)

virtualcommons-svn — Virtual Commons source control (SVN/HG) commit traffic