From 640bd27bc61f938da03009dab58a2da57404ea06 Mon Sep 17 00:00:00 2001
From: "R.Piontik" <r.piontik@mail.ru>
Date: Wed, 1 Jun 2022 10:50:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=82=D0=B8=D0=BF=20=D0=BA=D0=BE=D0=B4=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20OAu?=
 =?UTF-8?q?th=20gitlab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore          | 1 +
 example.env         | 2 +-
 src/router/index.js | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d63b0b51..d6c536b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 node_modules
 /dist
 /certs
+/gitlab
 
 /public/workspace/*
 
diff --git a/example.env b/example.env
index a00012f4..db99d9f9 100644
--- a/example.env
+++ b/example.env
@@ -1,5 +1,5 @@
 # URI в формате DocHub корневого манифеста (обязательно)
-VUE_APP_DOCHUB_ROOT_MANIFEST=example/root.yaml
+VUE_APP_DOCHUB_ROOT_MANIFEST=gitlab:34:main@root.yaml
 
 # Идентификатор документа главной страницы. По умолчанию dochub_welcome
 VUE_APP_DOCHUB_ROOT_DOCUMENT=dochub_welcome
diff --git a/src/router/index.js b/src/router/index.js
index 4094b236..087da345 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,7 +24,7 @@ let middleware = (route) => {
         window.location = new URL(
             `/oauth/authorize?client_id=${config.oauth.APP_ID}`
             + `&redirect_uri=` + new URL(consts.pages.OAUTH_CALLBACK_PAGE, window.location)
-            + `&response_type=token&state=none&scope=${config.oauth.REQUESTED_SCOPES}`
+            + `&response_type=code&state=none&scope=${config.oauth.REQUESTED_SCOPES}`
             + '&' + Math.floor(Math.random() * 10000)
             , config.gitlab_server
         );
@@ -138,7 +138,7 @@ if (process.env.VUE_APP_DOCHUB_MODE !== "plugin") {
             path: '/sso/gitlab/authentication',
             redirect(route) {
                 const accessToken = Object.keys(route.query).length
-                    ? route.query.access_token
+                    ? route.query.access_token || route.query.code
                     : new URLSearchParams(route.hash.substr(1)).get('access_token');
                 if (accessToken) {
                     window.Vuex.dispatch('onReceivedOAuthToken', accessToken);