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

Jump to bottom

fix(config-api): user status field changes #8293

Merged
merged 10 commits into from
Apr 13, 2024
Merged

fix(config-api): user status field changes #8293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a564917
fix: user mgt error for jansStatus issue#8258
pujavs Apr 11, 2024
be5d077
fix: user mgt error for jansStatus issue#8258
pujavs Apr 11, 2024
758dd0e
fix: user mgt error for jansStatus issue#8258
pujavs Apr 11, 2024
d59c57f
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Apr 12, 2024
59de1e2
feat(config-api): create client and attribute test change
pujavs Apr 12, 2024
d08dcdb
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Apr 12, 2024
cdfaed2
fix(config-api): fix attribute validation while update issue#8291
pujavs Apr 12, 2024
602c16e
fix(config-api): fix attribute validation while update issue#8291
pujavs Apr 12, 2024
10ea80b
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Apr 13, 2024
2cbe491
fix(config-api): user status field changes
pujavs Apr 13, 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
18 changes: 9 additions & 9 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 @@ -8219,19 +8219,19 @@ components:
type: string
selected:
type: boolean
adminCanEdit:
whitePagesCanView:
type: boolean
userCanView:
adminCanEdit:
type: boolean
userCanEdit:
type: boolean
adminCanView:
userCanView:
type: boolean
userCanAccess:
adminCanView:
type: boolean
adminCanAccess:
type: boolean
whitePagesCanView:
userCanAccess:
type: boolean
baseDn:
type: string
Expand Down Expand Up @@ -9053,6 +9053,8 @@ components:
type: boolean
lockMessageConfig:
$ref: '#/components/schemas/LockMessageConfig'
fapi:
type: boolean
allResponseTypesSupported:
uniqueItems: true
type: array
Expand All @@ -9062,8 +9064,6 @@ components:
- code
- token
- id_token
fapi:
type: boolean
AuthenticationFilter:
required:
- baseDn
Expand Down Expand Up @@ -10083,14 +10083,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
3 changes: 2 additions & 1 deletion ...plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import io.jans.configapi.plugin.mgt.util.MgtUtil;
import io.jans.configapi.util.ApiAccessConstants;
import io.jans.configapi.util.ApiConstants;
import io.jans.model.GluuStatus;
import io.jans.model.SearchRequest;
import io.jans.orm.model.PagedResult;
import io.jans.util.StringHelper;
Expand Down Expand Up @@ -433,7 +434,7 @@ private User setUserAttributes(CustomUser customUser) {
user.setOxAuthPersistentJwt(customUser.getOxAuthPersistentJwt());
user.setUpdatedAt(customUser.getUpdatedAt());
user.setUserId(customUser.getUserId());
user.setStatus(customUser.getStatus());
user.setStatus((customUser.getStatus()!=null?customUser.getStatus() : GluuStatus.ACTIVE));

return setUserCustomAttributes(customUser, user);
}
Expand Down
2 changes: 1 addition & 1 deletion jans-linux-setup/jans_setup/templates/jans-config-api/dynamic-conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"userMandatoryAttributes": [
"mail",
"displayName",
"jansStatus",
"status",
"userPassword",
"givenName"
],
Expand Down