Skip to content

Service Class fixes #30

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
jshcodes merged 20 commits into from
Dec 26, 2020
Merged

Service Class fixes #30

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2541832
Default parameter debugging. Ran the code through the DRYer.
jshcodes Dec 24, 2020
1798e4e
Param defaults, fixes to GetDeviceDetails, DRYer
jshcodes Dec 25, 2020
c0a060b
Parameter defaults, DRYer, Unit testing
jshcodes Dec 25, 2020
db407db
Parameter cleanup, IDs fix, DRYer, Unit testing
jshcodes Dec 25, 2020
c8797c2
Param, partition, content-type fixes. Unit tests.
jshcodes Dec 25, 2020
3cdc609
Parameter cleanup, DRYer
jshcodes Dec 25, 2020
8a91ae4
Param cleanup, IDs fix, DRYer, Unit testing
jshcodes Dec 26, 2020
8bb115d
Param cleanup, IDs fix, DRYer, More to do here
jshcodes Dec 26, 2020
f954ffc
Param cleanup, IDs fixes, DRYer
jshcodes Dec 26, 2020
df1e1a3
Param cleanup, IDs fixes, DRYer
jshcodes Dec 26, 2020
2951989
Param cleanup, IDs fix, DRYer
jshcodes Dec 26, 2020
65c5fe8
Param cleanup, IDs fix, DRYer, Unit testing
jshcodes Dec 26, 2020
5a22b44
Param cleanup, IDs fix, DRYer, Unit testing
jshcodes Dec 26, 2020
1d3117a
Param cleanup, IDs fix, DRYer, Unit testing
jshcodes Dec 26, 2020
57feb89
Param cleanup, IDs fix, DRYer, Unit testing
jshcodes Dec 26, 2020
9f47581
Param cleanup, IDs fix, DRYer, Unit testing
jshcodes Dec 26, 2020
067fbe7
Param cleanup, IDs fix, DRYer, Unit testing
jshcodes Dec 26, 2020
d4215cd
Param cleanup, IDs fix, DRYer, Unit test prep
jshcodes Dec 26, 2020
903b7d8
Param cleanup, IDs fix, DRYer, Basic unit tests
jshcodes Dec 26, 2020
11f6b81
Quick run thru the DRYer
jshcodes Dec 26, 2020
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
Prev Previous commit
Quick run thru the DRYer
  • Loading branch information
@jshcodes
jshcodes committed Dec 26, 2020
commit 11f6b8144f64289735f7a4cbb32ea142c0f73562
10 changes: 4 additions & 6 deletions src/falconpy/oauth2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,11 @@ def token(self):
'client_id': self.creds['client_id'],
'client_secret': self.creds['client_secret']
}
result = self.Result()
try:
response = requests.request("POST", FULL_URL, data=DATA, headers=HEADERS, verify=False)
returned = result(response.status_code,response.json())
returned = self.Result()(response.status_code,response.json())
except Exception as e:
returned = result(500, str(e))
returned = self.Result()(500, str(e))

return returned

Expand All @@ -87,11 +86,10 @@ def revoke(self, token):
FULL_URL = self.base_url+'/oauth2/revoke'
HEADERS = { 'Authorization': 'basic {}'.format(token) }
DATA = { 'token': '{}'.format(token) }
result = self.Result()
try:
response = requests.request("POST", FULL_URL, data=DATA, headers=HEADERS, verify=False)
returned = result(response.status_code, response.json())
returned = self.Result()(response.status_code, response.json())
except Exception as e:
returned = result(500, str(e))
returned = self.Result()(500, str(e))

return returned