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

Update Keycloak 26 #534

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Update Keycloak 26 #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ module.exports = {
setupFilesAfterEnv: ['<rootDir>/test-setup.js'],

// The test environment that will be used for testing.
transformIgnorePatterns: ['/node_modules/(?!(react-syntax-highlighter)/)'],
transformIgnorePatterns: ['/node_modules/(?!(react-syntax-highlighter|keycloak-js)/)'],
testEnvironment: "jsdom",
};
27 changes: 5 additions & 22 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"i18next": "^23.14.0",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-http-backend": "^2.6.1",
"keycloak-js": "^23.0.7",
"keycloak-js": "^26",
"numeral": "^2.0.6",
"react": "^18",
"react-dom": "^18",
Expand Down
19 changes: 14 additions & 5 deletions src/services/keycloakService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Keycloak, { KeycloakError, KeycloakLoginOptions } from 'keycloak-js';
import Keycloak, { KeycloakConfig, KeycloakLoginOptions } from 'keycloak-js';

export class KeycloakService {
private initialized = false;
Expand All @@ -13,7 +13,7 @@ export class KeycloakService {
return this.instance;
}

public static init(configOptions: Keycloak.KeycloakConfig | undefined): Promise<void> {
public static init(configOptions: KeycloakConfig | undefined): Promise<void> {
if (!configOptions) {
console.error('Unable to init Keycloak with undefined configOptions');
return new Promise((resolve, reject) => reject('Unable to init Keycloak with undefined configOptions'));
Expand All @@ -27,7 +27,7 @@ export class KeycloakService {
KeycloakService.Instance.initialized = true;
resolve();
})
.catch((errorData: KeycloakError) => {
.catch((errorData) => {
reject(errorData);
});
});
Expand Down Expand Up @@ -55,8 +55,17 @@ export class KeycloakService {
});
}

public logout(redirectUri?: string): void {
KeycloakService.keycloakAuth.logout({ redirectUri: redirectUri });
public logout(redirectUri?: string): Promise<void> {
return new Promise<void>((resolve, reject) => {
KeycloakService.keycloakAuth
.logout({ redirectUri: redirectUri })
.then(() => {
resolve();
})
.catch(() => {
reject();
});
});
}

public account(): void {
Expand Down
2 changes: 0 additions & 2 deletions src/types/InfinispanTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */

interface Status {
name: string;
color: string;
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lib": ["es6", "dom"],
"sourceMap": true,
"jsx": "react",
"moduleResolution": "node",
"moduleResolution": "Bundler",
"forceConsistentCasingInFileNames": true,
"noImplicitReturns": true,
"noImplicitThis": true,
Expand Down
Loading