Skip to content
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

LR-625 key not uploading when same old name is used #1206

Merged
merged 37 commits into from
Jul 7, 2023
Merged

LR-625 key not uploading when same old name is used #1206

Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2e75f50
Issue #LR-456 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 18, 2023
6532980
Issue #LR-443 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 18, 2023
25f784a
Issue #LR-422 feat: Pointed the channel create and update to content-…
AmiableAnil Apr 19, 2023
f7eddef
Issue #LR-443 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 19, 2023
eedf698
Issue #LR-443 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 19, 2023
e78a293
Issue #LR-443 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 19, 2023
4d4284b
Issue #LR-443 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 24, 2023
ad76d28
Issue #LR-443 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 24, 2023
b85fd59
Merge branch 'release-5.3.0' of https://github.com/Sunbird-Lern/sunbi…
BharathwajShankar Apr 24, 2023
889b6e3
Issue #LR-443 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 24, 2023
3a5c560
Issue #LR-443 merge: Merge pull request #1168 from BharathwajShankar/…
AmiableAnil Apr 24, 2023
5764d37
Issue #LR-443 feat:updating the readme.md file with lms service setup
BharathwajShankar Apr 25, 2023
2f7b06e
Merge branch 'release-5.3.0' of https://github.com/Sunbird-Lern/sunbi…
BharathwajShankar Apr 25, 2023
00d302c
Issue #LR-517 feat: new API to upload public encryption key (#1173)
Jayaprakash8887 Apr 25, 2023
8bdf30d
Merge branch 'release-5.3.0' into LR-443-Local-setup-of-UserOrg-Ubunt…
AmiableAnil Apr 26, 2023
1fde0a5
Issue #LR-443 merge: Merge pull request #1174 from BharathwajShankar/…
AmiableAnil Apr 27, 2023
0839270
Lr 443 local setup of user org ubuntu mac GitHub and microsite update…
BharathwajShankar May 5, 2023
0d218b9
Issue #LR-517 feat: new API to upload public encryption key (#1175)
Jayaprakash8887 May 15, 2023
ae0e385
Update README.md (#1180)
Abhign May 15, 2023
4805093
Issue #LR-517 feat: Tenant Preference settings update (#1181)
Jayaprakash8887 May 16, 2023
e7090e9
Update README.md (#1182)
Abhign May 17, 2023
e714b48
updated telemetry version (#1183)
Hari-stackroute May 30, 2023
0aaa797
Issue #LR-566 merge: Local sunbird keycloak setup (#1185)
Jayaprakash8887 Jun 2, 2023
703cd29
Issue #LR-566 feat: Local sunbird keycloak setup (#1186)
Jayaprakash8887 Jun 5, 2023
5481e0f
Issue #LR-566 merge: Local sunbird keycloak setup (#1187)
Jayaprakash8887 Jun 5, 2023
2b73243
Issue #LR-566 merge: Local sunbird keycloak setup (#1188)
Jayaprakash8887 Jun 6, 2023
7b5c708
Issue #LR-566 feat: Local sunbird keycloak setup (#1189)
Jayaprakash8887 Jun 7, 2023
4ee2edf
Issue #LR-566 merge: Local sunbird keycloak setup (#1192)
Jayaprakash8887 Jun 9, 2023
30e1c37
Issue #LR-566 merge: Local sunbird keycloak setup (#1193)
Jayaprakash8887 Jun 12, 2023
9bb37a8
Issue #LR-566 merge: Local sunbird keycloak setup (#1194)
Jayaprakash8887 Jun 12, 2023
37fed61
Issue #LR-560 feat: Local sunbird keycloak setup (#1195)
Jayaprakash8887 Jun 13, 2023
f42af1d
Issue #LR-560 merge: Local sunbird keycloak setup (#1198)
Jayaprakash8887 Jun 14, 2023
a0f804d
Delete userorg-config.sh
reshmi-nair Jun 14, 2023
44492d6
Issue #LR-560 merge: Local sunbird keycloak integration with local us…
Jayaprakash8887 Jun 21, 2023
08c4c89
LR-625 key not uploading when same old name is used
Hari-stackroute Jul 7, 2023
0651a71
LR-625 key not uploading when same old name is used
Hari-stackroute Jul 7, 2023
bdeca88
LR-625 key not uploading when same old name is used
Hari-stackroute Jul 7, 2023
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
26 changes: 13 additions & 13 deletions service/src/main/java/org/sunbird/actor/organisation/OrganisationManagementActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,19 @@ private String uploadEncryptionFile(
sender().tell(exception, self());
}
String container = ProjectUtil.getConfigValue(JsonKey.CLOUD_SERVICE_CONTAINER);
if (fetchedKeys != null
&& fetchedKeys.containsKey(JsonKey.EXHAUST_ENCRYPTION_KEY)
&& !fetchedKeys.get(JsonKey.EXHAUST_ENCRYPTION_KEY).isEmpty()) {
String oldKey =
fetchedKeys
.get(JsonKey.EXHAUST_ENCRYPTION_KEY)
.get(0)
.substring(
fetchedKeys.get(JsonKey.EXHAUST_ENCRYPTION_KEY).get(0).indexOf(container)
+ container.length()
+ 1);
CloudStorageUtil.deleteFile(cspProvider, container, oldKey);
}
publicKeyUrl =
CloudStorageUtil.upload(
cspProvider,
Expand All @@ -560,19 +573,6 @@ private String uploadEncryptionFile(
+ File.separator
+ fileName,
file.getAbsolutePath());
if (fetchedKeys != null
&& fetchedKeys.containsKey(JsonKey.EXHAUST_ENCRYPTION_KEY)
&& !fetchedKeys.get(JsonKey.EXHAUST_ENCRYPTION_KEY).isEmpty()) {
String oldKey =
fetchedKeys
.get(JsonKey.EXHAUST_ENCRYPTION_KEY)
.get(0)
.substring(
fetchedKeys.get(JsonKey.EXHAUST_ENCRYPTION_KEY).get(0).indexOf(container)
+ container.length()
+ 1);
CloudStorageUtil.deleteFile(cspProvider, container, oldKey);
}
return publicKeyUrl;
} catch (IOException e) {
throw new ProjectCommonException(
Expand Down