Added support for v2 authid with cli tokens

Author: albertony

cli-token.html

@@ -25,6 +25,7 @@ <h1>{{appname}} for {{service}}</h1>
       <p>Type in the CLI token</p>
       <form action="/cli-token-login" method="POST">
         <input type="hidden" id="id" name="id" value="{{id}}" />
+        <input type="hidden" id="tokenversion" name="tokenversion" value="{{tokenversion}}" />
         <input class="form-control" type="text" id="token" name="token" required />
         <br/>
         <br/>

main.py

@@ -172,8 +172,8 @@ def get(self):
                 if self.request.get('token', None) is not None:
                     link += '&token=' + self.request.get('token')
 
-                if tokenversion is not None:
-                    link += '&tokenversion=' + str(tokenversion)
+            if tokenversion is not None:
+                link += '&tokenversion=' + str(tokenversion)
 
             notes = ''
             if n.has_key('notes'):
@@ -396,7 +396,8 @@ def get(self):
             'service': provider['display'],
             'appname': settings.APP_NAME,
             'longappname': settings.SERVICE_DISPLAYNAME,
-            'id': provider['id']
+            'id': provider['id'],
+            'tokenversion': self.request.get('tokenversion', '')
         }
 
         template = JINJA_ENVIRONMENT.get_template('cli-token.html')
@@ -414,6 +415,12 @@ def post(self):
             provider, service = find_provider_and_service(id)
             display = provider['display']
 
+            tokenversion = None
+            try:
+                tokenversion = int(self.request.POST.get('tokenversion'))
+            except:
+                pass
+
             try:
                 data = self.request.POST.get('token')
                 content = base64.urlsafe_b64decode(str(data) + '=' * (-len(data) % 4))
@@ -444,6 +451,28 @@ def post(self):
 
             resp = json.loads(content)
 
+            # v2 tokens are just the provider name and the refresh token
+            # and they have no stored state on the server
+            if tokenversion == 2:
+                authid = 'v2:' + id + ':' + resp['refresh_token']
+                fetchtoken = dbmodel.create_fetch_token(resp)
+                dbmodel.update_fetch_token(fetchtoken, authid)
+
+                # Report results to the user
+                template_values = {
+                    'service': display,
+                    'appname': settings.APP_NAME,
+                    'longappname': settings.SERVICE_DISPLAYNAME,
+                    'authid': authid,
+                    'fetchtoken': fetchtoken
+                }
+
+                template = JINJA_ENVIRONMENT.get_template('logged-in.html')
+                self.response.write(template.render(template_values))
+
+                logging.info('Returned refresh token for service %s', id)
+                return
+
             keyid, authid = create_authtoken(id, resp)
 
             fetchtoken = dbmodel.create_fetch_token(resp)