electron auth proxy WIP

packages/api/src/controllers/auth.js

@@ -37,7 +37,8 @@ function authMiddleware(req, res, next) {
     '/stream',
     'storage/get-connections-for-login-page',
     'auth/get-providers',
-    '/connections/dblogin',
+    '/connections/dblogin-web',
+    '/connections/dblogin-app',
     '/connections/dblogin-auth',
     '/connections/dblogin-auth-token',
   ];

packages/api/src/controllers/connections.js

@@ -386,18 +386,33 @@ module.exports = {
     return res;
   },
 
-  dblogin_meta: {
+  dbloginWeb_meta: {
     raw: true,
     method: 'get',
   },
-  async dblogin(req, res) {
+  async dbloginWeb(req, res) {
     const { conid, state, redirectUri } = req.query;
     const connection = await this.getCore({ conid });
     const driver = requireEngineDriver(connection);
-    const authUrl = await driver.getRedirectAuthUrl(connection, { redirectUri, state });
+    const authUrl = await driver.getRedirectAuthUrl(connection, {
+      redirectUri,
+      state,
+      client: 'web',
+    });
     res.redirect(authUrl);
   },
 
+  dbloginApp_meta: true,
+  async dbloginApp({ conid, state }) {
+    const connection = await this.getCore({ conid });
+    const driver = requireEngineDriver(connection);
+    const url = await driver.getRedirectAuthUrl(connection, {
+      state,
+      client: 'app',
+    });
+    return { url };
+  },
+
   dbloginToken_meta: true,
   async dbloginToken({ code, conid, strmid, redirectUri, sid }) {
     try {

packages/web/src/utility/api.ts

@@ -97,11 +97,19 @@ async function processApiResponse(route, args, resp) {
 
       const state = `dbg-dblogin:${strmid}:${resp.detail.conid}`;
       localStorage.setItem('dbloginState', state);
-      openWebLink(
-        `connections/dblogin?conid=${resp.detail.conid}&state=${encodeURIComponent(state)}&redirectUri=${
-          location.origin + location.pathname
-        }`
-      );
+      if (getElectron()) {
+        const dbloginApp = await apiCall('connections/dblogin-app', {
+          conid: resp.detail.conid,
+          state,
+        });
+        openWebLink(dbloginApp.url);
+      } else {
+        openWebLink(
+          `connections/dblogin-web?conid=${resp.detail.conid}&state=${encodeURIComponent(state)}&redirectUri=${
+            location.origin + location.pathname
+          }`
+        );
+      }
     } else if (!isDatabaseLoginVisible()) {
       showModal(DatabaseLoginModal, resp.detail);
     }

plugins/dbgate-plugin-mssql/src/backend/driver.js

@@ -141,7 +141,6 @@ const driver = {
     if (connection.authType != 'msentra') return null;
     return authProxy.authProxyGetRedirectUrl({
       ...options,
-      client: platformInfo.isElectron ? 'app' : 'web',
       type: 'msentra',
     });
   },