From 22b3d45f29b17e8f40ada5c19734152e6d21c5fd Mon Sep 17 00:00:00 2001
From: nicrausaz <n.crausaz99@gmail.com>
Date: Tue, 25 Jun 2019 16:12:19 +0200
Subject: [PATCH] Prod v.1
---
canapGEST/API/app/Http/Controllers/AuthController.php | 5 +++--
canapGEST/Site/src/plugins/axios.js | 2 +-
canapGEST/Site/src/store/modules/user/actions.js | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/canapGEST/API/app/Http/Controllers/AuthController.php b/canapGEST/API/app/Http/Controllers/AuthController.php
index c6413c1..b54913f 100644
--- a/canapGEST/API/app/Http/Controllers/AuthController.php
+++ b/canapGEST/API/app/Http/Controllers/AuthController.php
@@ -40,7 +40,8 @@ class AuthController extends Controller
public function login()
{
- // TODO: Limit group access
+ // TODO: Limit group access to canap-gest-users
+
$oClient = new TequilaClient("https://tequila.epfl.ch/cgi-bin/tequila/");
$oClient->setParam(
array(
@@ -74,7 +75,7 @@ class AuthController extends Controller
public function tequilareturn()
{
// return redirect()->to("https://canap-gest-dev.local:8080/#/?key=" . $_GET["key"]);
- return redirect()->to("https://canap-gest:8443/#/?key=" . $_GET["key"]);
+ return redirect()->to("https://canap-gest.epfl.ch/#/?key=" . $_GET["key"]);
}
public function logout()
diff --git a/canapGEST/Site/src/plugins/axios.js b/canapGEST/Site/src/plugins/axios.js
index 85451d9..92c3b23 100644
--- a/canapGEST/Site/src/plugins/axios.js
+++ b/canapGEST/Site/src/plugins/axios.js
@@ -4,7 +4,7 @@ import router from '@/router/index.js'
const instance = axios.create({
headers: { 'Authorization': "Bearer " + localStorage.getItem('stored_token') },
- baseURL: 'https://canap-gest.epfl.ch:8443/api'
+ baseURL: 'https://canap-gest.epfl.ch/api'
})
instance.interceptors.response.use(function (response) {
diff --git a/canapGEST/Site/src/store/modules/user/actions.js b/canapGEST/Site/src/store/modules/user/actions.js
index fecd825..b44d0bd 100644
--- a/canapGEST/Site/src/store/modules/user/actions.js
+++ b/canapGEST/Site/src/store/modules/user/actions.js
@@ -8,7 +8,7 @@ export function login (context, key) {
})
}
else {
- window.location.href = "https://canap-gest.epfl.ch:8443/api/auth/login"
+ window.location.href = "https://canap-gest.epfl.ch/api/auth/login"
}
}
--
GitLab