Adds more validations

stateful · Oct 25, 2024 · 5494cbb · 5494cbb
1 parent da11bcf
commit 5494cbb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/extension/extension.ts b/src/extension/extension.ts
@@ -454,8 +454,8 @@ export class RunmeExtension {
       const statefulAuthProvider = new StatefulAuthProvider(context, uriHandler)
       context.subscriptions.push(statefulAuthProvider)
 
-      const secrestAuthed = statefulAuthProvider.loadFromSecrets()
-      const forceLogin = kernel.isFeatureOn(FeatureName.ForceLogin) || (await secrestAuthed)
+      const secrestAuthed = await statefulAuthProvider.loadFromSecrets()
+      const forceLogin = kernel.isFeatureOn(FeatureName.ForceLogin) || secrestAuthed
       const silent = forceLogin ? undefined : true
 
       getPlatformAuthSession(forceLogin, silent)

diff --git a/src/extension/provider/statefulAuth.ts b/src/extension/provider/statefulAuth.ts
@@ -239,19 +239,14 @@ export class StatefulAuthProvider implements AuthenticationProvider, Disposable
 
   public async loadFromSecrets() {
     const secretsFile = '/etc/secrets/playground-dev'
-    if (!secretsFile) {
-      logger.info('Skip authentication from secrets file')
-      return
-    }
-
     const secretsUri = Uri.parse(secretsFile)
     const hasSecretsFile = await workspace.fs.stat(secretsUri).then(
       () => true,
       () => false,
     )
 
     if (!hasSecretsFile) {
-      logger.info('No secrets file found')
+      logger.info('No secrets file found, skipping load from secrets')
       return
     }
 
@@ -276,6 +271,12 @@ export class StatefulAuthProvider implements AuthenticationProvider, Disposable
 
     try {
       const { name, email } = await this.getUserInfo(token)
+
+      if (!name || !email) {
+        logger.error('Failed to get user info from JWT token')
+        return
+      }
+
       const session: StatefulAuthSession = {
         accessToken: token,
         expiresIn: secsToUnixTime(exp),