cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [45/50] [abbrv] cloudstack-gcestack git commit: Add pyjwt to dependencies, remove unnecessary arg
Date Tue, 05 May 2015 11:19:19 GMT
Add pyjwt to dependencies, remove unnecessary arg


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/commit/9e09bd5b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/tree/9e09bd5b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/diff/9e09bd5b

Branch: refs/heads/master
Commit: 9e09bd5b950c0786238302cb9e57564d9407b058
Parents: dcf0afc
Author: BroganD1993 <darrenbrogan@hotmail.com>
Authored: Mon Jul 28 19:19:32 2014 +0100
Committer: BroganD1993 <darrenbrogan@hotmail.com>
Committed: Mon Jul 28 19:19:32 2014 +0100

----------------------------------------------------------------------
 pyoauth2/provider.py | 8 ++++----
 setup.py             | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/blob/9e09bd5b/pyoauth2/provider.py
----------------------------------------------------------------------
diff --git a/pyoauth2/provider.py b/pyoauth2/provider.py
index 2c95374..f939887 100644
--- a/pyoauth2/provider.py
+++ b/pyoauth2/provider.py
@@ -127,8 +127,8 @@ class AuthorizationProvider(Provider):
         """
         return "3600"
 
-    def generate_id_token(self, client_id, client_secret):
-        """Generate a random authorization code.
+    def generate_id_token(self, client_secret):
+        """Generate a jwt id token, containing email.
 
         :rtype: str
         """
@@ -271,7 +271,7 @@ class AuthorizationProvider(Provider):
         token_type = self.token_type
         expires_in = self.token_expires_in
         refresh_token = self.generate_refresh_token()
-        id_token = self.generate_id_token(client_id, client_secret)
+        id_token = self.generate_id_token(client_secret)
 
         # Save information to be used to validate later requests
         self.persist_token_information(client_id=client_id,
@@ -348,7 +348,7 @@ class AuthorizationProvider(Provider):
         token_type = self.token_type
         expires_in = self.token_expires_in
         refresh_token = self.generate_refresh_token()
-        id_token = self.generate_id_token(client_id, client_secret)
+        id_token = self.generate_id_token(client_secret)
 
         # Save information to be used to validate later requests
         self.persist_token_information(client_id=client_id,

http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/blob/9e09bd5b/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index e577c23..415cff8 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,8 @@ setup(
         'pyopenssl',
         'Flask-SQLAlchemy',
         'flask',
-        'alembic'
+        'alembic',
+        'pyjwt'
     ],
     classifiers=[
         'Development Status :: 3 - Alpha',


Mime
View raw message