Fix issue eduvpn#181, undo eduvpn#169 (eduvpn#183)

* Revert "Include client_id in phase 2 (eduvpn#169)" This reverts commit 9aa4552. * fix issue eduvpn#181
efef · Aug 17, 2019 · c0e218d · c0e218d
1 parent 9aa4552
commit c0e218d
Show file tree

Hide file tree

Showing 22 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ services:
 before_install:
 - true
 install:
-- docker build . -t ${DIST} -f docker/${DIST}
+- docker build . -t ${DIST} -f docker/${DIST}.docker
 before_script:
 - true
 script:

diff --git a/Makefile b/Makefile
@@ -101,7 +101,7 @@ notebook: .virtualenv3/bin/jupyter-notebook
 	.virtualenv3/bin/jupyter-notebook
 
 dockers:
-	for i in `ls docker/Dockerfile*`; do echo "*** $$i"; docker build . -f $$i; done
+	for i in `ls docker/*.docker`; do echo "*** $$i"; docker build . -f $$i; done
 
 srpm:
 	docker build -t eduvpn_fedora_rpm -f docker/eduvpn_fedora_28_rpm .

diff --git a/docker/eduvpn_centos_7_py2 → docker/eduvpn_centos_7_py2.docker b/docker/eduvpn_centos_7_py2 → docker/eduvpn_centos_7_py2.docker
diff --git a/docker/eduvpn_centos_7_rpm → docker/eduvpn_centos_7_rpm.docker b/docker/eduvpn_centos_7_rpm → docker/eduvpn_centos_7_rpm.docker
diff --git a/docker/eduvpn_debian_jessie_py2 → docker/eduvpn_debian_jessie_py2.docker b/docker/eduvpn_debian_jessie_py2 → docker/eduvpn_debian_jessie_py2.docker
diff --git a/docker/eduvpn_debian_jessie_py3 → docker/eduvpn_debian_jessie_py3.docker b/docker/eduvpn_debian_jessie_py3 → docker/eduvpn_debian_jessie_py3.docker
diff --git a/docker/eduvpn_fedora_27_py2 → docker/eduvpn_fedora_27_py2.docker b/docker/eduvpn_fedora_27_py2 → docker/eduvpn_fedora_27_py2.docker
diff --git a/docker/eduvpn_fedora_27_py3 → docker/eduvpn_fedora_27_py3.docker b/docker/eduvpn_fedora_27_py3 → docker/eduvpn_fedora_27_py3.docker
diff --git a/docker/eduvpn_fedora_27_rpm → docker/eduvpn_fedora_27_rpm.docker b/docker/eduvpn_fedora_27_rpm → docker/eduvpn_fedora_27_rpm.docker
diff --git a/docker/eduvpn_fedora_28_py2 → docker/eduvpn_fedora_28_py2.docker b/docker/eduvpn_fedora_28_py2 → docker/eduvpn_fedora_28_py2.docker
diff --git a/docker/eduvpn_fedora_28_py3 → docker/eduvpn_fedora_28_py3.docker b/docker/eduvpn_fedora_28_py3 → docker/eduvpn_fedora_28_py3.docker
diff --git a/docker/eduvpn_fedora_28_rpm → docker/eduvpn_fedora_28_rpm.docker b/docker/eduvpn_fedora_28_rpm → docker/eduvpn_fedora_28_rpm.docker
diff --git a/docker/eduvpn_ubuntu_bionic_doc → docker/eduvpn_ubuntu_bionic_doc.docker b/docker/eduvpn_ubuntu_bionic_doc → docker/eduvpn_ubuntu_bionic_doc.docker
diff --git a/docker/eduvpn_ubuntu_bionic_py2 → docker/eduvpn_ubuntu_bionic_py2.docker b/docker/eduvpn_ubuntu_bionic_py2 → docker/eduvpn_ubuntu_bionic_py2.docker
diff --git a/docker/eduvpn_ubuntu_bionic_py3 → docker/eduvpn_ubuntu_bionic_py3.docker b/docker/eduvpn_ubuntu_bionic_py3 → docker/eduvpn_ubuntu_bionic_py3.docker
diff --git a/docker/eduvpn_ubuntu_bionic_py3_mypy → docker/eduvpn_ubuntu_bionic_py3_mypy.docker b/docker/eduvpn_ubuntu_bionic_py3_mypy → docker/eduvpn_ubuntu_bionic_py3_mypy.docker
diff --git a/docker/eduvpn_ubuntu_bionic_py3_pep8 → docker/eduvpn_ubuntu_bionic_py3_pep8.docker b/docker/eduvpn_ubuntu_bionic_py3_pep8 → docker/eduvpn_ubuntu_bionic_py3_pep8.docker
diff --git a/docker/eduvpn_ubuntu_xenial_py2 → docker/eduvpn_ubuntu_xenial_py2.docker b/docker/eduvpn_ubuntu_xenial_py2 → docker/eduvpn_ubuntu_xenial_py2.docker
diff --git a/docker/lets_connect_centos_7_rpm → docker/lets_connect_centos_7_rpm.docker b/docker/lets_connect_centos_7_rpm → docker/lets_connect_centos_7_rpm.docker
diff --git a/docker/lets_connect_fedora_27_rpm → docker/lets_connect_fedora_27_rpm.docker b/docker/lets_connect_fedora_27_rpm → docker/lets_connect_fedora_27_rpm.docker
diff --git a/docker/lets_connect_fedora_28_rpm → docker/lets_connect_fedora_28_rpm.docker b/docker/lets_connect_fedora_28_rpm → docker/lets_connect_fedora_28_rpm.docker
diff --git a/eduvpn/steps/browser.py b/eduvpn/steps/browser.py
@@ -111,7 +111,7 @@ def _phase2_background(meta, port, oauth, code_verifier, auth_url, dialog, build
             logger.error("received from state, expected: {}, received: {}".format(state, other_state))
             raise Exception("oauth state has been tampered with")
         logger.info("setting oauth token for metadata")
-        meta.token = oauth.fetch_token(meta.token_endpoint, code=code, code_verifier=code_verifier, client_id=oauth.client_id, include_client_id=True)
+        meta.token = oauth.fetch_token(meta.token_endpoint, code=code, code_verifier=code_verifier)
     except Exception as e:
         error = e
         if dialog.get_property("visible") and dialog.session == session: