Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMPROVE] Remove Oauth and add link to open.rocket.chat #10

Merged
merged 1 commit into from
Jul 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 4 additions & 144 deletions app/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useState } from "react";
import { fetchAPI } from "../lib/api";
import {
Button,
Expand All @@ -14,7 +14,6 @@ import Countup from "../components/common/Countup";
import { Trans, useTranslation } from "react-i18next";
import "slick-carousel/slick/slick.css";
import "slick-carousel/slick/slick-theme.css";
import Cookies from "js-cookie";

const Icon = (props) => {
const { iconName, size, color, className } = props;
Expand All @@ -35,102 +34,8 @@ export default function Home({
oauth,
}) {
const [searchCategory, setSearchCategory] = useState("");
let [loggedIn, setLoggedIn] = useState(true);
let [user, setUser] = useState({
name: "",
email: "",
avatarUrl: "",
});
const { t } = useTranslation();

useEffect(() => {
window.cookieStore.onchange = () => {
checkAuth();
};
checkAuth();
}, []);

var loginWindow;

useEffect(() => {
console.log(loginWindow);
console.log(loggedIn);
}, [loggedIn]);

let login = () => {
loginWindow = window.open(
`${oauth.link}`,
"",
"width=600,height=550,left=100"
);
let count = 0;
let interval = setInterval(() => {
count++;
if (count > 600 || (Cookies.get("rc_token") && Cookies.get("rc_uid"))) {
loginWindow.close();
clearInterval(interval);
}
}, 500);
};
const logout = () => {
fetch("https://open.rocket.chat/api/v1/logout", {
headers: {
"X-Auth-Token": Cookies.get("rc_token"),
"X-User-Id": Cookies.get("rc_uid"),
"Content-Type": "application/json",
},
method: "POST",
})
.then((response) => response.json())
.then((data) => {
if (data.status === "success") {
setLoggedIn(false);
Cookies.remove("rc_uid");
Cookies.remove("rc_token");
}
})
.catch((err) => {
console.log("Error", err);
});
};

const checkAuth = () => {
const uid = Cookies.get("rc_uid");
const token = Cookies.get("rc_token");
if (uid && token) {
getUser();
} else {
setLoggedIn(false);
}
};

const getUser = () => {
fetch("https://open.rocket.chat/api/v1/me", {
headers: {
"X-Auth-Token": Cookies.get("rc_token"),
"X-User-Id": Cookies.get("rc_uid"),
"Content-Type": "application/json",
},
method: "GET",
})
.then((response) => response.json())
.then((data) => {
const userResponse = {
name: data.name,
email: data.emails[0].address,
avatarUrl: data.avatarUrl,
};
setUser(userResponse);
setLoggedIn(true);
})
.catch((err) => {
console.log("Error", err);
setLoggedIn(false);
Cookies.remove("rc_uid");
Cookies.remove("rc_token");
});
};

const activityItems = [
{
title:
Expand Down Expand Up @@ -192,19 +97,6 @@ export default function Home({
setSearchCategory(event.target.value);
};

const showDropdown = () => {
const dropdown = document.querySelector(".profile-dropdown-container");
dropdown.classList.add("open");
const avatar = document.querySelector(".avatar");
avatar.classList.add("avatar-highlight");
};
const hideDropdown = () => {
const dropdown = document.querySelector(".profile-dropdown-container");
dropdown.classList.remove("open");
const avatar = document.querySelector(".avatar");
avatar.classList.remove("avatar-highlight");
};

return (
<div className="home-wrapper">
<header className="unsigned-home-header">
Expand Down Expand Up @@ -248,41 +140,9 @@ export default function Home({
);
})}
</ul>
{!loggedIn && (
<div className="login-button" onClick={login}>
Login / Register
</div>
)}
{loggedIn && (
<>
<img
src={user.avatarUrl}
className="avatar"
onClick={showDropdown}
alt={user.name}
></img>
<div className="profile-dropdown-container">
<div
className="profile-dropdown-blocker"
onClick={hideDropdown}
></div>
<div className="profile-dropdown">
<img
src={user.avatarUrl}
className="avatar-large"
onClick={showDropdown}
alt={user.name}
></img>
<p className="user-name">{user.name}</p>
<p className="user-email">{user.email}</p>
<div className="divider"></div>
<div className="profile-dropdown-option" onClick={logout}>
Logout
</div>
</div>
</div>
</>
)}
<a href="https://open.rocket.chat" target="_blank" className="login-button">
Chat Now
</a>
</div>
</div>
<h1 className="unsigned-home-heading">
Expand Down
28 changes: 0 additions & 28 deletions cms/api/oauth-link/config/routes.json

This file was deleted.

8 changes: 0 additions & 8 deletions cms/api/oauth-link/controllers/oauth-link.js

This file was deleted.

8 changes: 0 additions & 8 deletions cms/api/oauth-link/models/oauth-link.js

This file was deleted.

18 changes: 0 additions & 18 deletions cms/api/oauth-link/models/oauth-link.settings.json

This file was deleted.

8 changes: 0 additions & 8 deletions cms/api/oauth-link/services/oauth-link.js

This file was deleted.