🚧 Added basic code for 2FA authentication

guyzmo · Oct 12, 2016 · 0c29743 · 0c29743
1 parent 207330a
commit 0c29743
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/git_repo/repo.py b/git_repo/repo.py
@@ -491,7 +491,7 @@ def setup_service(service):
             username = loop_input('username> ')
             password = loop_input('password> ', method=getpass)
 
-            token = service.get_auth_token(username, password)
+            token = service.get_auth_token(username, password, prompt=loop_input)
             print('Great! You\'ve been identified 🍻')
 
             print('Do you want to give a custom name for this service\'s remote?')

diff --git a/git_repo/services/ext/bitbucket.py b/git_repo/services/ext/bitbucket.py
@@ -146,7 +146,7 @@ def get_repository(self, user, repo):
         #raise ResourceNotFoundError('Cannot retrieve repository: {}/{} does not exists.'.format(user, repo))
 
     @classmethod
-    def get_auth_token(cls, login, password):
+    def get_auth_token(cls, login, password, prompt=None):
         log.warn("/!\\ Due to API limitations, the bitbucket login/password is stored as plaintext in configuration.")
         return "{}:{}".format(login, password)
 

diff --git a/git_repo/services/ext/github.py b/git_repo/services/ext/github.py
@@ -194,13 +194,15 @@ def request_fetch(self, user, repo, request, pull=False):
             raise err
 
     @classmethod
-    def get_auth_token(cls, login, password):
+    def get_auth_token(cls, login, password, prompt=None):
         import platform
-        auth = github3.GitHub().authorize(login, password,
+        gh = github3.GitHub()
+        gh.login(login, password, two_factor_callback=lambda: prompt('2FA code> '))
+        gh.authorize(login, password,
                 scopes=[ 'repo', 'delete_repo', 'gist' ],
                 note='git-repo token used on {}'.format(platform.node()),
                 note_url='https://github.com/guyzmo/git-repo')
-        return auth.token
+        return gh.token
 
     @property
     def user(self):

diff --git a/git_repo/services/ext/gitlab.py b/git_repo/services/ext/gitlab.py
@@ -74,7 +74,7 @@ def get_repository(self, user, repo):
                 raise ResourceNotFoundError("Cannot delete: repository {}/{} does not exists.".format(user, repo)) from err
 
     @classmethod
-    def get_auth_token(cls, login, password):
+    def get_auth_token(cls, login, password, prompt=None):
         gl = gitlab.Gitlab(url='https://{}'.format(cls.fqdn), email=login, password=password)
         gl.auth()
         return gl.user.private_token