fix active subscription not loaded in cli bug

mfleisch · mfleisch · commit bc9817375a62 · 2025-09-02T11:20:51.000+02:00
(cherry picked from commit edaabe1)
diff --git a/sirius_cli/src/main/java/de/unijena/bioinf/ms/frontend/core/ApplicationCore.java b/sirius_cli/src/main/java/de/unijena/bioinf/ms/frontend/core/ApplicationCore.java
@@ -20,21 +20,25 @@
 package de.unijena.bioinf.ms.frontend.core;
 
 import de.unijena.bioinf.ChemistryBase.jobs.SiriusJobs;
+import de.unijena.bioinf.ChemistryBase.utils.ExFunctions;
 import de.unijena.bioinf.FragmentationTreeConstruction.computation.tree.TreeBuilderFactory;
 import de.unijena.bioinf.auth.AuthService;
 import de.unijena.bioinf.auth.AuthServices;
 import de.unijena.bioinf.fingerid.fingerprints.cache.IFingerprinterCache;
 import de.unijena.bioinf.fingerid.fingerprints.cache.NonBlockingIFingerprinterCache;
 import de.unijena.bioinf.ms.frontend.bibtex.BibtexManager;
+import de.unijena.bioinf.ms.frontend.subtools.custom_db.CustomDBPropertyUtils;
 import de.unijena.bioinf.ms.persistence.storage.StorageUtils;
 import de.unijena.bioinf.ms.properties.ConfigType;
 import de.unijena.bioinf.ms.properties.PropertyManager;
 import de.unijena.bioinf.ms.properties.SiriusConfigUtils;
 import de.unijena.bioinf.ms.rest.model.license.Subscription;
+import de.unijena.bioinf.rest.NetUtils;
 import de.unijena.bioinf.rest.ProxyManager;
 import de.unijena.bioinf.sirius.SiriusFactory;
 import de.unijena.bioinf.webapi.WebAPI;
 import de.unijena.bioinf.webapi.rest.RestAPI;
+import io.sirius.ms.utils.jwt.AccessTokens;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.lang3.time.StopWatch;
@@ -53,6 +57,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.Callable;
 import java.util.logging.LogManager;
 
 import static de.unijena.bioinf.ms.frontend.SiriusCLIApplication.APP_TYPE_PROPERTY_KEY;
@@ -91,7 +96,26 @@ public static WebAPI<?> WEB_API(){
                         StopWatch stopWatch = StopWatch.createStarted();
                         AuthService service = ProxyManager.applyClient(c -> AuthServices.createDefault(PropertyManager.getProperty("de.unijena.bioinf.sirius.security.audience"), TOKEN_FILE, c));
                         WEB_API = new RestAPI(service, (Subscription) null);
-                        DEFAULT_LOGGER.info("Web API initialized in {}", stopWatch);
+
+                        SiriusJobs.runInBackground((Callable<Void>) () -> {
+                            ProxyManager.withConnectionLock((ExFunctions.Runnable) () -> {
+                                Subscription sub = null; //web connection
+                                try {
+                                    sub = NetUtils.tryAndWait(() -> WEB_API.getAuthService().getToken().map(AccessTokens.ACCESS_TOKENS::getActiveSubscription).orElse(null),
+                                            () -> NetUtils.checkThreadInterrupt(Thread.currentThread()), 5000) ;
+                                    WEB_API.changeActiveSubscription(sub);
+                                } catch (Exception e) {
+                                    DEFAULT_LOGGER.debug("Error when refreshing token", e);
+                                    DEFAULT_LOGGER.warn("Error when refreshing token: {} Cleaning login information. Please re-login!", e.getMessage());
+                                    AuthServices.clearRefreshToken(WEB_API.getAuthService(), TOKEN_FILE); // in case the token is corrupted or the account has been deleted
+                                }
+                            });
+
+                            CustomDBPropertyUtils.loadAllCustomDBs(WEB_API.getCDKChemDBFingerprintVersion());
+                            DEFAULT_LOGGER.info("Custom databases loaded.");
+                            return null;
+                        });
+                        DEFAULT_LOGGER.info("Web API initialized in {}. Started loading active subscription in background...", stopWatch);
                     } catch (IOException e) {
                         throw new RuntimeException(e);
                     }
diff --git a/sirius_rest_service/src/main/java/de/unijena/bioinf/ms/frontend/subtools/middleware/MiddlewareAppOptions.java b/sirius_rest_service/src/main/java/de/unijena/bioinf/ms/frontend/subtools/middleware/MiddlewareAppOptions.java
@@ -19,27 +19,19 @@
 
 package de.unijena.bioinf.ms.frontend.subtools.middleware;
 
-import de.unijena.bioinf.ChemistryBase.utils.ExFunctions;
 import de.unijena.bioinf.ChemistryBase.utils.FileUtils;
