Refactored ensureSession to return the session explicitly

stateful · Dec 17, 2024 · aa9ca70 · aa9ca70
1 parent ad08a6d
commit aa9ca70
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/extension/extension.ts b/src/extension/extension.ts
@@ -489,15 +489,21 @@ export class RunmeExtension {
     }
 
     if (kernel.isFeatureOn(FeatureName.RequireStatefulAuth)) {
-      await StatefulAuthProvider.instance.ensureSession()
-      StatefulAuthProvider.instance.currentSession().then(async (session) => {
-        if (session) {
-          await commands.executeCommand('runme.lifecycleIdentitySelection', RunmeIdentity.ALL)
+      const logger = getLogger(FeatureName.RequireStatefulAuth)
+      try {
+        const session = await StatefulAuthProvider.instance.ensureSession()
+        const nunmeIdentity = session ? RunmeIdentity.ALL : getServerLifecycleIdentity()
+        await commands.executeCommand('runme.lifecycleIdentitySelection', nunmeIdentity)
+      } catch (error) {
+        let message
+        if (error instanceof Error) {
+          message = error.message
         } else {
-          const settingsDefault = getServerLifecycleIdentity()
-          await commands.executeCommand('runme.lifecycleIdentitySelection', settingsDefault)
+          message = JSON.stringify(error)
         }
-      })
+
+        logger.error(message)
+      }
     }
 
     if (kernel.isFeatureOn(FeatureName.Gist)) {

diff --git a/src/extension/provider/statefulAuth.ts b/src/extension/provider/statefulAuth.ts
@@ -136,22 +136,23 @@ export class StatefulAuthProvider implements AuthenticationProvider, Disposable
     return sessions[0]
   }
 
-  async ensureSession() {
+  async ensureSession(): Promise<StatefulAuthSession | undefined> {
     let session = await this.currentSession()
     if (session) {
       StatefulAuthProvider.showLoginNotification()
-      return
+      return session
     }
 
     session = await StatefulAuthProvider.bootstrapFromToken()
     const forceLogin = features.isOnInContextState(FeatureName.ForceLogin) || !!session
 
     const silent = forceLogin ? undefined : true
 
-    this.newSession(silent)
+    return this.newSession(silent)
       .then(() => {
         if (session) {
           StatefulAuthProvider.showLoginNotification()
+          return session
         }
       })
       .catch((error) => {
@@ -170,6 +171,7 @@ export class StatefulAuthProvider implements AuthenticationProvider, Disposable
         if (forceLogin && message === 'User did not consent to login.') {
           authentication.getSession(AuthenticationProviders.Stateful, DEFAULT_SCOPES, {})
         }
+        return error
       })
   }