-
+
+
- Sign Up - CTFGuide
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/register.jsx b/src/pages/register.jsx
index 23c701b1..d8492dc4 100644
--- a/src/pages/register.jsx
+++ b/src/pages/register.jsx
@@ -1,36 +1,54 @@
import Head from 'next/head';
import Link from 'next/link';
import { useState, useEffect } from 'react';
-import {
- getAuth,
- createUserWithEmailAndPassword,
- GoogleAuthProvider,
- signInWithPopup,
-} from 'firebase/auth';
-import { app } from '../config/firebaseConfig';
import AuthFooter from '../components/auth/AuthFooter';
-const provider = new GoogleAuthProvider();
-
import { ToastContainer, toast } from 'react-toastify';
+import { OnboardingFlow } from '@/components/onboarding/OnboardingFlow';
import 'react-toastify/dist/ReactToastify.css';
+import { GoogleLogin } from '@react-oauth/google';
+import { jwtDecode } from 'jwt-decode';
-export default function Register() {
+function Register() {
const [validationMessage, setValidationMessage] = useState('');
const [validationMessage2, setValidationMessage2] = useState('');
-
const [userHasEdited, setUserHasEdited] = useState(false); // New state to track if the user has edited the input
const [password, setPassword] = useState('');
+ const [email, setEmail] = useState('');
const [cpassword, setCPassword] = useState('');
-
const [isLoading, setIsLoading] = useState(false);
+ const [showOnboarding, setShowOnboarding] = useState(false);
+ const [accountType, setAccountType] = useState('EMAIL');
+
+ async function emailExists(emailData) {
+ try {
+ const response = await fetch(
+ `${process.env.NEXT_PUBLIC_API_URL}/account/check-email`,
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: emailData
+ }),
+ }
+ );
+ const data = await response.json();
+ return data.success;
+ } catch (error) {
+ console.error('Error checking email:', error);
+ return false;
+ }
+ }
+
useEffect(() => {
if (!userHasEdited) return; // Don't validate until the user edits the input
-
+
if (password !== cpassword) {
setValidationMessage2('Passwords do not match.');
} else {
if (cpassword !== "") {
- setValidationMessage2('Looks good!');
+ setValidationMessage2('Looks good!');
} else {
setValidationMessage2('');
}
@@ -41,365 +59,293 @@ export default function Register() {
return;
}
// some password safety
- if (password.length < 8) {
- setValidationMessage('Password must be at least 8 characters long.');
- } else if (!/[A-Z]/.test(password)) {
- setValidationMessage('Password must contain at least one uppercase letter.');
- } else if (!/[a-z]/.test(password)) {
- setValidationMessage('Password must contain at least one lowercase letter.');
- } else if (!/[0-9]/.test(password)) {
- setValidationMessage('Password must contain at least one number.');
- } else if (!/[!@#$%^&*(),.?":{}|<>]/.test(password)) {
- setValidationMessage('Password must contain at least one special character.');
- } else {
- setValidationMessage('Looks good!');
- // make message green
-
- }
-
-
+ if (password.length < 8) {
+ setValidationMessage('Password must be at least 8 characters long.');
+ } else if (!/[A-Z]/.test(password)) {
+ setValidationMessage('Password must contain at least one uppercase letter.');
+ } else if (!/[a-z]/.test(password)) {
+ setValidationMessage('Password must contain at least one lowercase letter.');
+ } else if (!/[0-9]/.test(password)) {
+ setValidationMessage('Password must contain at least one number.');
+ } else if (!/[!@#$%^&*(),.?":{}|<>]/.test(password)) {
+ setValidationMessage('Password must contain at least one special character.');
+ } else {
+ setValidationMessage('Looks good!');
+ // make message green
+ }
}, [password, cpassword, userHasEdited]);
- async function loginGoogle() {
- const auth = getAuth();
- signInWithPopup(auth, provider)
- .then((result) => {
- // Fetch ID Token
- result.user.getIdToken().then((idToken) => {
- //console.log("We are making a register");
- // Send token to backend via HTTPS
- var data = new FormData();
- var xhr = new XMLHttpRequest();
- xhr.open('GET', `${process.env.NEXT_PUBLIC_API_URL}/account`);
- xhr.addEventListener('readystatechange', function () {
- if (this.readyState === 4) {
- try {
- var parsed = JSON.parse(this.responseText);
-
- document.cookie = `idToken=${idToken}; SameSite=None; Secure; Path=/`;
- if (!parsed.email) {
- // User hasn't finished onboarding.
- window.location.replace('/onboarding');
- return;
- }
-
- // Store related API endpoints in local storage.
- localStorage.setItem('userLikesUrl', parsed.userLikesUrl);
- localStorage.setItem(
- 'userChallengesUrl',
- parsed.userChallengesUrl
- );
- localStorage.setItem('userBadgesUrl', parsed.userBadgesUrl);
- localStorage.setItem(
- 'notificationsUrl',
- parsed.notificationsUrl
- );
- localStorage.setItem('role', parsed.role);
-
- document.cookie = `idToken=${idToken}; SameSite=None; Secure; Path=/`;
- window.location.replace('/dashboard');
- } catch (error) {
- console.log('Error parsing JSON data:', error);
- }
- }
- });
- xhr.setRequestHeader('Authorization', 'Bearer ' + idToken);
- xhr.send(data);
- });
- })
- .catch((error) => {
- // Handle Errors here.
- const errorCode = error.code;
- const errorMessage = error.message;
-
- const credential = GoogleAuthProvider.credentialFromError(error);
-
- toast.error(errorMessage);
- });
+
+ async function registerUser(e) {
+ setAccountType('EMAIL');
+ e.preventDefault();
+ if(email == "" || password == "" || cpassword == "") {
+ toast.error('Please fill in all fields.');
+ return;
+ }
+ if(password.length < 8) {
+ toast.error('Password must be at least 8 characters long.');
+ return;
+ }
+ if (document.getElementById('password').value !== document.getElementById('cpassword').value) {
+ toast.error('Passwords do not match.');
+ return;
+ }
+ const exists = await emailExists(email);
+ if(!exists) {
+ toast.error('Email already exists.');
+ return;
+ }
+ setShowOnboarding(true);
+ console.log('Registering user...');
}
- async function registerUser() {
- const auth = getAuth();
-
- if (
- document.getElementById('password').value ===
- document.getElementById('cpassword').value
- ) {
- createUserWithEmailAndPassword(
- auth,
- document.getElementById('email-address').value,
- document.getElementById('cpassword').value
- )
- .then((userCredential) => {
- // Signed in
- const user = userCredential.user;
- userCredential.user.getIdToken().then((idToken) => {
-
- document.cookie = `idToken=${idToken}; SameSite=None; Secure; Path=/`;
- var xhr = new XMLHttpRequest();
- xhr.open('GET', `${process.env.NEXT_PUBLIC_API_URL}/account`);
- xhr.addEventListener('readystatechange', function () {
- if (this.readyState === 4) {
- var parsed = JSON.parse(this.responseText);
- document.cookie = `idToken=${idToken}; SameSite=None; Secure; Path=/`;
- window.location.replace('/onboarding');
- }
- });
- xhr.setRequestHeader('Authorization', `Bearer ${idToken}`);
- xhr.send();
- });
- })
- .catch((error) => {
- const errorCode = error.code;
- const errorMessage = error.message;
- // handle each error
- if (errorCode === 'auth/invalid-credential') {
- toast.error('Invalid credentials.');
- }
- if (errorCode === 'auth/invalid-email') {
- toast.error('Invalid email.');
- }
- if (errorCode === 'auth/invalid-password') {
- toast.error('Invalid password.');
- }
-
-
- });
- } else {
- toast.error("Passwords do not match.");
+ async function handleSuccess(data) {
+ console.log("Setting account by google");
+ setAccountType('GOOGLE');
+ const { credential } = data;
+ const decode = jwtDecode(credential);
+ setEmail(decode.email);
+ const exists = await emailExists(decode.email);
+ if(!exists) {
+ toast.error('Email already exists.');
+ return;
}
+ setPassword('');
+ setShowOnboarding(true);
+ }
+
+ async function handleError(data) {
+ console.log(data);
+ toast.error('Account failed to create.');
}
+
return (
<>
-
-
-
-
-
-
+ className=" pb-10 pt-4 px-4 shadow sm:px-10 border-t-4 border-blue-600 bg-neutral-800"
+ >
+
+
-
+
+
+
;
} else if (flowState === '2') {
return ;
}
}
diff --git a/src/components/studio/forking/editor.jsx b/src/components/studio/forking/editor.jsx
index 144196e9..efc37bfe 100644
--- a/src/components/studio/forking/editor.jsx
+++ b/src/components/studio/forking/editor.jsx
@@ -1,19 +1,18 @@
import React from 'react';
import { MarkdownViewer } from '@/components/MarkdownViewer';
import { useState, useEffect } from 'react';
-import request from '@/utils/request';
import { ToastContainer, toast } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.css';
-import { useRouter } from 'next/router';
-import { getAuth } from 'firebase/auth';
+//import { useRouter } from 'next/router';
import fileApi, {getNewFileIds, getFileName, getFile } from '@/utils/file-api';
-const auth = getAuth();
+import request, { getCookie } from '@/utils/request';
+import { jwtDecode } from 'jwt-decode';
const Editor = (props) => {
- const router = useRouter();
+ //const router = useRouter();
const [contentPreview, setContentPreview] = useState('');
const [penalty, setPenalty] = useState([0, 0, 0]);
const [hints, setHints] = useState([
@@ -50,7 +49,11 @@ const Editor = (props) => {
if(!validateNewChallege()) {
return;
}
- const token = await auth.currentUser.accessToken;
+
+ const cookie = getCookie('idToken');
+ const data = jwtDecode(cookie);
+ const token = data.id;
+
setIsCreating(true);
let fileIds = [];
const originalFileIds = existingFiles.filter((file) => file.using).map((file) => file.fileId);
diff --git a/src/config/firebaseConfig.js b/src/config/firebaseConfig.js
deleted file mode 100644
index dc08ecf0..00000000
--- a/src/config/firebaseConfig.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- © CTFGuide Corporation
-*/
-
-import { initializeApp } from 'firebase/app';
-//import { getAnalytics } from "firebase/analytics";
-
-/*
- This code is intended to be public. This is public facing client information.
- It isn't some secret key or anything. It's just a way for our auth service (Firebase) to identify the app.
-*/
-
-//
-const firebaseConfig = {
- apiKey: process.env.NEXT_PUBLIC_APP_API_KEY,
- authDomain: process.env.NEXT_PUBLIC_APP_AUTH_DOMAIN,
- projectId: process.env.NEXT_PUBLIC_APP_PROJECT_ID,
- storageBucket: process.env.NEXT_PUBLIC_APP_STORAGE_BUCKET,
- messagingSenderId: process.env.NEXT_PUBLIC_APP_MESSAGING_SENDER_ID,
- appId: process.env.NEXT_PUBLIC_APP_ID,
- measurmentId: process.env.NEXT_PUBLIC_APP_MEASURMENT_ID,
-};
-
-//console.log(firebaseConfig);
-
-// Initialize Firebase
-// const app = initializeApp(firebaseConfig);
-
-
-// const firebaseConfig = {
-// apiKey: "AIzaSyBLAN84VP3jSA5dqhrU6Bjmfu5NiUDuNw4",
-// authDomain: "cyberjags-8b081.firebaseapp.com",
-// databaseURL: "https://cyberjags-8b081.firebaseio.com",
-// projectId: "cyberjags-8b081",
-// storageBucket: "cyberjags-8b081.appspot.com",
-// messagingSenderId: "166652277588",
-// appId: "1:166652277588:web:e08b9e19916451e14dcec1",
-// measurementId: "G-7ZNKM9VFN2"
-// };
-/**
-const firebaseConfig = {
- apiKey: 'AIzaSyBLAN84VP3jSA5dqhrU6Bjmfu5NiUDuNw4',
- authDomain: 'cyberjags-8b081.firebaseapp.com',
- databaseURL: 'https://cyberjags-8b081.firebaseio.com',
- projectId: 'cyberjags-8b081',
- storageBucket: 'cyberjags-8b081.appspot.com',
- messagingSenderId: '166652277588',
- appId: '1:166652277588:web:e08b9e19916451e14dcec1',
- measurementId: 'G-7ZNKM9VFN2',
-};
-*/
-
-const app = initializeApp(firebaseConfig);
-
-// make a function to check if the cookie exists
-// if it does, then set the auth token to the cookie
-
-// Initialize Firebase
-
-//const analytics = getAnalytics(app);
diff --git a/src/config/jwt.js b/src/config/jwt.js
deleted file mode 100644
index 53ce18f3..00000000
--- a/src/config/jwt.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import '@/config/firebaseConfig';
-
-import { getAuth } from 'firebase/auth';
-const auth = getAuth();
-
-const checkAuthToken = () => {
- const cookies = document.cookie.split(';').map(cookie => cookie.trim().split('=')[0]);
- return cookies.includes('idToken');
-}
-
-const updateAuthToken = async (auth) => {
- try {
-
- if(auth.currentUser && checkAuthToken()) {
- console.log("Generating new token");
- const idToken = await auth.currentUser.getIdToken(true);
- document.cookie = `idToken=${idToken}; SameSite=None; Secure; Path=/`;
- }
-
- } catch(err) {
- console.log(err);
- }
-}
-
-const updateAuthTokenInterval = (auth) => {
- const intervalId = setInterval(() => {
- updateAuthToken(auth);
- }, 10 * 60 * 1000);
- return () => {
- clearInterval(intervalId);
- };
-}
-
-updateAuthTokenInterval(auth);
diff --git a/src/config/lessonConfigs.js b/src/config/lessonConfigs.js
index 1ea61115..91637387 100644
--- a/src/config/lessonConfigs.js
+++ b/src/config/lessonConfigs.js
@@ -12,4 +12,4 @@ const configArray = [{
"navTitles": ["What is Linux?", "Command Basics", "Mastery Task", "Logging into a server"]
}];
-export default configArray;
\ No newline at end of file
+export default configArray;
diff --git a/src/middleware.js b/src/middleware.js
index a112a212..25c626d3 100644
--- a/src/middleware.js
+++ b/src/middleware.js
@@ -15,8 +15,6 @@ export function middleware(req) {
// ensure token is valid
// basic request to server to ensure that the token is valid
-
-
if (!idToken) {
const url = req.nextUrl.clone();
url.pathname = '/login';
diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx
index b3f0b0c2..23780823 100644
--- a/src/pages/_app.jsx
+++ b/src/pages/_app.jsx
@@ -1,8 +1,10 @@
import 'focus-visible';
import '@/styles/tailwind.css';
import '@tremor/react/dist/esm/tremor.css';
-import '@/config/jwt';
+import { GoogleOAuthProvider } from '@react-oauth/google';
export default function App({ Component, pageProps }) {
- return
+
}
diff --git a/src/pages/create/new.jsx b/src/pages/create/new.jsx
index 2234b93a..a48cd8c8 100644
--- a/src/pages/create/new.jsx
+++ b/src/pages/create/new.jsx
@@ -6,7 +6,8 @@ import { MarkdownViewer } from '@/components/MarkdownViewer';
import fileApi from '@/utils/file-api';
import { ToastContainer, toast } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.css';
-import request from '@/utils/request';
+import request, { getCookie } from '@/utils/request';
+import { jwtDecode } from 'jwt-decode';
const pages = [
{ name: 'Creator Dashboard', href: '../create', current: false },
@@ -17,9 +18,6 @@ const pages = [
},
];
-import { getAuth } from 'firebase/auth';
-const auth = getAuth();
-
const styles = {
h1: { fontSize: '2.4rem' },
h2: { fontSize: '2rem' },
@@ -68,7 +66,10 @@ export default function Createchall() {
await uploadChallenge('');
return;
} else {
- const token = await auth.currentUser.accessToken;
+ const cookie = getCookie('idToken');
+ const data = jwtDecode(cookie);
+
+ const token = data.id;
const fileId = await fileApi(token, selectedFile);
if(fileId !== null) {
await uploadChallenge(fileId);
diff --git a/src/pages/login.jsx b/src/pages/login.jsx
index 6f241a8e..9137dc99 100644
--- a/src/pages/login.jsx
+++ b/src/pages/login.jsx
@@ -1,262 +1,71 @@
import Head from 'next/head';
import Link from 'next/link';
-import { Button } from '@/components/Button';
-import { TextField } from '@/components/Fields';
-import { Logo } from '@/components/Logo';
-import { Alert } from '@/components/Alert';
-import { useState, useEffect } from 'react';
-import { app } from '../config/firebaseConfig';
+import { useState } from 'react';
import router from 'next/router';
-import {
- getAuth,
- onAuthStateChanged,
- signInWithEmailAndPassword,
- GoogleAuthProvider,
- OAuthProvider,
- signInWithPopup,
-} from 'firebase/auth';
-
import { ToastContainer, toast } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.css';
import AuthFooter from '@/components/auth/AuthFooter';
-
-const provider = new GoogleAuthProvider();
-
+import { GoogleLogin } from '@react-oauth/google';
+import { jwtDecode } from 'jwt-decode';
export default function Login() {
- const auth = getAuth();
- const [session, setSession] = useState();
- const [logoutUrl, setLogoutUrl] = useState();
const [isLoading, setIsLoading] = useState(false);
+ const [email, setEmail] = useState('');
+ const [password, setPassword] = useState('');
- useEffect(() => {
- onAuthStateChanged(auth, (user) => {
- // removing the cookie
- document.cookie = "idToken=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
- });
- }, []);
-
- async function loginUser() {
- const email = document.getElementById('username').value;
- const password = document.getElementById('password').value;
-
+ async function handleLoginRequest(requestOptions) {
setIsLoading(true);
-
- signInWithEmailAndPassword(auth, email, password)
- .then((userCredential) => {
- // Fetch ID Token
- userCredential.user.getIdToken().then((idToken) => {
-
- // Send token to backend via HTTPS
- var data = new FormData();
- var xhr = new XMLHttpRequest();
-
- document.cookie = `idToken=${idToken}; SameSite=None; Secure; Path=/`;
-
- xhr.open('GET', `${process.env.NEXT_PUBLIC_API_URL}/account`);
- xhr.addEventListener('readystatechange', function () {
- if (this.readyState === 4) {
- var parsed = JSON.parse(this.responseText);
-
- // Sotre username
- localStorage.setItem('username', parsed.username);
-
- if (!parsed.email) {
- window.location.replace('/onboarding');
- return;
- }
-
- // Store related API endpoints in local storage.
- localStorage.setItem('userLikesUrl', parsed.userLikesUrl);
- localStorage.setItem(
- 'userChallengesUrl',
- parsed.userChallengesUrl
- );
-
- localStorage.setItem('userBadgesUrl', parsed.userBadgesUrl);
- localStorage.setItem('notificationsUrl', parsed.notificationsUrl);
- localStorage.setItem('role', parsed.role);
-
- localStorage.setItem('username', parsed.username);
-
- router.push('/dashboard');
- }
- });
- xhr.setRequestHeader('Authorization', 'Bearer ' + idToken);
- xhr.send(data);
- });
- })
- .catch((error) => {
- setIsLoading(false);
- const errorCode = error.code;
- const errorMessage = error.message;
-
- let userFriendlyMessage;
- switch (errorCode) {
- case 'auth/user-not-found':
- userFriendlyMessage = 'No user found with this email.';
- break;
- case 'auth/wrong-password':
- userFriendlyMessage = 'Incorrect password. Please try again.';
- break;
- case 'auth/too-many-requests':
- userFriendlyMessage = 'Too many attempts. Please try again later.';
- break;
- default:
- userFriendlyMessage = 'An error occurred. Please try again.';
- }
- toast.error(userFriendlyMessage);
-
- });
+ try {
+ const response = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/account/login`, requestOptions);
+ let data = await response.json();
+ let { success, token, body } = data;
+ if (success) {
+ document.cookie = `idToken=${token}; SameSite=None; Secure; Path=/`;
+
+ localStorage.setItem('username', body.username);
+ localStorage.setItem('firstname', body.firstName);
+ localStorage.setItem('lastname', body.lastName);
+ localStorage.setItem('birthday', body.birthday);
+
+ router.push('/dashboard');
+ } else {
+ toast.error(data.message);
+ }
+ } catch(error) {
+ console.log(error);
+ }
+ setIsLoading(false);
}
- async function loginGoogle() {
- const auth = getAuth();
- signInWithPopup(auth, provider)
- .then((result) => {
- // Fetch ID Token
- result.user.getIdToken().then((idToken) => {
-
- // Send token to backend via HTTPS
- document.cookie = `idToken=${idToken}; SameSite=None; Secure; Path=/`;
-
- var data = new FormData();
- var xhr = new XMLHttpRequest();
-
- xhr.open('GET', `${process.env.NEXT_PUBLIC_API_URL}/account`);
- xhr.addEventListener('readystatechange', function () {
- if (this.readyState === 4) {
- try {
- var parsed = JSON.parse(this.responseText);
-
- if (!parsed.email) {
- // User hasn't finished onboarding.
- window.location.replace('/onboarding');
- return;
- }
-
- // Store related API endpoints in local storage.
- localStorage.setItem('userLikesUrl', parsed.userLikesUrl);
- localStorage.setItem(
- 'userChallengesUrl',
- parsed.userChallengesUrl
- );
- localStorage.setItem('userBadgesUrl', parsed.userBadgesUrl);
- localStorage.setItem(
- 'notificationsUrl',
- parsed.notificationsUrl
- );
-
- localStorage.setItem('role', parsed.role);
- localStorage.setItem('username', parsed.username);
-
- // addthing the token to cookies
-
- router.push('/dashboard');
-
- } catch (error) {
- console.log('Error parsing JSON data:', error);
- }
- }
- });
- xhr.setRequestHeader('Authorization', 'Bearer ' + idToken);
- xhr.send(data);
- });
- })
- .catch((error) => {
- // Handle Errors here.
- const errorCode = error.code;
- const errorMessage = error.message;
-
- const credential = GoogleAuthProvider.credentialFromError(error);
- // basic cleaned errormeSSAGE to send back
-
- let userFriendlyMessage;
- switch (errorCode) {
- case 'auth/user-not-found':
- userFriendlyMessage = 'No user found with this email.';
- break;
- case 'auth/wrong-password':
- userFriendlyMessage = 'Incorrect password. Please try again.';
- break;
- case 'auth/too-many-requests':
- userFriendlyMessage = 'Too many attempts. Please try again later.';
- break;
- default:
- userFriendlyMessage = 'An error occurred. Please try again.';
- }
- toast.error(userFriendlyMessage);
-
- });
+ const handleLogin = async (e) => {
+ e.preventDefault();
+ const requestOptions = {
+ method: 'POST',
+ body: JSON.stringify({ email, password, accountType: 'EMAIL'}),
+ headers: { 'Content-Type': 'application/json' }
+ };
+ await handleLoginRequest(requestOptions);
}
- const loginMicrosoft = () => {
- // Microsoft login logic here
- const provider2 = new OAuthProvider('microsoft.com');
- signInWithPopup(auth, provider2)
- .then((result) => {
- result.user.getIdToken().then((idToken) => {
-
- // Send token to backend via HTTPS
- document.cookie = `idToken=${idToken}; SameSite=None; Secure; Path=/`;
-
- var data = new FormData();
- var xhr = new XMLHttpRequest();
-
- xhr.open('GET', `${process.env.NEXT_PUBLIC_API_URL}/account`);
- xhr.addEventListener('readystatechange', function () {
- if (this.readyState === 4) {
- try {
- var parsed = JSON.parse(this.responseText);
-
- if (!parsed.email) {
- // User hasn't finished onboarding.
- window.location.replace('/onboarding');
- return;
- }
-
- // Store related API endpoints in local storage.
- localStorage.setItem('userLikesUrl', parsed.userLikesUrl);
- localStorage.setItem(
- 'userChallengesUrl',
- parsed.userChallengesUrl
- );
- localStorage.setItem('userBadgesUrl', parsed.userBadgesUrl);
- localStorage.setItem(
- 'notificationsUrl',
- parsed.notificationsUrl
- );
-
- localStorage.setItem('role', parsed.role);
- localStorage.setItem('username', parsed.username);
-
- // addthing the token to cookies
-
- router.push('/dashboard');
+ // do the same for google auth login
+ async function handleSuccess(data) {
+ console.log("Setting account by google");
+ const { credential } = data;
+ const decode = jwtDecode(credential);
+ const { email } = decode;
+ const requestOptions = {
+ method: 'POST',
+ body: JSON.stringify({ email, password: null, accountType: 'GOOGLE'}),
+ headers: { 'Content-Type': 'application/json' }
+ };
+ await handleLoginRequest(requestOptions);
+ }
- } catch (error) {
- console.log('Error parsing JSON data:', error);
- }
- }
- });
- xhr.setRequestHeader('Authorization', 'Bearer ' + idToken);
- xhr.send(data);
- });
- }).catch((error) => {
- // Handle Errors here.
- console.log(error)
- const errorCode = error.code;
- const errorMessage = error.message;
- // The email of the user's account used.
- const email = error.email;
- // The MicrosoftAuthProvider credential to access the Microsoft API.
- const credential = error.credential;
- // Display error message
- document.getElementById('error').classList.remove('hidden');
- document.getElementById('errorMessage').innerHTML = errorMessage;
- });
- };
+ async function handleError(data) {
+ console.log(data);
+ toast.error('Google login failed. Please try again later.');
+ }
return (
<>
@@ -277,6 +86,8 @@ export default function Login() {
style={{ fontFamily: 'Poppins, sans-serif' }}
className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8 animate__animated animate__fadeIn "
>
+
+ {' '} + Finish creating your account +
-
-
-
-
- {' '} - Finish creating your account -
-
+ adow-sm">
-
+
{
- setUsername(e.target.value);
- if (!userHasEdited) setUserHasEdited(true); // Set to true on first edit
- }}
- className="bg-neutral-900 mt-2 block w-full rounded border-0 p-0 py-1 px-4 text-white placeholder-gray-500 focus:ring-0 sm:text-sm"
- placeholder="This is what people on CTFGuide will know you as."
- />
- {userHasEdited && validationMessage && (
-
- {validationMessage}
-
- )}
+ type="text"
+ name="name"
+ id="username"
+ value={username}
+ onChange={(e) => {
+ setUsername(e.target.value);
+ if (!userHasEdited) setUserHasEdited(true); // Set to true on first edit
+ }}
+ className="bg-neutral-900 mt-2 block w-full rounded border-0 p-0 py-1 px-4 text-white placeholder-gray-500 focus:ring-0 sm:text-sm"
+ placeholder="This is what people on CTFGuide will know you as."
+ />
+ {userHasEdited && validationMessage && (
+
+ {validationMessage}
+
+ )}
@@ -319,13 +281,13 @@ export function DataAsk({ props }) {
submitData();
}}
className="flex w-full justify-center rounded-sm border border-transparent bg-blue-700 hover:bg-blue-700/90 py-2 px-4 text-sm font-medium text-white shadow-sm hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2"
- >
+ >
{
isLoading ? (
) : (
- Start Hacking
- )
+ Start Hacking
+ )
}
@@ -336,8 +298,8 @@ export function DataAsk({ props }) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-