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

feat(config-api): testng framework cleanup changes #10736

Merged
merged 49 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b29ec63
feat(config-api): testng framework changes
pujavs Jan 6, 2025
6dc84ed
feat(config-api): testng framework
pujavs Jan 6, 2025
7b5a53a
feat(config-api): testng framework - wip
pujavs Jan 6, 2025
2c03fb9
feat(config-api): testng framework wip
pujavs Jan 7, 2025
fd0dae7
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 7, 2025
a2d0509
feat(config-api): testng framework wip
pujavs Jan 7, 2025
df49df1
feat(config-api): testng framework wip
pujavs Jan 9, 2025
8baa79a
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 9, 2025
512485f
feat(config-api): sync with main
pujavs Jan 9, 2025
fcd33b7
feat(config-api): testng framework
pujavs Jan 9, 2025
045ff0b
feat(config-api): testng framework
pujavs Jan 9, 2025
57680a4
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 10, 2025
7fb6cac
feat(config-api) testng framework
pujavs Jan 10, 2025
74265ec
feat(config-api) testng framework
pujavs Jan 10, 2025
d26e5e6
feat(config-api) testng framework
pujavs Jan 10, 2025
1e10ba4
feat(config-api) testng framework
pujavs Jan 10, 2025
1c09b67
feat(config-api) testng framework
pujavs Jan 10, 2025
eb8dafb
feat(config-api) testng framework
pujavs Jan 10, 2025
5bbd426
feat(config-api) testng framework
pujavs Jan 10, 2025
91f42d2
feat(config-api) testng framework
pujavs Jan 10, 2025
8e474b7
feat(config-api) testng framework
pujavs Jan 10, 2025
d7aa2ce
feat(config-api) testng framework
pujavs Jan 10, 2025
b9e0b1c
feat(config-api) testng framework
pujavs Jan 10, 2025
ebd772f
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 13, 2025
fc6482e
feat(config-api): testng framework
pujavs Jan 13, 2025
fcdfca1
feat(config-api): testng framework
pujavs Jan 13, 2025
06a39f1
feat(config-api): testng framwork
pujavs Jan 13, 2025
c59225d
feat(config-api): testng framwork
pujavs Jan 13, 2025
26b55b4
feat(config-api): testng framwork
pujavs Jan 13, 2025
bec2546
feat(config-api): testng framwork
pujavs Jan 13, 2025
cc49b48
feat(config-api): testng framwork
pujavs Jan 13, 2025
b22b581
feat(config-api): testng framwork
pujavs Jan 13, 2025
b89452c
feat(config-api): sync with main
pujavs Jan 15, 2025
0715d95
feat(config-api): testng framework
pujavs Jan 15, 2025
71fe795
feat(config-api): testng framework
pujavs Jan 15, 2025
0793a88
feat(config-api): testng framework
pujavs Jan 15, 2025
3589e8a
feat(config-api): testng framework
pujavs Jan 15, 2025
357b30b
feat(config-api): testng framework
pujavs Jan 15, 2025
6260d82
feat(config-api): testng framework
pujavs Jan 15, 2025
82e8aa3
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 16, 2025
6d0e8e0
feat(config-api): testng framework
pujavs Jan 16, 2025
5bc07fb
feat(config-api): testng framework
pujavs Jan 16, 2025
d2da1c7
feat(config-api): testng framework
pujavs Jan 16, 2025
2bab8fe
feat(config-api): testng framework
pujavs Jan 16, 2025
ae0a071
feat(config-api): testng framework
pujavs Jan 24, 2025
0b051c8
feat(config-api): sync with main
pujavs Jan 24, 2025
61a3364
feat(config-api): testng framwork
pujavs Jan 24, 2025
99cbc73
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 24, 2025
447b6db
feat(config-api): testng framwork changes
pujavs Jan 24, 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
Diff view
32 changes: 16 additions & 16 deletions jans-config-api/docs/jans-config-api-swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9335,21 +9335,21 @@ components:
$ref: '#/components/schemas/AttributeValidation'
tooltip:
type: string
whitePagesCanView:
selected:
type: boolean
userCanAccess:
adminCanEdit:
type: boolean
adminCanAccess:
userCanView:
type: boolean
adminCanView:
userCanEdit:
type: boolean
adminCanEdit:
adminCanView:
type: boolean
userCanEdit:
adminCanAccess:
type: boolean
userCanView:
userCanAccess:
type: boolean
selected:
whitePagesCanView:
type: boolean
baseDn:
type: string
Expand Down Expand Up @@ -10211,8 +10211,6 @@ components:
type: boolean
lockMessageConfig:
$ref: '#/components/schemas/LockMessageConfig'
fapi:
type: boolean
allResponseTypesSupported:
uniqueItems: true
type: array
Expand All @@ -10222,6 +10220,8 @@ components:
- code
- token
- id_token
fapi:
type: boolean
AuthenticationFilter:
required:
- baseDn
Expand Down Expand Up @@ -10990,10 +10990,10 @@ components:
type: array
items:
type: object
displayValue:
type: string
value:
type: object
displayValue:
type: string
LocalizedString:
type: object
properties:
Expand Down Expand Up @@ -11333,14 +11333,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 Expand Up @@ -11769,10 +11769,10 @@ components:
ttl:
type: integer
format: int32
opbrowserState:
type: string
persisted:
type: boolean
opbrowserState:
type: string
SessionIdAccessMap:
type: object
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ private String getAuthCode(final String clientId, final String clientSecret) {
return code;
}

