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

feat: user profile #12

Merged
merged 4 commits into from
Aug 23, 2024
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
237 changes: 236 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,22 @@
"@fortawesome/react-fontawesome": "^0.2.2",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@tanstack/react-query": "^5.51.23",
"axios": "^1.7.3",
"query-string": "^9.1.0",
"react": "^18.3.1",
"react-country-flag": "^3.1.0",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",
"react-router-dom": "^6.26.0"
"react-router-dom": "^6.26.0",
"zustand": "^4.5.5"
},
"devDependencies": {
"@commitlint/cli": "^19.4.0",
"@commitlint/config-conventional": "^19.2.2",
"@eslint/js": "^9.8.0",
"@tailwindcss/typography": "^0.5.14",
"@tanstack/eslint-plugin-query": "^5.51.15",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.5.2",
Expand Down
10 changes: 7 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ import "./App.css";
import { RouterProvider } from "react-router-dom";
import { router } from "./routes";
import { AuthProvider } from "./context/AuthProvider.tsx";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
function App() {
const queryClient = new QueryClient();
return (
<AuthProvider>
<RouterProvider router={router} />
</AuthProvider>
<QueryClientProvider client={queryClient}>
<AuthProvider>
<RouterProvider router={router} />
</AuthProvider>
</QueryClientProvider>
);
}

Expand Down
Empty file removed src/api/auth/hooks/useUserQuery.ts
Empty file.
15 changes: 8 additions & 7 deletions src/api/auth/service/auth.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { TokenScopeResponse } from "../../../data-objects/interface";
import {
TokenResponse,
TokenScopeResponse,
} from "../../../data-objects/interface";

const authorizationEndpoint = "https://accounts.spotify.com/authorize";
const clientId = import.meta.env.VITE_CLIENT_ID;
Expand Down Expand Up @@ -73,9 +76,10 @@ export async function getToken(code: string): Promise<TokenScopeResponse> {
return response;
}

export const getRefreshToken = async () => {
export const getRefreshToken = async (
refreshToken: string,
): Promise<TokenResponse> => {
// refresh token that has been previously stored
const refreshToken = localStorage.getItem("refresh_token");
const url = "https://accounts.spotify.com/api/token";

const payload = {
Expand All @@ -92,8 +96,5 @@ export const getRefreshToken = async () => {
const body = await fetch(url, payload);
const response = await body.json();

localStorage.setItem("access_token", response.accessToken);
if (response.refreshToken) {
localStorage.setItem("refresh_token", response.refreshToken);
}
return response;
};
10 changes: 10 additions & 0 deletions src/api/user/hooks/useProfileQuery.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { useQuery } from "@tanstack/react-query";
import profileQueryKey from "./user-query-keys.ts";
import { getUserData } from "../service/user.service.ts";

export const useProfileQuery = (token: string) => {
return useQuery({
queryKey: profileQueryKey.profile,
queryFn: () => getUserData(token),
});
};
5 changes: 5 additions & 0 deletions src/api/user/hooks/user-query-keys.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const profileQueryKey = {
profile: ["profile"],
};

export default profileQueryKey;
1 change: 1 addition & 0 deletions src/api/user/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./hooks/useProfileQuery";
12 changes: 12 additions & 0 deletions src/api/user/service/user.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { ProfileInterface } from "../../../data-objects/interface";

export async function getUserData(token: string): Promise<ProfileInterface> {
const response = await fetch("https://api.spotify.com/v1/me", {
method: "GET",
headers: {
Authorization: "Bearer " + token,
},
});

return await response.json();
}
Loading
Loading