-import de.unijena.bioinf.auth.AuthServices;
 import de.unijena.bioinf.ms.frontend.splash.Splash;
 import de.unijena.bioinf.ms.frontend.subtools.OutputOptions;
 import de.unijena.bioinf.ms.frontend.subtools.Provide;
 import de.unijena.bioinf.ms.frontend.subtools.RootOptions;
 import de.unijena.bioinf.ms.frontend.subtools.StandaloneTool;
-import de.unijena.bioinf.ms.frontend.subtools.custom_db.CustomDBPropertyUtils;
 import de.unijena.bioinf.ms.frontend.workflow.Workflow;
 import de.unijena.bioinf.ms.gui.compute.jjobs.Jobs;
 import de.unijena.bioinf.ms.middleware.model.projects.ProjectInfo;
 import de.unijena.bioinf.ms.middleware.service.gui.GuiService;
 import de.unijena.bioinf.ms.middleware.service.projects.ProjectsProvider;
 import de.unijena.bioinf.ms.properties.ParameterConfig;
-import de.unijena.bioinf.ms.rest.model.license.Subscription;
 import de.unijena.bioinf.projectspace.SiriusProjectSpaceInstance;
-import de.unijena.bioinf.rest.NetUtils;
-import de.unijena.bioinf.rest.ProxyManager;
-import de.unijena.bioinf.webapi.WebAPI;
-import io.sirius.ms.utils.jwt.AccessTokens;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -51,11 +43,9 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static de.unijena.bioinf.ms.frontend.core.ApplicationCore.TOKEN_FILE;
 import static de.unijena.bioinf.ms.persistence.storage.SiriusProjectDocumentDatabase.SIRIUS_PROJECT_SUFFIX;
 
 @Slf4j
@@ -66,9 +56,6 @@ public class MiddlewareAppOptions<I extends SiriusProjectSpaceInstance> implemen
     @Setter
     private GuiService guiService;
 
-    @Setter
-    private WebAPI<?> webAPI;
-
     private Splash splash;
 
     public MiddlewareAppOptions(Splash splashScreen) {
@@ -176,25 +163,6 @@ private Flow(OutputOptions output) {
 
         @Override
         public void run() {
-            Jobs.runInBackground((Callable<Void>) () -> {
-                ProxyManager.withConnectionLock((ExFunctions.Runnable) () -> {
-                    Subscription sub = null; //web connection
-                    try {
-                        sub = NetUtils.tryAndWait(() -> webAPI.getAuthService().getToken().map(AccessTokens.ACCESS_TOKENS::getActiveSubscription).orElse(null),
-                                () -> NetUtils.checkThreadInterrupt(Thread.currentThread()), 5000) ;
-                        webAPI.changeActiveSubscription(sub);
-                    } catch (Exception e) {
-                        log.debug("Error when refreshing token", e);
-                        log.warn("Error when refreshing token: {} Cleaning login information. Please re-login!", e.getMessage());
-                        AuthServices.clearRefreshToken(webAPI.getAuthService(), TOKEN_FILE); // in case token is corrupted or the account has been deleted
-                    }
-                });
-
-                CustomDBPropertyUtils.loadAllCustomDBs(webAPI.getCDKChemDBFingerprintVersion());
-                log.info("Custom databases loaded.");
-                return null;
-            });
-
             //do the project importing from the commandline
             Optional<Path> location = Optional.ofNullable(output).map(OutputOptions::getOutputProjectLocation);
             if (location.isPresent() || MiddlewareAppOptions.this.isStartGui()) {
diff --git a/sirius_rest_service/src/main/java/de/unijena/bioinf/ms/middleware/SiriusMiddlewareApplication.java b/sirius_rest_service/src/main/java/de/unijena/bioinf/ms/middleware/SiriusMiddlewareApplication.java
@@ -42,7 +42,6 @@
 import de.unijena.bioinf.ms.middleware.service.projects.ProjectsProvider;
 import de.unijena.bioinf.ms.properties.PropertyManager;
 import de.unijena.bioinf.projectspace.ProjectSpaceManagerFactory;
-import de.unijena.bioinf.webapi.WebAPI;
 import io.sirius.ms.sdk.SiriusSDK;
 import io.sirius.ms.sdk.model.GuiInfo;
 import io.sirius.ms.sdk.model.ProjectInfo;
@@ -274,7 +273,6 @@ public static void main(String[] args) {
     @Override
     public void run(String... args) {
         middlewareOpts.setProjectsProvider(appContext.getBean(ProjectsProvider.class));
-        middlewareOpts.setWebAPI(appContext.getBean(WebAPI.class));
         if (appContext.containsBean("guiService"))
             middlewareOpts.setGuiService(appContext.getBean(GuiService.class));
         rootOptions.setSpaceManagerFactory(appContext.getBean(ProjectSpaceManagerFactory.class));
