8000 fix(config-api): custom script creation failing #11307 by pujavs · Pull Request #11308 · JanssenProject/jans · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(config-api): custom script creation failing #11307 #11308

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”, y 8000 ou 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 2 commits into from
Apr 29, 2025
Merged

fix(config-api): custom script creation failing #11307 #11308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cda274
fix(config-api): custom script creation failing #11307
pujavs Apr 29, 2025
8db9606
fix(config-api): custom script creation failing #11307
pujavs Apr 29, 2025
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
8000
Diff view
22 changes: 17 additions & 5 deletions jans-config-api/docs/jans-config-api-swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9334,19 +9334,19 @@ components:
$ref: '#/components/schemas/AttributeValidation'
tooltip:
type: string
adminCanAccess:
selected:
type: boolean
adminCanView:
type: boolean
adminCanEdit:
type: boolean
userCanView:
type: boolean
userCanEdit:
type: boolean
userCanAccess:
type: boolean
adminCanEdit:
adminCanAccess:
type: boolean
selected:
userCanAccess:
type: boolean
whitePagesCanView:
type: boolean
Expand Down Expand Up @@ -9402,6 +9402,8 @@ components:
type: string
requirePar:
type: boolean
parForbidPublicClient:
type: boolean
deviceAuthzEndpoint:
type: string
mtlsAuthorizationEndpoint:
Expand Down Expand Up @@ -9833,6 +9835,10 @@ components:
type: boolean
sessionIdPersistInCache:
type: boolean
sessionIdUserClaimsInAttributes:
type: array
items:
type: string
includeSidInResponse:
type: boolean
disablePromptLogin:
Expand Down Expand Up @@ -10391,6 +10397,12 @@ components:
ssaExpirationInDays:
type: integer
format: int32
ssaMapSoftwareRolesToScopes:
type: object
additionalProperties:
type: array
items:
type: string
SsaValidationConfig:
type: object
properties:
Expand Down
6 changes: 5 additions & 1 deletion jans-config-api/plugins/docs/fido2-plugin-swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,11 +571,15 @@ components:
properties:
authenticatorCertsFolder:
type: string
mdsAccessToken:
type: string
mdsCertsFolder:
type: string
mdsTocsFolder:
type: string
userAutoEnrollment:
checkU2fAttestations:
type: boolean
debugUserAutoEnrollment:
type: boolean
unfinishedRequestExpiration:
type: integer
Expand Down
16 changes: 8 additions & 8 deletions jans-config-api/plugins/docs/jans-link-plugin-swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ components:
attributeMapping:
type: array
items:
$ref: '#/components/schemas/LinkAttributeMapping'
$ref: '#/components/schemas/CacheRefreshAttributeMapping'
snapshotFolder:
type: string
snapshotMaxCount:
Expand Down Expand Up @@ -161,6 +161,13 @@ components:
type: string
useLocalCache:
type: boolean
CacheRefreshAttributeMapping:
type: object
properties:
source:
type: string
destination:
type: string
GluuLdapConfiguration:
type: object
properties:
Expand Down Expand Up @@ -197,13 +204,6 @@ components:
level:
type: integer
format: int32
LinkAttributeMapping:
type: object
properties:
source:
type: string
destination:
type: string
securitySchemes:
oauth2:
type: oauth2
Expand Down
16 changes: 8 additions & 8 deletions jans-config-api/plugins/docs/kc-link-plugin-swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ components:
attributeMapping:
type: array
items:
$ref: '#/components/schemas/LinkAttributeMapping'
$ref: '#/components/schemas/CacheRefreshAttributeMapping'
snapshotFolder:
type: string
snapshotMaxCount:
Expand Down Expand Up @@ -199,6 +199,13 @@ components:
type: string
useLocalCache:
type: boolean
CacheRefreshAttributeMapping:
type: object
properties:
source:
type: string
destination:
type: string
GluuLdapConfiguration:
type: object
properties:
Expand Down Expand Up @@ -252,13 +259,6 @@ components:
type: string
password:
type: string
LinkAttributeMapping:
type: object
properties:
source:
type: string
destination:
type: string
JsonPatch:
type: object
securitySchemes:
Expand Down
7 changes: 4 additions & 3 deletions ...g-api/server/src/main/java/io/jans/configapi/rest/resource/auth/CustomScriptResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,12 +480,13 @@ private void removeAuthenticationMethod() {

private CustomScript updateFileTypeCustomScript(CustomScript customScript) {
logger.info("Handling CustomScript if location type is File - customScript:{}", customScript);

// Note File type customScript is intended only for dev
if (customScript == null) {
return customScript;
}
logger.info("Handling CustomScript if location type is File - customScript.getLocationType().getValue():{}, customScript.getLocationPath():{}", customScript.getLocationType().getValue(), customScript.getLocationPath());
if (ScriptLocationType.FILE.getValue().equalsIgnoreCase(customScript.getLocationType().getValue())) {
logger.info("Handling CustomScript if location type is File - customScript.getLocationType():{}, customScript.getLocationPath():{}", customScript.getLocationType(), customScript.getLocationPath());
if (customScript.getLocationPath()!=null && ScriptLocationType.FILE.getValue().equalsIgnoreCase(customScript.getLocationType().getValue())) {
logger.info("Modifying customScript as getLocationType is File - customScript:{}", customScript);
String fileName = CUSTOM_FILE_SCRIPT_DEFAULT_LOCATION;
if (StringUtils.isNotBlank(customScript.getLocationPath())) {
Expand All @@ -495,7 +496,7 @@ private CustomScript updateFileTypeCustomScript(CustomScript customScript) {
}
}

logger.info("\n\n Handling CustomScript if location type is File - customScript.getLocationType().getValue():{}, customScript.getLocationPath():{}", customScript.getLocationType().getValue(), customScript.getLocationPath());
logger.info("\n\n Handling CustomScript if location type is File - customScript.getLocationType():{}, customScript.getLocationPath():{}", customScript.getLocationType(), customScript.getLocationPath());
return customScript;
}

Expand Down
0