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: v3 RC1 fixes #3790

Merged
merged 12 commits into from
Sep 24, 2024
5 changes: 4 additions & 1 deletion api-catalog-ui/frontend/src/actions/user-actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ function login(credentials) {
if (credentials.newPassword) {
showUpdatePassSuccess = true;
}
const dashBoardPath = '/dashboard';
dispatch(success(token, showUpdatePassSuccess));
history.push('/dashboard');
if (history.location.pathname !== dashBoardPath) {
window.location.href = dashBoardPath;
}
},
(error) => {
if (error.messageNumber === 'ZWEAT413E') {
Expand Down
7 changes: 0 additions & 7 deletions api-catalog-ui/frontend/src/actions/user-actions.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import userConstants from '../constants/user-constants';
import { userActions } from './user-actions';
import { userService } from '../services';
import history from '../helpers/history';

describe('>>> User actions tests', () => {
const credentials = { username: 'user', password: 'password' };
Expand Down Expand Up @@ -52,15 +51,9 @@ describe('>>> User actions tests', () => {

userService.login = jest.fn().mockResolvedValue('token');

const pushSpy = jest.spyOn(history, 'push');

await userActions.login(credentials)(dispatch);

expect(dispatch.mock.calls[0][0]).toStrictEqual(expectedAction);

expect(pushSpy).toHaveBeenCalledWith('/dashboard');

pushSpy.mockRestore();
});

it('should logout', async () => {
Expand Down
1 change: 1 addition & 0 deletions caching-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spring:
output.ansi.enabled: always
main:
allow-circular-references: true
banner-mode: ${apiml.banner:"off"}

springdoc:
pathsToMatch: /api/v1/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public MessageService messageService() {
messageService.loadMessages("/utility-log-messages.yml");
messageService.loadMessages("/common-log-messages.yml");
messageService.loadMessages("/gateway-log-messages.yml");
messageService.loadMessages("/security-common-log-messages.yml");
return messageService;
}

Expand Down
8 changes: 8 additions & 0 deletions gateway-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spring:
registration:
okta:
redirectUri: "{baseUrl}/gateway/{action}/oauth2/code/{registrationId}"
main:
banner-mode: ${apiml.banner:"off"}

springdoc:
api-docs:
Expand Down Expand Up @@ -127,13 +129,19 @@ logging:
level:
ROOT: INFO
com.netflix: WARN
com.netflix.discovery: ERROR
com.netflix.config: ERROR
com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient: OFF
com.netflix.discovery.DiscoveryClient: OFF
org.springframework.cloud.gateway.filter: WARN
org.springframework.cloud.gateway.route: WARN
org.springframework.context.support: WARN
org.springframework.beans: WARN
org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: ERROR
reactor.netty.http.client: INFO
reactor.netty.http.client.HttpClientConnect: OFF
io.netty.util.internal.MacAddressUtil: ERROR # Can print WARN not finding usable MAC Address
io.netty.resolver.dns: WARN
javax.net.ssl: ERROR
org.apache.tomcat.util.net.SSLUtilBase: ERROR

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void givenValidZoweTokenWithLtpa() throws UnrecoverableKeyException, Certificate
}

@Test
void givenValidAccessToken() {
void givenValidPersonalAccessToken() {
String serviceId = "gateway";
String pat = personalAccessToken(Collections.singleton(serviceId));

Expand Down
2 changes: 1 addition & 1 deletion zowe-cli-id-federation-plugin/.npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
registry=https://zowe.jfrog.io/artifactory/api/npm/npm-org/
registry=https://registry.npmjs.org/
@zowe:registry=https://zowe.jfrog.io/zowe/api/npm/npm-release/
Loading