github
/
developer-roadmap
mirror of https://github.com/kamranahmedse/developer-roadmap.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use http wrapper instead of fetch

Browse Source
pull/3813/head
Kamran Ahmed 2 years ago
parent 0da417735e
commit a544cfea8d
6 changed files with 149 additions and 185 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      src/components/AuthenticationFlow/EmailLoginForm.tsx
  2. 60
      src/components/AuthenticationFlow/GitHubButton.tsx
  3. 49
      src/components/AuthenticationFlow/GoogleButton.tsx
  4. 28
      src/components/AuthenticationFlow/TriggerVerifyAccount.tsx
  5. 29
      src/components/AuthenticationFlow/VerificationEmailMessage.tsx
  6. 18
      src/hooks/use-auth.ts

48
src/components/AuthenticationFlow/EmailLoginForm.tsx
Unescape View File

@ -2,7 +2,7 @@ import Cookies from 'js-cookie';
import type { FunctionComponent } from 'preact';
import { useState } from 'preact/hooks';
import { httpPost } from '../../lib/http';
import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
const EmailLoginForm: FunctionComponent<{}> = () => {
const [email, setEmail] = useState<string>('');
@ -16,44 +16,32 @@ const EmailLoginForm: FunctionComponent<{}> = () => {
setIsLoading(true);
setError('');
fetch(`${import.meta.env.PUBLIC_API_URL}/v1-login`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
const { response, error } = await httpPost<{ token: string }>(
`${import.meta.env.PUBLIC_API_URL}/v1-login`,
{
email,
password,
}),
})
.then((res) => res.json())
.then((data) => {
if (data.type === 'user_not_verified') {
window.location.href = `/verification-pending?email=${encodeURIComponent(
email
)}`;
}
);
// Log the user in and reload the page
if (response?.token) {
Cookies.set(TOKEN_COOKIE_NAME, response.token);
window.location.reload();
return;
}
if (!data.token) {
setIsLoading(false);
setError(
data.message || 'Something went wrong. Please try again later.'
);
// @todo use proper types
if ((error as any).type === 'user_not_verified') {
window.location.href = `/verification-pending?email=${encodeURIComponent(
email
)}`;
return;
}
// If the response is ok, we'll set the token in a cookie
Cookies.set(TOKEN_COOKIE_NAME, data.token);
// Refreshing will automatically redirect to the relevant page
// Doing this to avoid redirecting to home page from any pages
// such as roadmap, best-practice etc
window.location.reload();
})
.catch((err) => {
setIsLoading(false);
setError('Something went wrong. Please try again later.');
});
setError(error?.message || 'Something went wrong. Please try again later.');
};
return (

60
src/components/AuthenticationFlow/GitHubButton.tsx
Unescape View File

@ -4,6 +4,7 @@ import GitHubIcon from '../../icons/github.svg';
import SpinnerIcon from '../../icons/spinner.svg';
import Cookies from 'js-cookie';
import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
import { httpGet } from '../../lib/http';
type GitHubButtonProps = {};
@ -26,21 +27,20 @@ export function GitHubButton(props: GitHubButtonProps) {
}
setIsLoading(true);
fetch(
httpGet<{ token: string }>(
`${import.meta.env.PUBLIC_API_URL}/v1-github-callback${
window.location.search
}`,
{
method: 'GET',
credentials: 'include',
}
}`
)
.then((res) => res.json())
.then((data: any) => {
if (!data.token) {
setError('Something went wrong. Please try again later.');
.then(({ response, error }) => {
if (!response?.token) {
const errMessage = error?.message || 'Something went wrong.';
setError(errMessage);
setIsLoading(false);
} else {
return;
}
let redirectUrl = '/';
const gitHubRedirectAt = localStorage.getItem(GITHUB_REDIRECT_AT);
const lastPageBeforeGithub = localStorage.getItem(GITHUB_LAST_PAGE);
@ -59,9 +59,8 @@ export function GitHubButton(props: GitHubButtonProps) {
localStorage.removeItem(GITHUB_REDIRECT_AT);
localStorage.removeItem(GITHUB_LAST_PAGE);
Cookies.set(TOKEN_COOKIE_NAME, data.token);
Cookies.set(TOKEN_COOKIE_NAME, response.token);
window.location.href = redirectUrl;
}
})
.catch((err) => {
setError('Something went wrong. Please try again later.');
@ -69,16 +68,22 @@ export function GitHubButton(props: GitHubButtonProps) {
});
}, []);
const handleClick = () => {
const handleClick = async () => {
setIsLoading(true);
fetch(`${import.meta.env.PUBLIC_API_URL}/v1-github-login`, {
credentials: 'include',
redirect: 'follow',
})
.then((res) => res.json())
.then((data: any) => {
// @todo proper typing for API response
if (data.loginUrl) {
const { response, error } = await httpGet<{ loginUrl: string }>(
`${import.meta.env.PUBLIC_API_URL}/v1-github-login`
);
if (error || !response?.loginUrl) {
setError(
error?.message || 'Something went wrong. Please try again later.'
);
setIsLoading(false);
return;
}
// For non authentication pages, we want to redirect back to the page
// the user was on before they clicked the social login button
if (!['/login', '/signup'].includes(window.location.pathname)) {
@ -86,16 +91,7 @@ export function GitHubButton(props: GitHubButtonProps) {
localStorage.setItem(GITHUB_LAST_PAGE, window.location.pathname);
}
window.location.href = data.loginUrl;
} else {
setError('Something went wrong. Please try again later.');
setIsLoading(false);
}
})
.catch((err) => {
setError('Something went wrong. Please try again later.');
setIsLoading(false);
});
window.location.href = response.loginUrl;
};
return (

49
src/components/AuthenticationFlow/GoogleButton.tsx
Unescape View File

@ -3,6 +3,7 @@ import Cookies from 'js-cookie';
import GoogleIcon from '../../icons/google.svg';
import SpinnerIcon from '../../icons/spinner.svg';
import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
import { httpGet } from '../../lib/http';
type GoogleButtonProps = {};
@ -25,21 +26,19 @@ export function GoogleButton(props: GoogleButtonProps) {
}
setIsLoading(true);
fetch(
httpGet<{ token: string }>(
`${import.meta.env.PUBLIC_API_URL}/v1-google-callback${
window.location.search
}`,
{
method: 'GET',
credentials: 'include',
}
}`
)
.then((res) => res.json())
.then((data: any) => {
if (!data.token) {
setError('Something went wrong. Please try again later.');
.then(({ response, error }) => {
if (!response?.token) {
setError(error?.message || 'Something went wrong.');
setIsLoading(false);
} else {
return;
}
let redirectUrl = '/';
const googleRedirectAt = localStorage.getItem(GOOGLE_REDIRECT_AT);
const lastPageBeforeGoogle = localStorage.getItem(GOOGLE_LAST_PAGE);
@ -58,9 +57,8 @@ export function GoogleButton(props: GoogleButtonProps) {
localStorage.removeItem(GOOGLE_REDIRECT_AT);
localStorage.removeItem(GOOGLE_LAST_PAGE);
Cookies.set(TOKEN_COOKIE_NAME, data.token);
Cookies.set(TOKEN_COOKIE_NAME, response.token);
window.location.href = redirectUrl;
}
})
.catch((err) => {
setError('Something went wrong. Please try again later.');
@ -70,14 +68,17 @@ export function GoogleButton(props: GoogleButtonProps) {
const handleClick = () => {
setIsLoading(true);
fetch(`${import.meta.env.PUBLIC_API_URL}/v1-google-login`, {
credentials: 'include',
redirect: 'follow',
})
.then((res) => res.json())
.then((data: any) => {
// @todo proper typing for API response
if (data.loginUrl) {
httpGet<{ loginUrl: string }>(
`${import.meta.env.PUBLIC_API_URL}/v1-google-login`
)
.then(({ response, error }) => {
if (!response?.loginUrl) {
setError(error?.message || 'Something went wrong.');
setIsLoading(false);
return;
}
// For non authentication pages, we want to redirect back to the page
// the user was on before they clicked the social login button
if (!['/login', '/signup'].includes(window.location.pathname)) {
@ -85,11 +86,7 @@ export function GoogleButton(props: GoogleButtonProps) {
localStorage.setItem(GOOGLE_LAST_PAGE, window.location.pathname);
}
window.location.href = data.loginUrl;
} else {
setError('Something went wrong. Please try again later.');
setIsLoading(false);
}
window.location.href = response.loginUrl;
})
.catch((err) => {
setError('Something went wrong. Please try again later.');

28
src/components/AuthenticationFlow/TriggerVerifyAccount.tsx
Unescape View File

@ -3,7 +3,8 @@ import ErrorIcon from '../../icons/error.svg';
import { useEffect, useState } from 'preact/hooks';
import Cookies from 'js-cookie';
import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
import { httpPost } from '../../lib/http';
export function TriggerVerifyAccount() {
const [isLoading, setIsLoading] = useState(true);
@ -12,22 +13,21 @@ export function TriggerVerifyAccount() {
const triggerVerify = (code: string) => {
setIsLoading(true);
fetch(`${import.meta.env.PUBLIC_API_URL}/v1-verify-account`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
httpPost<{ token: string }>(
`${import.meta.env.PUBLIC_API_URL}/v1-verify-account`,
{
code,
}),
})
.then((res) => res.json())
.then((data: any) => {
if (!data.token) {
throw new Error('Something went wrong. Please try again..');
}
)
.then(({ response, error }) => {
if (!response?.token) {
setError(error?.message || 'Something went wrong. Please try again.');
setIsLoading(false);
return;
}
Cookies.set(TOKEN_COOKIE_NAME, data.token);
Cookies.set(TOKEN_COOKIE_NAME, response.token);
window.location.href = '/';
})
.catch((err) => {

29
src/components/AuthenticationFlow/VerificationEmailMessage.tsx
Unescape View File

@ -1,5 +1,6 @@
import VerifyLetterIcon from '../../icons/verify-letter.svg';
import { useEffect, useState } from 'preact/hooks';
import { httpPost } from '../../lib/http';
export function VerificationEmailMessage() {
const [email, setEmail] = useState('..');
@ -14,18 +15,15 @@ export function VerificationEmailMessage() {
}, []);
const resendVerificationEmail = () => {
fetch(`${import.meta.env.PUBLIC_API_URL}/v1-send-verification-email`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
httpPost(`${import.meta.env.PUBLIC_API_URL}/v1-send-verification-email`, {
email,
}),
})
.then((res) => {
if (!res.ok) {
throw new Error('Something went wrong. Please try again later.');
.then(({ response, error }) => {
if (error) {
setIsEmailResent(false);
setError(error?.message || 'Something went wrong.');
setIsLoading(false);
return;
}
setIsEmailResent(true);
@ -49,9 +47,10 @@ export function VerificationEmailMessage() {
</h2>
<div class="text-sm sm:text-base">
<p>
We have sent you an email at <span className="font-bold">{email}</span>.
Please click the link to verify your account. This link will expire
shortly, so please verify soon!
We have sent you an email at{' '}
<span className="font-bold">{email}</span>. Please click the link to
verify your account. This link will expire shortly, so please verify
soon!
</p>
<hr class="my-4" />
@ -77,7 +76,9 @@ export function VerificationEmailMessage() {
</>
)}
{isEmailResent && <p class="text-green-700">Verification email has been sent!</p>}
{isEmailResent && (
<p class="text-green-700">Verification email has been sent!</p>
)}
</div>
</div>
);

18
src/hooks/use-auth.ts
Unescape View File

@ -1,18 +0,0 @@
import { useEffect, useState } from 'preact/hooks';
import {TokenPayload, decodeToken, TOKEN_COOKIE_NAME} from '../lib/jwt';
import Cookies from 'js-cookie';
export const useAuth = () => {
const [user, setUser] = useState<TokenPayload | null>(null);
const [isLoading, setIsLoading] = useState(true);
useEffect(() => {
const token = Cookies.get(TOKEN_COOKIE_NAME);
const payload = token ? decodeToken(token) : null;
setUser(payload);
setIsLoading(false);
}, []);
return { user, isLoading };
};
Write Preview
Loading…
Cancel
Save