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.

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

fix(config-api): added validation for imp fields of asset mgt #8542

Merged
merged 21 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ad74527
fix(config-api): user attribute validation error handling
pujavs Apr 25, 2024
1ed77f2
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Apr 26, 2024
1e18060
fix(config-api): user attribute validation error handling
pujavs Apr 26, 2024
a25977c
fix(config-api): user attribute validation error handling
pujavs Apr 26, 2024
483ff35
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Apr 29, 2024
aae1be8
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Apr 30, 2024
8319446
fix: added new IDP attributes
pujavs Apr 30, 2024
d608621
fix: added new IDP attributes
pujavs Apr 30, 2024
2c25eb5
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs May 14, 2024
670d488
fix(config-api): idp default values set
pujavs May 15, 2024
9d265d8
fix(config-api): set important fields while configuring IDP to fix au…
pujavs May 15, 2024
42a5cd5
fix(config-api): idp metadata default values issue#8384
pujavs May 16, 2024
706eef0
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs May 17, 2024
6a386e6
feat: idp metadata default value and removing filepath in document-store
pujavs May 17, 2024
3e4b45c
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs May 17, 2024
f942fe0
feat: idp metadata default value and removing filepath in document-store
pujavs May 17, 2024
fd2de6d
fix: assetmgt and idp changes
pujavs May 17, 2024
e7aa37e
fix: assetmgt and idp changes
pujavs May 17, 2024
82ab7f5
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs May 20, 2024
91bb2cd
fix(config-api): validation for imp fields of asset mgt
pujavs May 20, 2024
52b5430
Merge branch 'main' into jans-config-fix
devrimyatar May 20, 2024
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
10 changes: 5 additions & 5 deletions jans-config-api/docs/jans-config-api-swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8219,19 +8219,19 @@ components:
type: string
selected:
type: boolean
whitePagesCanView:
userCanView:
type: boolean
adminCanView:
type: boolean
adminCanEdit:
type: boolean
userCanEdit:
type: boolean
userCanView:
adminCanAccess:
type: boolean
userCanAccess:
type: boolean
adminCanAccess:
whitePagesCanView:
type: boolean
baseDn:
type: string
Expand Down Expand Up @@ -10109,14 +10109,14 @@ components:
type: boolean
internal:
type: boolean
locationPath:
type: string
locationType:
type: string
enum:
- ldap
- db
- file
locationPath:
type: string
baseDn:
type: string
ScriptError:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,15 @@ private String copyAssetOnServer(Document asset, ByteArrayOutputStream stream) t

String assetDir = this.getAssetDir(assetFileName);
log.info("For saving assetFileName:{} assetDir:{}", assetFileName, assetDir);


if(StringUtils.isBlank(assetFileName)|| StringUtils.isBlank(FilenameUtils.getExtension(assetFileName)) ){
throw new InvalidConfigurationException("Valid file name not provided!");
}

if (serviceModules == null || serviceModules.isEmpty()) {
throw new InvalidConfigurationException("Service module list is null or empty!");
}

for (String serviceName : serviceModules) {

String serviceDirectory = this.getServiceDirectory(assetDir, serviceName);
Expand Down