testing redirect

Author: avacore1337

.env.example

@@ -2,4 +2,7 @@ DATABASE_URL=postgres://queuesystem:queuesystem@localhost/queuesystem
 ROCKET_ADDRESS=localhost
 ROCKET_PORT=8000
 SECRET_KEY=8Xui8SN4mI+7egV/9dlfYYLGQJeEx4+DwmSQLwDVXJg=
+APPLICATION_ID=some_id_ask_IT
+CLIENT_SECRET=some_secret_ask_IT
+
 

devops/https-nginx.conf

@@ -16,7 +16,7 @@ http {
     server {
         server_name queue.csc.kth.se;
 
-        location ~ ^/(api/|auth) {
+        location ~ ^/(api/|auth|login) {
             proxy_pass http://localhost:8000;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;

public/src/pages/Help/Guests/index.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { useSelector } from 'react-redux'
 import { Link } from 'react-router-dom';
-import { LOGIN_CALLBACK } from '../../../configuration';
 import { GlobalStore } from '../../../store';
 import User from '../../../models/User';
 
@@ -19,7 +18,7 @@ export default (): JSX.Element | null => {
 
           <p>
             If you only want to view a queue, that's cool,
-            but to be able to join a queue, you will need to <span onClick={() => localStorage.setItem('LastVisitedUrl', window.location.pathname)}><a href={`https://login.kth.se/login?service=${LOGIN_CALLBACK}`}>log in</a></span>.
+            but to be able to join a queue, you will need to <span onClick={() => localStorage.setItem('LastVisitedUrl', window.location.pathname)}><a href={`https://queue.csc.kth.se/login`}>log in</a></span>.
           </p>
 
           <h4>Viewing a queue</h4>

public/src/pages/Queue/EnterQueue/index.tsx

@@ -42,7 +42,7 @@ export default (props: any): JSX.Element | null => {
 
   function login() {
     localStorage.setItem('LastVisitedUrl', window.location.pathname);
-    window.location.href = `https://login.kth.se/login?service=${LOGIN_CALLBACK}`;
+    window.location.href = `https://queue.csc.kth.se/login`;
   }
 
   return (

public/src/viewcomponents/NavBar.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import { Link, useLocation  } from "react-router-dom";
 import { useSelector } from 'react-redux'
 import { GlobalStore } from '../store';
-import { LOGIN_CALLBACK } from '../configuration';
 import User from '../models/User';
 import Logo from '../img/logo-stay-a-while.png';
 
@@ -71,7 +70,7 @@ export default (): JSX.Element => {
             ? <li
                 className={'nav-item' + (location.pathname === '/MockLogin' ? ' active' : '')}
                 onClick={() => localStorage.setItem('LastVisitedUrl', window.location.pathname)}>
-                <a className="nav-link" href={`https://login.kth.se/login?service=${LOGIN_CALLBACK}`}>
+                <a className="nav-link" href={`https://queue.csc.kth.se/login`}>
                   Login
                   {location.pathname === '/MockLogin' ? <span className="sr-only">(current)</span> : null}
                 </a>

src/config.rs

@@ -48,6 +48,8 @@ pub fn from_env() -> Config {
         .expect("PORT environment variable should parse to an integer");
 
     let address = env::var("ROCKET_ADDRESS").unwrap_or_else(|_| "127.0.0.1".to_string());
+    // let application_id = env::var("APPLICATION_ID").unwrap_or_else(|_| "unset".to_string());
+    // let client_secret = env::var("CLIENT_SECRET").unwrap_or_else(|_| "unset".to_string());
 
     let mut database_config = HashMap::new();
     let mut databases = HashMap::new();

src/routes/users.rs

@@ -57,7 +57,7 @@ pub fn post_users_login(
     }
 }
 
-#[get("/users/login2")]
+#[get("/login")]
 pub fn kth_login() -> Redirect {
     Redirect::to("https://login.kth.se/login?service=https://queue.csc.kth.se/auth")
 }