Merge branch 'features/2FA_github' into devel

Author: guyzmo

git_repo/repo.py

@@ -483,7 +483,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?')

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)
 

git_repo/services/ext/github.py

@@ -194,13 +194,21 @@ 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,
-                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
+        gh = github3.GitHub()
+        gh.login(login, password, two_factor_callback=lambda: prompt('2FA code> '))
+        try:
+            auth = gh.authorize(login, password,
+                    scopes=[ 'repo', 'delete_repo', 'gist' ],
+                    note='git-repo2 token used on {}'.format(platform.node()),
+                    note_url='https://github.com/guyzmo/git-repo')
+            return auth.token
+        except github3.models.GitHubError as err:
+            if len(err.args) > 0 and 422 == err.args[0].status_code:
+                raise ResourceExistsError("A token already exist for this machine on your github account.")
+            else:
+                raise err
 
     @property
     def user(self):

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

git_repo/services/service.py

@@ -122,7 +122,7 @@ def get_service(cls, repository, command):
         return cls._current
 
     @classmethod
-    def get_auth_token(cls, login, password):
+    def get_auth_token(cls, login, password, prompt=None):
         raise NotImplementedError
 
     def __init__(self, r=None, c=None):

tests/helpers.py

@@ -122,7 +122,7 @@ def request_create(self, *args, **kwarg):
         return {'local': local, 'remote': remote, 'ref': 42}
 
     @classmethod
-    def get_auth_token(cls, login, password):
+    def get_auth_token(cls, login, password, prompt=None):
         return '{}:{}'.format(login, password)
 
     @property