+ {errorMessage != "" &&
{errorMessage} }
Please note
-
+ {session?.user &&
{session.user.name} }
Lorem ipsum dolor sit amet consectetur adipisicing elit. Vel est adipisci quas, aperiam voluptas, omnis tempora blanditiis quae fuga eum ullam
commodi a perspiciatis provident pariatur sunt excepturi doloremque! Commodi!
diff --git a/web/src/components/Layout/Navigation/Navigation.tsx b/web/src/components/Layout/Navigation/Navigation.tsx
index eb877c7c..dbee41f1 100644
--- a/web/src/components/Layout/Navigation/Navigation.tsx
+++ b/web/src/components/Layout/Navigation/Navigation.tsx
@@ -1,6 +1,7 @@
"use client";
import Link from "next/link";
import Image from "next/image";
+import { useSession } from "next-auth/react";
import { IconUserCircle } from "@tabler/icons-react";
type NavigationProps = {
@@ -17,6 +18,8 @@ export type Page = {
};
export default function Navigation({ menu }: NavigationProps) {
+ const { data: session } = useSession();
+
return (
@@ -43,7 +46,7 @@ export default function Navigation({ menu }: NavigationProps) {
- My Account
+ {session?.user?.name ?
{session.user.name}
:
My Account
}
diff --git a/web/src/components/SessionProvider.tsx b/web/src/components/SessionProvider.tsx
new file mode 100644
index 00000000..a2a7c217
--- /dev/null
+++ b/web/src/components/SessionProvider.tsx
@@ -0,0 +1,3 @@
+"use client";
+import { SessionProvider } from "next-auth/react";
+export default SessionProvider;
diff --git a/web/src/config/constants.ts b/web/src/config/constants.ts
new file mode 100644
index 00000000..113d67b2
--- /dev/null
+++ b/web/src/config/constants.ts
@@ -0,0 +1,6 @@
+export const CMS_PUBLIC_API_URL = process.env.CMS_PUBLIC_API_URL ?? "http://localhost:1337/api";
+export const CMS_INTERNAL_API_URL = process.env.CMS_INTERNAL_API_URL ?? "http://cms:1337/api";
+export const DATABASE_HOST = process.env.DATABASE_HOST ?? "db";
+export const DATABASE_USER = process.env.DATABASE_USER ?? "vim";
+export const DATABASE_NAME = process.env.DATABASE_NAME ?? "vim";
+export const DATABASE_PASSWORD = process.env.DATABASE_PASSWORD ?? "super-secret";
diff --git a/web/src/config/db.ts b/web/src/config/db.ts
new file mode 100644
index 00000000..db2e00ce
--- /dev/null
+++ b/web/src/config/db.ts
@@ -0,0 +1,9 @@
+import * as mysql from "mysql2";
+import { DATABASE_HOST, DATABASE_NAME, DATABASE_PASSWORD, DATABASE_USER } from "./constants";
+
+export const dbConnection = mysql.createConnection({
+ host: DATABASE_HOST,
+ user: DATABASE_USER,
+ database: DATABASE_NAME,
+ password: DATABASE_PASSWORD,
+});
diff --git a/web/src/lib/auth/legacy_web.ts b/web/src/lib/auth/legacy_web.ts
new file mode 100644
index 00000000..aa96da78
--- /dev/null
+++ b/web/src/lib/auth/legacy_web.ts
@@ -0,0 +1,42 @@
+import md5 from "md5";
+import { dbConnection } from "@/config/db";
+// MD5 Hash is stated to be not secure
+// This code has to be deleted after majority of users
+// migrated to a secure hashing algorithm
+// this is fulfilled when users are registered in strapi
+
+type LegacyUser = {
+ user_id: number;
+ user_name: string;
+ password: string;
+ first_name: string;
+ last_name: string;
+ email: string;
+ access?: boolean;
+ homepage?: string;
+ sponsor_amount?: number;
+ sponsor_vote_amount?: number;
+ sponsor_vote_date?: string;
+ created: string;
+};
+
+export const findUserByEmail = (email: string): Promise => {
+ const sql = "SELECT * FROM `vs_users` WHERE email = ?";
+
+ return new Promise((resolve, reject) => {
+ dbConnection.query(sql, [email], function (err, results) {
+ if (err) {
+ reject(err);
+ return;
+ }
+
+ if ((results as LegacyUser[]).length >= 1) {
+ resolve((results as LegacyUser[])[0]);
+ } else {
+ resolve(null);
+ }
+ });
+ });
+};
+
+export const verifyPassword = (givenPassword: string, legacyHashedPassword: string) => md5(givenPassword) === legacyHashedPassword;
diff --git a/web/src/lib/auth/strapi.ts b/web/src/lib/auth/strapi.ts
new file mode 100644
index 00000000..161a2696
--- /dev/null
+++ b/web/src/lib/auth/strapi.ts
@@ -0,0 +1,41 @@
+import { CMS_PUBLIC_API_URL, CMS_INTERNAL_API_URL } from "@/config/constants";
+
+export const signIn = async (email: string, password: string) => {
+ try {
+ const response = await fetch(`${CMS_INTERNAL_API_URL}/auth/local`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ identifier: email,
+ password: password,
+ }),
+ });
+ return await response.json();
+ } catch (e) {
+ return null;
+ }
+};
+
+export const signUp = async (username: string, email: string, password: string, mode: "internal" | "public" = "public") => {
+ const strapiApiUrl = mode == "public" ? CMS_PUBLIC_API_URL : CMS_INTERNAL_API_URL;
+ try {
+ const response = await fetch(`${strapiApiUrl}/auth/local/register`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ Accept: "application/json",
+ },
+ body: JSON.stringify({
+ username: username,
+ email: email,
+ password: password,
+ }),
+ });
+
+ return await response.json();
+ } catch {
+ return null;
+ }
+};
diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts
new file mode 100644
index 00000000..3f1c0af7
--- /dev/null
+++ b/web/src/lib/types.ts
@@ -0,0 +1,22 @@
+export type StrapiSignInResponse = {
+ jwt: string;
+ user: {
+ id: number;
+ username: string;
+ email: string;
+ provider: string;
+ confirmed: boolean;
+ blocked: boolean;
+ createdAt: string;
+ updatedAt: string;
+ };
+ error?: {
+ details: string[];
+ };
+};
+
+export type SignUpPayload = {
+ username: string;
+ email: string;
+ password: string;
+};
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 1bf25398..d0797f33 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -22,6 +22,6 @@
"@/*": ["./src/*"]
}
},
- "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "./types/next-auth.d.ts", "types/**/*"],
"exclude": ["node_modules"]
}
diff --git a/web/types/next-auth.d.ts b/web/types/next-auth.d.ts
new file mode 100644
index 00000000..d142d582
--- /dev/null
+++ b/web/types/next-auth.d.ts
@@ -0,0 +1,15 @@
+import "next-auth";
+
+declare module "next-auth" {
+ interface User {
+ id: string;
+ email: string;
+ name: string;
+ jwt: JWT;
+ }
+
+ interface Session extends DefaultSession {
+ id: string;
+ jwt: string;
+ }
+}