refactor cleanup

cryostatio · Apr 23, 2024 · dd9e75d · dd9e75d
1 parent 6e9daef
commit dd9e75d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 80 deletions.
diff --git a/src/app/AppLayout/AuthModal.tsx b/src/app/AppLayout/AuthModal.tsx
@@ -43,7 +43,9 @@ export const AuthModal: React.FC<AuthModalProps> = ({ onDismiss, onSave: onProps
             filter((target) => !!target),
             first(),
             map((target: Target) => target.connectUrl),
-            mergeMap((connectUrl) => context.authCredentials.setCredential(connectUrl, username, password)),
+            mergeMap((connectUrl) =>
+              context.api.postCredentials(`target.connectUrl == "${connectUrl}"`, username, password),
+            ),
           )
           .subscribe((ok) => {
             setLoading(false);
@@ -53,7 +55,7 @@ export const AuthModal: React.FC<AuthModalProps> = ({ onDismiss, onSave: onProps
           }),
       );
     },
-    [addSubscription, context.authCredentials, targetObs, setLoading, onPropsSave],
+    [addSubscription, context.api, targetObs, setLoading, onPropsSave],
   );
 
   return (

diff --git a/src/app/Shared/Services/AuthCredentials.service.tsx b/src/app/Shared/Services/AuthCredentials.service.tsx
diff --git a/src/app/Shared/Services/Services.tsx b/src/app/Shared/Services/Services.tsx
@@ -15,7 +15,6 @@
  */
 import * as React from 'react';
 import { ApiService } from './Api.service';
-import { AuthCredentials } from './AuthCredentials.service';
 import { LoginService } from './Login.service';
 import { NotificationChannel } from './NotificationChannel.service';
 import { NotificationsInstance } from './Notifications.service';
@@ -28,7 +27,6 @@ export interface Services {
   target: TargetService;
   targets: TargetsService;
   api: ApiService;
-  authCredentials: AuthCredentials;
   notificationChannel: NotificationChannel;
   reports: ReportService;
   settings: SettingsService;
@@ -37,7 +35,6 @@ export interface Services {
 
 const target = new TargetService();
 const settings = new SettingsService();
-const authCredentials = new AuthCredentials(() => api);
 const login = new LoginService(settings);
 const api = new ApiService(target, NotificationsInstance, login);
 const notificationChannel = new NotificationChannel(NotificationsInstance, login);
@@ -48,7 +45,6 @@ const defaultServices: Services = {
   target,
   targets,
   api,
-  authCredentials,
   notificationChannel,
   reports,
   settings,

diff --git a/src/test/Shared/Services/JmxCredentials.service.test.tsx b/src/test/Shared/Services/JmxCredentials.service.test.tsx