DEV2-3883-squash (#1333)

* DEV2-3883-squash

* fix return url

* fixing wrong param

.vscode/launch.json

@@ -10,6 +10,7 @@
       "args": [
         "--extensionDevelopmentPath=${workspaceRoot}",
         "--logPluginHostCommunication",
+        "--disable-extensions",
       ],
       "sourceMaps": true,
       "preLaunchTask": "npm: build"
@@ -57,7 +58,8 @@
       "runtimeExecutable": "${execPath}",
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}",
-        "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+        "--extensionTestsPath=${workspaceFolder}/out/test/suite/index",
+        "--disable-extensions"
       ],
       "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
       "preLaunchTask": "npm: pretest"

src/authentication/authentication.api.ts

@@ -1,10 +1,11 @@
 import { tabNineProcess } from "../binary/requests/requests";
-import { openLogin } from "../cloudEnvs/openLogin";
+import { openExternalLogin } from "../cloudEnvs/openLogin";
 import isCloudEnv from "../cloudEnvs/isCloudEnv";
+import tabnineExtensionProperties from "../globals/tabnineExtensionProperties";
 
 export function callForLogin(): Promise<unknown> {
-  if (isCloudEnv) {
-    return openLogin();
+  if (isCloudEnv || tabnineExtensionProperties.isRemote) {
+    return openExternalLogin();
   }
   return tabNineProcess.request({ Login: {} });
 }

src/binary/requests/startLoginServer.ts

@@ -0,0 +1,10 @@
+import { tabNineProcess } from "./requests";
+
+export function startLoginServer(): Promise<string | null | undefined> {
+  return tabNineProcess.request(
+    {
+      StartLoginServer: {},
+    },
+    5000
+  );
+}

src/cloudEnvs/openLogin.ts

@@ -1,26 +1,14 @@
-import { env, Uri } from "vscode";
-import { URL } from "url";
-import { StateType, TABNINE_URL_QUERY_PARAM } from "../globals/consts";
-import createHubWebView from "../hub/createHubWebView";
-import hubUri from "../hub/hubUri";
-
-export async function openLogin(): Promise<void> {
-  return open("https://app.tabnine.com/auth/sign-in");
-}
-
-export async function openSignup(): Promise<void> {
-  return open("https://app.tabnine.com/auth/signup");
-}
-
-async function open(url: string): Promise<void> {
-  const uri = await hubUri(StateType.AUTH);
-  if (uri) {
-    const callback = new URL(url);
-    callback.searchParams.set(TABNINE_URL_QUERY_PARAM, uri.toString());
-    callback.searchParams.set("sync", "false");
-
-    const panel = await createHubWebView(uri);
-    panel.reveal();
-    void env.openExternal(Uri.parse(callback.toString()));
+import { env } from "vscode";
+import { asExternal } from "../utils/asExternal";
+import { startLoginServer } from "../binary/requests/startLoginServer";
+
+export async function openExternalLogin(): Promise<void> {
+  const url = await startLoginServer();
+  if (!url) {
+    console.error("could not strat the login server");
+    return;
   }
+  const remapedUrl = await asExternal(url);
+
+  void env.openExternal(remapedUrl);
 }

src/globals/consts.ts

@@ -2,6 +2,7 @@ import isCloudEnv from "../cloudEnvs/isCloudEnv";
 
 export const OPEN_SETTINGS_COMMAND = "workbench.action.openSettings";
 export const TABNINE_URL_QUERY_PARAM = "tabnineUrl";
+export const TABNINE_RETURN_URL_QUERY_PARAM = "returnUrl";
 export const API_VERSION = "4.4.223";
 export const ATTRIBUTION_BRAND = "⌬ ";
 export const BRAND_NAME = "tabnine";

src/hub/hubUri.ts

@@ -1,53 +1,16 @@
-import { URL } from "url";
-import { Uri, env } from "vscode";
-import {
-  StateType,
-  TABNINE_URL_QUERY_PARAM,
-  LOCAL_ADDRESSES,
-} from "../globals/consts";
+import { Uri } from "vscode";
+import { StateType } from "../globals/consts";
 import { configuration } from "../binary/requests/requests";
-import {
-  asExternalUri as asCodeServerExternalUri,
-  isCodeServer,
-} from "../cloudEnvs/codeServer";
-
-let asExternalUri = async (uri: Uri): Promise<Uri> => {
-  if (!LOCAL_ADDRESSES.includes(new URL(uri.toString()).hostname)) return uri;
-  if (isCodeServer) {
-    return asCodeServerExternalUri(uri);
-  }
-
-  return env.asExternalUri(uri);
-};
-
-export function setAsExternalUri(fn: typeof asExternalUri): void {
-  asExternalUri = fn;
-}
+import { asExternal } from "../utils/asExternal";
 
 export default async function hubUri(
   type: StateType,
-  hubPath?: string
+  path?: string
 ): Promise<Uri | null> {
   const config = await configuration({ quiet: true, source: type });
   if (!config?.message) {
     return null;
   }
 
-  const hubUrl = new URL(config.message);
-
-  const tabnineUrl = hubUrl.searchParams.get(TABNINE_URL_QUERY_PARAM);
-  if (tabnineUrl) {
-    hubUrl.searchParams.set(
-      TABNINE_URL_QUERY_PARAM,
-      (await asExternalUri(Uri.parse(tabnineUrl))).toString()
-    );
-  }
-
-  let parsedHubUri = Uri.parse(hubUrl.toString());
-
-  if (hubPath) {
-    parsedHubUri = Uri.joinPath(parsedHubUri, hubPath);
-  }
-
-  return asExternalUri(parsedHubUri);
+  return asExternal(config.message, path);
 }

src/test/suite/notification.test.ts

@@ -33,7 +33,7 @@ import {
   PROMO_TYPE,
   SAME_NOTIFICATION_ID,
 } from "./utils/testData";
-import { setAsExternalUri } from "../../hub/hubUri";
+import * as asExternalUri from "../../utils/asExternalUri";
 
 type OpenWebviewParams = [
   viewType: string,
@@ -231,11 +231,9 @@ suite("Should poll notifications", () => {
       vscode.WebviewPanel
     > = sinon.spy(vscode.window, "createWebviewPanel");
 
-    const asExternalUriSpy = sinon.spy<(uri: Uri) => Promise<Uri>>(() =>
-      Promise.resolve(Uri.parse(LOCAL_HUB_URL))
-    );
+    const asExternalUriSpy = sinon.stub(asExternalUri, "asExternalUri");
 
-    setAsExternalUri(asExternalUriSpy);
+    asExternalUriSpy.callsFake(() => Promise.resolve(Uri.parse(LOCAL_HUB_URL)));
 
     showInformationMessage.onFirstCall().resolves(AN_OPTION_KEY);
 
@@ -306,11 +304,9 @@ suite("Should poll notifications", () => {
       vscode.WebviewPanel
     > = sinon.spy(vscode.window, "createWebviewPanel");
 
-    const asExternalUriSpy = sinon.spy<(uri: Uri) => Promise<Uri>>(() =>
-      Promise.resolve(Uri.parse(LOCAL_HUB_URL))
-    );
+    const asExternalUriSpy = sinon.stub(asExternalUri, "asExternalUri");
 
-    setAsExternalUri(asExternalUriSpy);
+    asExternalUriSpy.callsFake(() => Promise.resolve(Uri.parse(LOCAL_HUB_URL)));
 
     showInformationMessage.onFirstCall().resolves(AN_OPTION_KEY);
 

src/utils/asExternal.ts

@@ -0,0 +1,36 @@
+import { URL } from "url";
+import { Uri } from "vscode";
+import {
+  TABNINE_RETURN_URL_QUERY_PARAM,
+  TABNINE_URL_QUERY_PARAM,
+} from "../globals/consts";
+import { asExternalUri } from "./asExternalUri";
+
+export async function asExternal(url: string, path?: string) {
+  const serviceUrl = new URL(url);
+
+  const tabnineUrl = serviceUrl.searchParams.get(TABNINE_URL_QUERY_PARAM);
+  const returnUrl = serviceUrl.searchParams.get(TABNINE_RETURN_URL_QUERY_PARAM);
+
+  if (tabnineUrl) {
+    serviceUrl.searchParams.set(
+      TABNINE_URL_QUERY_PARAM,
+      (await asExternalUri(Uri.parse(tabnineUrl))).toString()
+    );
+  }
+
+  if (returnUrl) {
+    serviceUrl.searchParams.set(
+      TABNINE_RETURN_URL_QUERY_PARAM,
+      (await asExternalUri(Uri.parse(returnUrl))).toString()
+    );
+  }
+
+  let parsedUri = Uri.parse(serviceUrl.toString());
+
+  if (path) {
+    parsedUri = Uri.joinPath(parsedUri, path);
+  }
+
+  return asExternalUri(parsedUri);
+}

src/utils/asExternalUri.ts

@@ -0,0 +1,18 @@
+import { URL } from "url";
+import { Uri, env } from "vscode";
+import { LOCAL_ADDRESSES } from "../globals/consts";
+import {
+  asExternalUri as asCodeServerExternalUri,
+  isCodeServer,
+} from "../cloudEnvs/codeServer";
+
+export async function asExternalUri(uri: Uri): Promise<Uri> {
+  if (!LOCAL_ADDRESSES.includes(new URL(uri.toString()).hostname)) {
+    return uri;
+  }
+  if (isCodeServer) {
+    return asCodeServerExternalUri(uri);
+  }
+
+  return env.asExternalUri(uri);
+}