Skip to content

Commit 7f2c25f

Browse files
ehanson8ehanson8
authored
Merge pull request #1 from MITLibraries/authentication-upgrade
Authentication upgrade
2 parents 84330f1 + 19b475d commit 7f2c25f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+311
-180
lines changed

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ local/*
5656
*.json
5757
createItemMetadataFromCSV_*
5858
*.txt
59-
Pipfile
60-
Pipfile.lock
6159

6260
# Environments
6361
.env

‎Pipfile

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[[source]]
2+
name = "pypi"
3+
url = "https://pypi.org/simple"
4+
verify_ssl = true
5+
6+
[dev-packages]
7+
8+
[packages]
9+
requests = "*"
10+
11+
[requires]
12+
python_version = "3.7"

‎Pipfile.lock

+57
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎addKeyValuePairOnHandleCSV.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
secrets = __import__(secretsVersion)
1515
print('Editing Production')
1616
except ImportError:
17-
secrets = __import__(secrets)
18-
print('Editing Stage')
17+
secrets = __import__('secrets')
18+
print('Editing Development')
1919
else:
20-
print('Editing Stage')
20+
secrets = __import__('secrets')
21+
print('Editing Development')
2122

2223
baseURL = secrets.baseURL
2324
email = secrets.email
@@ -36,7 +37,8 @@
3637

3738
status = requests.get(baseURL + '/rest/status', headers=header,
3839
cookies=cookies, verify=verify).json()
39-
print('authenticated')
40+
userFullName = status['fullname']
41+
print('authenticated', userFullName)
4042

4143
fileName = filePath + input('Enter fileName (including \'.csv\'): ')
4244
addedKey = input('Enter key: ')

‎addKeyValuePairToCollection.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
secrets = __import__(secretsVersion)
1414
print('Editing Production')
1515
except ImportError:
16-
secrets = __import__(secrets)
17-
print('Editing Stage')
16+
secrets = __import__('secrets')
17+
print('Editing Development')
1818
else:
19-
print('Editing Stage')
19+
secrets = __import__('secrets')
20+
print('Editing Development')
2021

2122
parser = argparse.ArgumentParser()
2223
parser.add_argument('-k', '--key', help='the key to be added. optional - if \
@@ -65,7 +66,8 @@
6566

6667
status = requests.get(baseURL + '/rest/status', headers=header,
6768
cookies=cookies, verify=verify).json()
68-
print('authenticated')
69+
userFullName = status['fullname']
70+
print('authenticated', userFullName)
6971

7072
itemList = []
7173
endpoint = baseURL + '/rest/handle/' + handle

‎addKeyValuePairToCommunity.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
secrets = __import__(secretsVersion)
1414
print('Editing Production')
1515
except ImportError:
16-
secrets = __import__(secrets)
17-
print('Editing Stage')
16+
secrets = __import__('secrets')
17+
print('Editing Development')
1818
else:
19-
print('Editing Stage')
19+
secrets = __import__('secrets')
20+
print('Editing Development')
2021

2122
parser = argparse.ArgumentParser()
2223
parser.add_argument('-k', '--key', help='the key to be added. optional - if \
@@ -65,7 +66,8 @@
6566

6667
status = requests.get(baseURL + '/rest/status', headers=header,
6768
cookies=cookies, verify=verify).json()
68-
print('authenticated')
69+
userFullName = status['fullname']
70+
print('authenticated', userFullName)
6971

7072
itemList = []
7173
endpoint = baseURL + '/rest/handle/' + handle

‎addNewItemsToCollection.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
secrets = __import__(secretsVersion)
1616
print('Editing Production')
1717
except ImportError:
18-
secrets = __import__(secrets)
19-
print('Editing Stage')
18+
secrets = __import__('secrets')
19+
print('Editing Development')
2020
else:
21-
print('Editing Stage')
21+
secrets = __import__('secrets')
22+
print('Editing Development')
2223

2324
parser = argparse.ArgumentParser()
2425
parser.add_argument('-d', '--directory', help='the directory of files to be \
@@ -81,9 +82,8 @@
8182
headerFileUpload = {'accept': 'application/json'}
8283
status = requests.get(baseURL + '/rest/status', headers=header,
8384
cookies=cookies, verify=verify).json()
84-
print(status)
8585
userFullName = status['fullname']
86-
print('authenticated')
86+
print('authenticated', userFullName)
8787

8888
# Get collection ID
8989
endpoint = baseURL + '/rest/handle/' + handle

‎compareTwoKeysInCommunity.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
secrets = __import__(secretsVersion)
1212
print('Editing Production')
1313
except ImportError:
14-
secrets = __import__(secrets)
15-
print('Editing Stage')
14+
secrets = __import__('secrets')
15+
print('Editing Development')
1616
else:
17-
print('Editing Stage')
17+
secrets = __import__('secrets')
18+
print('Editing Development')
1819

1920
parser = argparse.ArgumentParser()
2021
parser.add_argument('-1', '--key', help='the first key to be output. \
@@ -57,7 +58,8 @@
5758

5859
status = requests.get(baseURL + '/rest/status', headers=header,
5960
cookies=cookies, verify=verify).json()
60-
print('authenticated')
61+
userFullName = status['fullname']
62+
print('authenticated', userFullName)
6163

6264
endpoint = baseURL + '/rest/handle/' + handle
6365
community = requests.get(endpoint, headers=header, cookies=cookies,

‎countInitialedNamesByCollection.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
secrets = __import__(secretsVersion)
1212
print('Editing Production')
1313
except ImportError:
14-
secrets = __import__(secrets)
15-
print('Editing Stage')
14+
secrets = __import__('secrets')
15+
print('Editing Development')
1616
else:
17-
print('Editing Stage')
17+
secrets = __import__('secrets')
18+
print('Editing Development')
1819

1920
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
2021

@@ -36,7 +37,7 @@
3637
status = requests.get(baseURL + '/rest/status', headers=header,
3738
cookies=cookies, verify=verify).json()
3839
userFullName = status['fullname']
39-
print('authenticated')
40+
print('authenticated', userFullName)
4041

4142
collectionIds = []
4243
endpoint = baseURL + '/rest/communities'

‎deleteBitstreamsFromItem.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
secrets = __import__(secretsVersion)
1414
print('Editing Production')
1515
except ImportError:
16-
secrets = __import__(secrets)
17-
print('Editing Stage')
16+
secrets = __import__('secrets')
17+
print('Editing Development')
1818
else:
19-
print('Editing Stage')
19+
secrets = __import__('secrets')
20+
print('Editing Development')
2021

2122
baseURL = secrets.baseURL
2223
email = secrets.email
@@ -38,7 +39,7 @@
3839
status = requests.get(baseURL + '/rest/status', headers=header,
3940
cookies=cookies, verify=verify).json()
4041
userFullName = status['fullname']
41-
print('authenticated')
42+
print('authenticated', userFullName)
4243

4344
bitstreamList = []
4445
endpoint = baseURL + '/rest/handle/' + itemHandle

‎deleteKeyFromCollection.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
secrets = __import__(secretsVersion)
1414
print('Editing Production')
1515
except ImportError:
16-
secrets = __import__(secrets)
17-
print('Editing Stage')
16+
secrets = __import__('secrets')
17+
print('Editing Development')
1818
else:
19-
print('Editing Stage')
19+
secrets = __import__('secrets')
20+
print('Editing Development')
2021

2122
parser = argparse.ArgumentParser()
2223
parser.add_argument('-k', '--deletedKey', help='the key to be deleted. \
@@ -55,7 +56,7 @@
5556
status = requests.get(baseURL + '/rest/status', headers=header,
5657
cookies=cookies, verify=verify).json()
5758
userFullName = status['fullname']
58-
print('authenticated')
59+
print('authenticated', userFullName)
5960

6061
endpoint = baseURL + '/rest/handle/' + handle
6162
collection = requests.get(endpoint, headers=header, cookies=cookies,

‎deleteKeyFromCommunity.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
secrets = __import__(secretsVersion)
1414
print('Editing Production')
1515
except ImportError:
16-
secrets = __import__(secrets)
17-
print('Editing Stage')
16+
secrets = __import__('secrets')
17+
print('Editing Development')
1818
else:
19-
print('Editing Stage')
19+
secrets = __import__('secrets')
20+
print('Editing Development')
2021

2122
parser = argparse.ArgumentParser()
2223
parser.add_argument('-k', '--deletedKey', help='the key to be deleted. \
@@ -55,7 +56,7 @@
5556
status = requests.get(baseURL + '/rest/status', headers=header,
5657
cookies=cookies, verify=verify).json()
5758
userFullName = status['fullname']
58-
print('authenticated')
59+
print('authenticated', userFullName)
5960

6061
endpoint = baseURL + '/rest/handle/' + handle
6162
community = requests.get(endpoint, headers=header, cookies=cookies,

‎deleteKeyValuePairFromCollection.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
secrets = __import__(secretsVersion)
1414
print('Editing Production')
1515
except ImportError:
16-
secrets = __import__(secrets)
17-
print('Editing Stage')
16+
secrets = __import__('secrets')
17+
print('Editing Development')
1818
else:
19-
print('Editing Stage')
19+
secrets = __import__('secrets')
20+
print('Editing Development')
2021

2122
parser = argparse.ArgumentParser()
2223
parser.add_argument('-k', '--deletedKey', help='the key to be deleted. \
@@ -59,7 +60,8 @@
5960

6061
status = requests.get(baseURL + '/rest/status', headers=header,
6162
cookies=cookies, verify=verify).json()
62-
print('authenticated')
63+
userFullName = status['fullname']
64+
print('authenticated', userFullName)
6365

6466
endpoint = baseURL + '/rest/handle/' + handle
6567
collection = requests.get(endpoint, headers=header, cookies=cookies,

‎editBitstreamsNames.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
secrets = __import__(secretsVersion)
1414
print('Editing Production')
1515
except ImportError:
16-
secrets = __import__(secrets)
17-
print('Editing Stage')
16+
secrets = __import__('secrets')
17+
print('Editing Development')
1818
else:
19-
print('Editing Stage')
19+
secrets = __import__('secrets')
20+
print('Editing Development')
2021

2122
parser = argparse.ArgumentParser()
2223
parser.add_argument('-f', '--fileName', help='the name of the CSV with the \
@@ -47,7 +48,8 @@
4748

4849
status = requests.get(baseURL + '/rest/status', headers=header,
4950
cookies=cookies, verify=verify).json()
50-
print('authenticated')
51+
userFullName = status['fullname']
52+
print('authenticated', userFullName)
5153

5254
f = csv.writer(open(filePath + 'editBitstreamName'
5355
+ datetime.now().strftime('%Y-%m-%d %H.%M.%S') + '.csv', 'w'))

‎exportCollectionMetadataToCSV.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
secrets = __import__(secretsVersion)
1212
print('Editing Production')
1313
except ImportError:
14-
secrets = __import__(secrets)
15-
print('Editing Stage')
14+
secrets = __import__('secrets')
15+
print('Editing Development')
1616
else:
17-
print('Editing Stage')
17+
secrets = __import__('secrets')
18+
print('Editing Development')
1819

1920
# login info kept in secrets.py file
2021
baseURL = secrets.baseURL
@@ -48,7 +49,7 @@
4849
status = requests.get(baseURL + '/rest/status', headers=header,
4950
cookies=cookies, verify=verify).json()
5051
userFullName = status['fullname']
51-
print('authenticated')
52+
print('authenticated', userFullName)
5253

5354
endpoint = baseURL + '/rest/handle/' + handle
5455
collection = requests.get(endpoint, headers=header, cookies=cookies,

‎exportSelectedRecordMetadataToCSV.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
secrets = __import__(secretsVersion)
1212
print('Editing Production')
1313
except ImportError:
14-
secrets = __import__(secrets)
14+
secrets = __import__('secrets')
1515
print('Editing Development')
1616
else:
17+
secrets = __import__('secrets')
1718
print('Editing Development')
1819

1920
# login info kept in secrets.py file
@@ -49,7 +50,7 @@
4950
status = requests.get(baseURL + '/rest/status', headers=header,
5051
cookies=cookies, verify=verify).json()
5152
userFullName = status['fullname']
52-
print('authenticated')
53+
print('authenticated', userFullName)
5354

5455

5556
handles = []

0 commit comments

Comments
 (0)