Skip to content

Replace basice auth with bearer #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2022
Merged

Replace basice auth with bearer #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions descope/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import base64
import json
import os
import re
Expand Down Expand Up @@ -339,11 +338,10 @@ def _get_default_headers(self, pswd: str = None):
headers = {}
headers["Content-Type"] = "application/json"

bearer = self.project_id
if pswd:
bytes = f"{self.project_id}:{pswd}".encode("ascii")
else:
bytes = f"{self.project_id}:".encode("ascii")
headers["Authorization"] = f"Basic {base64.b64encode(bytes).decode('ascii')}"
bearer = f"{self.project_id}:{pswd}"
headers["Authorization"] = f"Bearer {bearer}"
return headers

def _validate_and_load_tokens(self, session_token: str, refresh_token: str) -> dict:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_exchanger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_exchange_token(self):
f"{DEFAULT_BASE_URL}{EndpointsV1.exchangeTokenPath}",
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
params={"code": "c1"},
allow_redirects=False,
Expand Down
6 changes: 3 additions & 3 deletions tests/test_magiclink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def test_sign_in_cross_device(self):
f"{DEFAULT_BASE_URL}{EndpointsV1.signInAuthMagicLinkPath}/email",
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
data=json.dumps(
{
Expand Down Expand Up @@ -280,7 +280,7 @@ def test_sign_up_cross_device(self):
f"{DEFAULT_BASE_URL}{EndpointsV1.signUpAuthMagicLinkPath}/email",
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
data=json.dumps(
{
Expand Down Expand Up @@ -312,7 +312,7 @@ def test_sign_up_or_in_cross_device(self):
f"{DEFAULT_BASE_URL}{EndpointsV1.signUpOrInAuthMagicLinkPath}/email",
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
data=json.dumps(
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def test_oauth_start(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
params={"provider": "facebook"},
allow_redirects=False,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_saml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def test_saml_start(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
params={"tenant": "tenant1", "redirectURL": "http://dummy.com"},
allow_redirects=None,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_totp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def test_update_user(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6ZXlKaGJHY2lPaUpGVXpNNE5DSXNJbXRwWkNJNklqSkNkRFZYVEdOalRGVmxlVEZFY0RkMWRIQjBXbUl6Um5nNVN5SXNJblI1Y0NJNklrcFhWQ0o5LmV5SmhkWFJvYjNKcGVtVmtWR1Z1WVc1MGN5STZleUlpT201MWJHeDlMQ0pqYjI5cmFXVkViMjFoYVc0aU9pSWlMQ0pqYjI5cmFXVkZlSEJwY21GMGFXOXVJam94TmpZd05qYzVNakE0TENKamIyOXJhV1ZOWVhoQloyVWlPakkxT1RFNU9Ua3NJbU52YjJ0cFpVNWhiV1VpT2lKRVUxSWlMQ0pqYjI5cmFXVlFZWFJvSWpvaUx5SXNJbVY0Y0NJNk1qQTVNREE0TnpJd09Dd2lhV0YwSWpveE5qVTRNRGczTWpBNExDSnBjM01pT2lJeVFuUTFWMHhqWTB4VlpYa3hSSEEzZFhSd2RGcGlNMFo0T1VzaUxDSnpkV0lpT2lJeVF6VTFkbmw0ZHpCelVrdzJSbVJOTmpoeFVuTkRSR1JTVDFZaWZRLmNXUDV1cDRSNXhlSWwycW9HMk50ZkxIM1E1blJKVktkei1GRG9BWGN0T1FXOWczY2VaUWk2clpRLVRQQmFYTUt3NjhiaWpOM2JMSlRxeFdXNVdIenFSVWVvcGZ1elRjTVltQzB3UDJYR0prcmRGNkE4RDVRVzZhY1NHcWdsRmd1",
"Authorization": f"Bearer {self.dummy_project_id}:{valid_jwt_token}",
},
data=json.dumps({"externalId": "dummy@dummy.com"}),
verify=True,
Expand Down
12 changes: 6 additions & 6 deletions tests/test_webauthn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def test_sign_up_start(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
data=json.dumps(
{"user": {"externalId": "id1"}, "origin": "https://example.com"}
Expand Down Expand Up @@ -142,7 +142,7 @@ def test_sign_up_finish(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
data=json.dumps({"transactionId": "t01", "response": "response01"}),
verify=True,
Expand Down Expand Up @@ -188,7 +188,7 @@ def test_sign_in_start(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
data=json.dumps({"externalId": "id1", "origin": "https://example.com"}),
verify=True,
Expand Down Expand Up @@ -227,7 +227,7 @@ def test_sign_in_finish(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
data=json.dumps({"transactionId": "t01", "response": "response01"}),
verify=True,
Expand Down Expand Up @@ -293,7 +293,7 @@ def test_add_device_start(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6YXNkYXNk",
"Authorization": f"Bearer {self.dummy_project_id}:asdasd",
},
data=json.dumps(
{"externalId": "dummy@dummy.com", "origin": "https://example.com"}
Expand Down Expand Up @@ -335,7 +335,7 @@ def test_add_device_finish(self):
expected_uri,
headers={
"Content-Type": "application/json",
"Authorization": "Basic ZHVtbXk6",
"Authorization": f"Bearer {self.dummy_project_id}",
},
data=json.dumps({"transactionId": "t01", "response": "response01"}),
verify=True,
Expand Down