Merge pull request #179 from RabotaRu/gl-redirect

Добавлен переход на текущую страницу после авторизации в GitLab
DocHubTeam · Feb 11, 2023 · 0c24fcd · 0c24fcd
2 parents 35751c0 + af50252
commit 0c24fcd
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/src/components/sso/SSOError.vue b/src/components/sso/SSOError.vue
@@ -0,0 +1,24 @@
+<template>
+  <div style="padding: 36px">
+    <v-alert
+      style="height:auto"
+      dense
+      type="error">
+      Не удалось получить доступ к GitLab :(
+    </v-alert>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    name: 'SSOError',
+    data() {
+      return {
+      };
+    }
+  };
+</script>
+
+<style scoped>
+</style>
diff --git a/src/router/index.js b/src/router/index.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import Router from 'vue-router';
+import cookie from 'vue-cookie';
 
 import gateway from '../idea/gateway';
 import appRoutes from './routes';
@@ -36,7 +37,8 @@ if (!env.isPlugin(Plugins.idea)) {
 					: new URLSearchParams(route.hash.substr(1)).get('code');
 				if (OAuthCode) {
 					window.Vuex.dispatch('onReceivedOAuthCode', OAuthCode);
-					return {
+					const rRoute = cookie.get('return-route');
+					return rRoute ? JSON.parse(rRoute) : {
 						path: '/main',
 						query: {},
 						hash: ''

diff --git a/src/router/routes.js b/src/router/routes.js
@@ -13,10 +13,17 @@ import AspectsMindmap from '../components/Mindmap/AspectsMindmap';
 import Empty from '../components/Controls/Empty';
 import DevTool from '../components/JSONata/DevTool';
 import Entity from '../components/Entities/Entity';
+import SSOError from '../components/sso/SSOError';
+import cookie from 'vue-cookie';
 
 const middleware = (route) => {
 	if (config.oauth !== false && !window.Vuex.state.isOAuthProcess && !window.Vuex.state.access_token) {
-		window.location = new URL(
+      cookie.set('return-route', JSON.stringify({
+        path: route.path,
+        query: route.query,
+        hash: route.hash
+      }), 1);
+      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=code&state=none&scope=${config.oauth.REQUESTED_SCOPES}`
@@ -118,6 +125,11 @@ const routes = [
     path: '/',
     redirect: { name: 'main' }
   },
+  {
+    name: 'ssoerror',
+    path: '/sso/error',
+    component: SSOError
+  },
   {
     name: 'Empty',
     path: '*',