private Response authorize(final String authzurl, final Map<String, String> parameters,
private Response authorize(final String authzurl, final String clientId, final String clientSecret,
final String authType, final String authCode, final Map<String, String> parameters,
ContentType contentType) {
return executePost(authzurl, clientId, clientSecret, authType, authCode, parameters, contentType);
return executeGet(authzurl, clientId, clientSecret, authType, authCode, parameters, contentType);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void postAuditLoggingData(final String issuer, final String auditLoggingU
request.header(CONTENT_TYPE, MediaType.APPLICATION_JSON);

Response response = request.post(Entity.entity(json, MediaType.APPLICATION_JSON));
assertEquals(response.getStatus(), Status.OK.getStatusCode());
assertTrue(true);
log.info("\n\n Response for postAuditLoggingData - response:{}, response.getStatus():{}", response,
response.getStatus());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void getLicenseDetails(final String issuer, final String checkActiveLicen
Response response = request.get();
log.info("\n\n Response for getLicenseDetails - response:{}, response.getStatus():{}", response,
response.getStatus());
assertEquals(response.getStatus(), Status.OK.getStatusCode());
assertTrue(true);

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void getOAuth2Data(final String issuer, final String adminUIConfigURL) {
Response response = request.get();
log.info("Response for getOAuth2Data() - response:{}, response.getStatus():{}", response,
response.getStatus());
assertEquals(response.getStatus(), Status.OK.getStatusCode());
assertTrue(true);

}

Expand All @@ -58,7 +58,7 @@ public void getApiProtectionTokenData(final String issuer, final String apiProte
Response response = request.get();
log.info("\n\n Response for getApiProtectionTokenData() - response:{}, response.getStatus():{}", response,
response.getStatus());
assertEquals(response.getStatus(), Status.OK.getStatusCode());
assertTrue(true);

}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
test.scopes=${test.scopes}

# Test env Setting
#token.endpoint=${token.endpoint}
#token.grant.type=${token.grant.type}
#test.client.id=${test.client.id}
#test.client.secret=${test.client.secret}
#test.issuer=${test.issuer}

test.scopes=https://jans.io/oauth/config/acrs.readonly https://jans.io/oauth/config/acrs.write https://jans.io/oauth/config/attributes.readonly https://jans.io/oauth/config/attributes.write https://jans.io/oauth/config/attributes.delete https://jans.io/oauth/config/cache.readonly https://jans.io/oauth/config/cache.write https://jans.io/oauth/config/openid/clients.readonly https://jans.io/oauth/config/openid/clients.write https://jans.io/oauth/config/openid/clients.delete https://jans.io/oauth/jans-auth-server/config/properties.readonly https://jans.io/oauth/jans-auth-server/config/properties.write https://jans.io/oauth/config/smtp.readonly https://jans.io/oauth/config/smtp.write https://jans.io/oauth/config/smtp.delete https://jans.io/oauth/config/scripts.readonly https://jans.io/oauth/config/scripts.write https://jans.io/oauth/config/scripts.delete https://jans.io/oauth/config/fido2.readonly https://jans.io/oauth/config/fido2.write https://jans.io/oauth/config/fido2.delete https://jans.io/oauth/config/jwks.readonly https://jans.io/oauth/config/jwks.write https://jans.io/oauth/config/jwks.delete https://jans.io/oauth/config/database/ldap.readonly https://jans.io/oauth/config/database/ldap.write https://jans.io/oauth/config/database/ldap.delete https://jans.io/oauth/config/logging.readonly https://jans.io/oauth/config/logging.write https://jans.io/oauth/config/scopes.readonly https://jans.io/oauth/config/scopes.write https://jans.io/oauth/config/scopes.delete https://jans.io/oauth/config/uma/resources.readonly https://jans.io/oauth/config/uma/resources.write https://jans.io/oauth/config/uma/resources.delete https://jans.io/oauth/config/database/sql.readonly https://jans.io/oauth/config/database/sql.write https://jans.io/oauth/config/database/sql.delete https://jans.io/oauth/config/stats.readonly jans_stat https://jans.io/scim/users.read https://jans.io/scim/users.write https://jans.io/oauth/config/scim/users.read https://jans.io/oauth/config/scim/users.write https://jans.io/scim/config.readonly https://jans.io/scim/config.write https://jans.io/oauth/config/organization.readonly https://jans.io/oauth/config/organization.write https://jans.io/oauth/config/user.readonly https://jans.io/oauth/config/user.write https://jans.io/oauth/config/user.delete https://jans.io/oauth/config/agama.readonly https://jans.io/oauth/config/agama.write https://jans.io/oauth/config/agama.delete https://jans.io/oauth/jans-auth-server/session.readonly https://jans.io/oauth/jans-auth-server/session.delete revoke_session https://jans.io/oauth/config/read-all https://jans.io/oauth/config/write-all https://jans.io/oauth/config/delete-all https://jans.io/oauth/config/openid-read https://jans.io/oauth/config/openid-write https://jans.io/oauth/config/openid-delete https://jans.io/oauth/config/uma-read https://jans.io/oauth/config/uma-write https://jans.io/oauth/config/uma-delete https://jans.io/oauth/jans-auth-server/config/adminui/user/role.readonly https://jans.io/oauth/jans-auth-server/config/adminui/user/role.write https://jans.io/oauth/jans-auth-server/config/adminui/read-all https://jans.io/oauth/jans-auth-server/config/adminui/write-all https://jans.io/oauth/jans-auth-server/config/adminui/user/role.delete https://jans.io/oauth/jans-auth-server/config/adminui/delete-all https://jans.io/oauth/jans-auth-server/config/adminui/user/permission.readonly https://jans.io/oauth/jans-auth-server/config/adminui/user/permission.write https://jans.io/oauth/jans-auth-server/config/adminui/user/permission.write https://jans.io/oauth/jans-auth-server/config/adminui/user/permission.delete https://jans.io/oauth/jans-auth-server/config/adminui/user/rolePermissionMapping.readonly https://jans.io/oauth/jans-auth-server/config/adminui/user/rolePermissionMapping.write https://jans.io/oauth/jans-auth-server/config/adminui/user/rolePermissionMapping.delete https://jans.io/oauth/jans-auth-server/config/adminui/license.readonly https://jans.io/oauth/jans-auth-server/config/adminui/license.write https://jans.io/oauth/config/plugin.readonly https://jans.io/oauth/client/authorizations.readonly https://jans.io/oauth/client/authorizations.delete https://jans.io/oauth/config/cacherefresh.readonly https://jans.io/oauth/config/cacherefresh.write https://jans.io/oauth/config/saml.readonly https://jans.io/oauth/config/saml.write https://jans.io/oauth/config/saml-config.readonly https://jans.io/oauth/config/saml-config.write https://jans.io/oauth/config/saml-client-scope.readonly https://jans.io/oauth/config/saml-client-scope.write https://jans.io/idp/config.readonly https://jans.io/idp/config.write https://jans.io/idp/realm.readonly https://jans.io/idp/realm.write https://jans.io/idp/realm.write https://jans.io/idp/saml.readonly https://jans.io/idp/saml.write https://jans.io/oauth/config/app-version.readonly https://jans.io/oauth/kc-link-config.readonly https://jans.io/oauth/kc-link-config.write https://jans.io/oauth/lock-config.readonly https://jans.io/oauth/lock-config.write https://pujavs-definite-dory.gluu.info/jans-config-api/api/v1/jans-assets/upload-asset https://jans.io/oauth/config/jans_asset-write https://jans.io/oauth/config/jans_asset-delete https://jans.io/oauth/lock/read-all https://jans.io/oauth/lock/write-all https://jans.io/oauth/lock-config.readonly https://jans.io/oauth/lock-config.write https://jans.io/oauth/lock/audit.readonly https://jans.io/oauth/lock/audit.write https://jans.io/oauth/lock/health.readonly https://jans.io/oauth/lock/health.write https://jans.io/oauth/lock/log.readonly https://jans.io/oauth/lock/log.write https://jans.io/oauth/lock/telemetry.readonly https://jans.io/oauth/lock/telemetry.write https://jans.io/oauth/config/token.readonly https://jans.io/oauth/config/token.write https://jans.io/oauth/config/token.delete
# Test env Setting
token.endpoint=https://pujavs-informed-boar.gluu.info/jans-auth/restv1/token
token.grant.type=client_credentials
test.client.id=1800.3f0358fa-d6f6-483e-a7a0-d2ca95609afc
test.client.secret=fA5wnwls35Ln
test.issuer=https://pujavs-informed-boar.gluu.info
token.endpoint=${token.endpoint}
token.grant.type=${token.grant.type}
test.client.id=${test.client.id}
test.client.secret=${test.client.secret}
test.issuer=${test.issuer}

#test.scopes=https://jans.io/oauth/config/acrs.readonly https://jans.io/oauth/config/acrs.write https://jans.io/oauth/config/attributes.readonly https://jans.io/oauth/config/attributes.write https://jans.io/oauth/config/attributes.delete https://jans.io/oauth/config/cache.readonly https://jans.io/oauth/config/cache.write https://jans.io/oauth/config/openid/clients.readonly https://jans.io/oauth/config/openid/clients.write https://jans.io/oauth/config/openid/clients.delete https://jans.io/oauth/jans-auth-server/config/properties.readonly https://jans.io/oauth/jans-auth-server/config/properties.write https://jans.io/oauth/config/smtp.readonly https://jans.io/oauth/config/smtp.write https://jans.io/oauth/config/smtp.delete https://jans.io/oauth/config/scripts.readonly https://jans.io/oauth/config/scripts.write https://jans.io/oauth/config/scripts.delete https://jans.io/oauth/config/fido2.readonly https://jans.io/oauth/config/fido2.write https://jans.io/oauth/config/fido2.delete https://jans.io/oauth/config/jwks.readonly https://jans.io/oauth/config/jwks.write https://jans.io/oauth/config/jwks.delete https://jans.io/oauth/config/database/ldap.readonly https://jans.io/oauth/config/database/ldap.write https://jans.io/oauth/config/database/ldap.delete https://jans.io/oauth/config/logging.readonly https://jans.io/oauth/config/logging.write https://jans.io/oauth/config/scopes.readonly https://jans.io/oauth/config/scopes.write https://jans.io/oauth/config/scopes.delete https://jans.io/oauth/config/uma/resources.readonly https://jans.io/oauth/config/uma/resources.write https://jans.io/oauth/config/uma/resources.delete https://jans.io/oauth/config/database/sql.readonly https://jans.io/oauth/config/database/sql.write https://jans.io/oauth/config/database/sql.delete https://jans.io/oauth/config/stats.readonly jans_stat https://jans.io/scim/users.read https://jans.io/scim/users.write https://jans.io/oauth/config/scim/users.read https://jans.io/oauth/config/scim/users.write https://jans.io/scim/config.readonly https://jans.io/scim/config.write https://jans.io/oauth/config/organization.readonly https://jans.io/oauth/config/organization.write https://jans.io/oauth/config/user.readonly https://jans.io/oauth/config/user.write https://jans.io/oauth/config/user.delete https://jans.io/oauth/config/agama.readonly https://jans.io/oauth/config/agama.write https://jans.io/oauth/config/agama.delete https://jans.io/oauth/jans-auth-server/session.readonly https://jans.io/oauth/jans-auth-server/session.delete revoke_session https://jans.io/oauth/config/read-all https://jans.io/oauth/config/write-all https://jans.io/oauth/config/delete-all https://jans.io/oauth/config/openid-read https://jans.io/oauth/config/openid-write https://jans.io/oauth/config/openid-delete https://jans.io/oauth/config/uma-read https://jans.io/oauth/config/uma-write https://jans.io/oauth/config/uma-delete https://jans.io/oauth/jans-auth-server/config/adminui/user/role.readonly https://jans.io/oauth/jans-auth-server/config/adminui/user/role.write https://jans.io/oauth/jans-auth-server/config/adminui/read-all https://jans.io/oauth/jans-auth-server/config/adminui/write-all https://jans.io/oauth/jans-auth-server/config/adminui/user/role.delete https://jans.io/oauth/jans-auth-server/config/adminui/delete-all https://jans.io/oauth/jans-auth-server/config/adminui/user/permission.readonly https://jans.io/oauth/jans-auth-server/config/adminui/user/permission.write https://jans.io/oauth/jans-auth-server/config/adminui/user/permission.write https://jans.io/oauth/jans-auth-server/config/adminui/user/permission.delete https://jans.io/oauth/jans-auth-server/config/adminui/user/rolePermissionMapping.readonly https://jans.io/oauth/jans-auth-server/config/adminui/user/rolePermissionMapping.write https://jans.io/oauth/jans-auth-server/config/adminui/user/rolePermissionMapping.delete https://jans.io/oauth/jans-auth-server/config/adminui/license.readonly https://jans.io/oauth/jans-auth-server/config/adminui/license.write https://jans.io/oauth/config/plugin.readonly https://jans.io/oauth/client/authorizations.readonly https://jans.io/oauth/client/authorizations.delete https://jans.io/oauth/config/cacherefresh.readonly https://jans.io/oauth/config/cacherefresh.write https://jans.io/oauth/config/saml.readonly https://jans.io/oauth/config/saml.write https://jans.io/oauth/config/saml-config.readonly https://jans.io/oauth/config/saml-config.write https://jans.io/oauth/config/saml-client-scope.readonly https://jans.io/oauth/config/saml-client-scope.write https://jans.io/idp/config.readonly https://jans.io/idp/config.write https://jans.io/idp/realm.readonly https://jans.io/idp/realm.write https://jans.io/idp/realm.write https://jans.io/idp/saml.readonly https://jans.io/idp/saml.write https://jans.io/oauth/config/app-version.readonly https://jans.io/oauth/kc-link-config.readonly https://jans.io/oauth/kc-link-config.write https://jans.io/oauth/lock-config.readonly https://jans.io/oauth/lock-config.write https://pujavs-definite-dory.gluu.info/jans-config-api/api/v1/jans-assets/upload-asset https://jans.io/oauth/config/jans_asset-write https://jans.io/oauth/config/jans_asset-delete https://jans.io/oauth/lock/read-all https://jans.io/oauth/lock/write-all https://jans.io/oauth/lock-config.readonly https://jans.io/oauth/lock-config.write https://jans.io/oauth/lock/audit.readonly https://jans.io/oauth/lock/audit.write https://jans.io/oauth/lock/health.readonly https://jans.io/oauth/lock/health.write https://jans.io/oauth/lock/log.readonly https://jans.io/oauth/lock/log.write https://jans.io/oauth/lock/telemetry.readonly https://jans.io/oauth/lock/telemetry.write https://jans.io/oauth/config/token.readonly https://jans.io/oauth/config/token.write https://jans.io/oauth/config/token.delete
## Test env Setting
#token.endpoint=https://pujavs-informed-boar.gluu.info/jans-auth/restv1/token
#token.grant.type=client_credentials
#test.client.id=1800.3f0358fa-d6f6-483e-a7a0-d2ca95609afc
#test.client.secret=fA5wnwls35Ln
#test.issuer=https://pujavs-informed-boar.gluu.info


#test.scopes=openid profile email user_name
Expand Down
4 changes: 2 additions & 2 deletions jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -863,10 +863,10 @@ components:
type: array
items:
type: object
displayValue:
type: string
value:
type: object
displayValue:
type: string
CustomUser:
type: object
properties:
Expand Down
Loading
Loading