C2NoTokenError = NoTokenError

rowers/c2stuff.py

@@ -34,7 +34,7 @@ import sys
 import urllib
 from requests import Request, Session
 
-from utils import myqueue,uniqify,isprorower
+from utils import myqueue,uniqify,isprorower, custom_exception_handler, NoTokenError
 
 from rowers.types import otwtypes
 
@@ -46,32 +46,7 @@ queue = django_rq.get_queue('default')
 queuelow = django_rq.get_queue('low')
 queuehigh = django_rq.get_queue('low')
 
-# Custom error class - to raise a NoTokenError
-class C2NoTokenError(Exception):
-    def __init__(self,value):
-	self.value=value
 
-    def __str__(self):
-	return repr(self.value)
-    
-# Custom exception handler, returns a 401 HTTP message
-# with exception details in the json data
-def custom_exception_handler(exc,message):
-
-    response = {
-	"errors": [
-	    {
-		"code": str(exc),
-		"detail": message,
-		}
-	    ]
-	}
-
-    res = HttpResponse(message)
-    res.status_code = 401
-    res.json = json.dumps(response)
-
-    return res
 
 # Checks if user has Concept2 tokens, resets tokens if they are
 # expired.
@@ -84,11 +59,11 @@ def c2_open(user):
 	if (timezone.now()>r.tokenexpirydate):
 	    res = rower_c2_token_refresh(user)
             if res == None:
-                raise C2NoTokenError("User has no token")                
+                raise NoTokenError("User has no token")                
             if res[0] != None:
                 thetoken = res[0]
             else:
-                raise C2NoTokenError("User has no token")
+                raise NoTokenError("User has no token")
 	else:
 	    thetoken = r.c2token
 
@@ -693,7 +668,7 @@ def workout_c2_upload(user,w):
     if (checkworkoutuser(user,w)):
 	c2userid = get_userid(r.c2token)
         if not c2userid:
-            raise C2NoTokenError
+            raise NoTokenError
 
 	data = createc2workoutdata(w)
         if data == 0: