Merge branch 'mintlify--x-gitlens' of https://github.com/mintlify/con…

…nector into mintlify--x-gitlens
mintlify · Jul 15, 2022 · 6257fa1 · 6257fa1
2 parents 5eb6a89 + e089c68
commit 6257fa1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/vscode/package.json b/vscode/package.json
@@ -3,7 +3,7 @@
   "publisher": "mintlify",
   "displayName": "Document Connector",
   "description": "Create connections between documentation and code",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "icon": "assets/logo.png",
   "repository": {
     "url": "https://github.com/mintlify/connect"

diff --git a/vscode/src/mintlify-functionality/utils/git/index.ts b/vscode/src/mintlify-functionality/utils/git/index.ts
@@ -187,7 +187,6 @@ export const getGitData = async (fileFsPath: string, type: string, lines?: numbe
 					}
 				}
 				if (rawUri == null) {
-					await vscode.window.showWarningMessage(`No remote found on branch.`);
 					return;
 				}
 

diff --git a/vscode/src/mintlify/webview/viewProvider.ts b/vscode/src/mintlify/webview/viewProvider.ts
@@ -111,8 +111,8 @@ export class ViewProvider implements WebviewViewProvider {
 					await vscode.window.showErrorMessage('User has insufficient credentials. Try again later');
 					return;
 				}
-
-				await this.authenticate(user);
+				const subdomain = query.get('subdomain');
+				await this.authenticate(user, subdomain);
 			} catch (err) {
 				await vscode.window.showErrorMessage('Error authenticating user');
 			}
@@ -133,8 +133,11 @@ export class ViewProvider implements WebviewViewProvider {
 		await this.container.storage.deleteSecret('subdomain');
 	}
 
-	public async authenticate(user: any) {
+	public async authenticate(user: any, subdomain?: string | null) {
 		await this.container.storage.storeSecret('userId', user.userId);
+		if (subdomain) {
+			await this.container.storage.storeSecret('subdomain', subdomain);
+		}
 		await vscode.commands.executeCommand('setContext', 'mintlify.isLoggedIn', true);
 		await vscode.window.showInformationMessage(`🙌 Successfully signed in with ${user.email}`);
 		await executeCommand(Commands.RefreshLinks);
-Original file line number
+Diff line change
@@ Expand Up @@
     					}
     				}
     				if (rawUri == null) {
-    					await vscode.window.showWarningMessage(`No remote found on branch.`);
     					return;
     				}
@@ Expand Down @@