diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8f325ad..363c83f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,7 +9,7 @@
"request": "launch",
"runtimeArgs": [
"run",
- "dev",
+ "app:dev",
],
"runtimeExecutable": "yarn",
"skipFiles": [
diff --git a/components/Intro.tsx b/components/Intro.tsx
deleted file mode 100644
index 7638435..0000000
--- a/components/Intro.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Trans, useTranslation } from "next-i18next"
-import { LoginContext } from "../contexts/login"
-import { useDefinedContext } from "../utils/definedContext"
-import { InputSlug } from "./InputEventSlug"
-import { LoginButton } from "./LoginButton"
-import { LogoutLink } from "./LogoutLink"
-import { TelegramUser } from "./TelegramUser"
-
-
-export function Intro() {
- const {t} = useTranslation("common")
- const [login, _] = useDefinedContext(LoginContext)
-
- const loginMessage = login ? <>
-
- introTelegramLoggedIn(1: )
-
-
-
- : <>
- {t("introTelegramLogin")}
-
-
- const input = login ? <>
-
- {t("introCreateEvent")}
-
-
- : <>
-
-
-
- return <>
-
- {loginMessage}
-
- {input}
-
-}
\ No newline at end of file
diff --git a/components/LoginButton.tsx b/components/LoginButton.tsx
deleted file mode 100644
index 54f1ee5..0000000
--- a/components/LoginButton.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as React from 'react';
-import {LoginContext} from "../contexts/login"
-import OriginalTelegramLoginButton from 'react-telegram-login'
-import { useDefinedContext } from '../utils/definedContext';
-
-export function LoginButton(props: any) {
- const [login, setLogin] = useDefinedContext(LoginContext)
-
- return (
-
-
-
- )
-}
\ No newline at end of file
diff --git a/components/LogoutLink.tsx b/components/LogoutLink.tsx
index 46f5269..eb39009 100644
--- a/components/LogoutLink.tsx
+++ b/components/LogoutLink.tsx
@@ -8,9 +8,11 @@ export function LogoutLink() {
return (
+ (
setLogin(null)}>
{t("introTelegramLogout")}
+ )
)
}
\ No newline at end of file
diff --git a/components/TelegramLoginButton.tsx b/components/TelegramLoginButton.tsx
new file mode 100644
index 0000000..1ec9dfb
--- /dev/null
+++ b/components/TelegramLoginButton.tsx
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { default as OriginalTelegramLoginButton } from 'react-telegram-login'
+
+
+export function TelegramLoginButton(props: any) {
+ return (
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/components/TutorialTelegramLogin.tsx b/components/TutorialTelegramLogin.tsx
new file mode 100644
index 0000000..635fbb8
--- /dev/null
+++ b/components/TutorialTelegramLogin.tsx
@@ -0,0 +1,41 @@
+import { useTranslation } from "next-i18next"
+import { useCallback } from "react"
+import { LoginContext } from "../contexts/login"
+import { useDefinedContext } from "../utils/definedContext"
+import { TelegramLoginButton } from "./TelegramLoginButton"
+import * as Telegram from "../utils/telegram"
+import axios from "axios"
+
+
+export function TutorialTelegramLogin() {
+ const { t } = useTranslation("common")
+ const [login, setLogin] = useDefinedContext(LoginContext)
+
+ const onLogin = useCallback(
+ async (data: Telegram.LoginData) => {
+ console.debug("[Telegram] Logged in successfully, now forwarding to the server...")
+ const response = await axios.post("/api/login/telegram", data)
+ console.info(response)
+ },
+ []
+ )
+
+ if (!login) {
+ return <>
+
+ {t("introTelegramLogin")}
+
+
+
+ }
+ else {
+ return <>
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 304bfd6..fd4c8e1 100644
--- a/package.json
+++ b/package.json
@@ -3,26 +3,33 @@
"version": "0.1.0",
"private": true,
"scripts": {
- "dev": "next dev",
- "build": "next build",
- "start": "next start",
- "lint": "next lint"
+ "app:dev": "next dev",
+ "app:build": "next build",
+ "app:start": "next start",
+ "app:lint": "next lint",
+ "db:dev": "dotenv -e .env.local prisma db push --force-reset",
+ "db:generate": "dotenv -e .env.local prisma generate"
},
"dependencies": {
"@prisma/client": "3.14.0",
+ "axios": "^0.27.2",
"classnames": "^2.3.1",
+ "cors": "^2.8.5",
+ "crypto-random-string": "^5.0.0",
"next": "12.1.6",
"next-i18next": "^11.0.0",
"prisma": "^3.14.0",
"react": "18.1.0",
"react-dom": "18.1.0",
"react-storage-hooks": "^4.0.1",
- "react-telegram-login": "^1.1.2"
+ "react-telegram-login": "^1.1.2",
+ "swr": "^1.3.0"
},
"devDependencies": {
"@types/node": "17.0.35",
"@types/react": "18.0.9",
"@types/react-dom": "18.0.4",
+ "dotenv-cli": "^5.1.0",
"eslint": "8.15.0",
"eslint-config-next": "12.1.6",
"typescript": "4.6.4"
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 1baa3a8..290d36b 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,7 +1,4 @@
import '../styles/globals.css'
-import '../styles/telegram.css'
-import '../styles/postcard.css'
-import "../styles/index.css"
import type { AppProps } from 'next/app'
import { LoginContext } from '../contexts/login'
import { useEffect, useState } from 'react'
diff --git a/pages/api/.gitignore b/pages/api/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/pages/api/login/telegram.ts b/pages/api/login/telegram.ts
new file mode 100644
index 0000000..d1f4d0e
--- /dev/null
+++ b/pages/api/login/telegram.ts
@@ -0,0 +1,79 @@
+import { NextApiRequest, NextApiResponse } from "next"
+import { prisma } from "../../../utils/prismaClient"
+import * as Telegram from "../../../utils/telegram"
+import {default as cryptoRandomString} from "crypto-random-string"
+
+
+
+export default function handler(req: NextApiRequest, res: NextApiResponse) {
+ switch(req.method) {
+ case "POST":
+ const token = process.env.TELEGRAM_TOKEN
+ const validity_ms = parseInt(process.env.FESTA_TOKEN_VALIDITY_MS!) // Wrong typing?
+ const now = new Date()
+
+ if(!token) {
+ return res.status(503).json({error: "`TELEGRAM_TOKEN` was not set up"})
+ }
+ if(!validity_ms) {
+ return res.status(503).json({error: "`FESTA_TOKEN_VALIDITY_MS` was not set up"})
+ }
+
+ try {
+ var lr: Telegram.LoginResponse = new Telegram.LoginResponse(req.body)
+ }
+ catch(_) {
+ return res.status(422).json({error: "Malformed data"})
+ }
+
+ if(!lr.isRecent()) {
+ // Not sure?
+ return res.status(408).json({error: "Telegram login data is not recent"})
+ }
+
+ if(!lr.isValid(token)) {
+ return res.status(401).json({error: "Telegram login data has been tampered"})
+ }
+
+ prisma.user.upsert({
+ where: {
+ id: lr.id,
+ },
+ update: {
+ id: lr.id,
+ firstName: lr.first_name,
+ lastName: lr.last_name,
+ username: lr.username,
+ photoUrl: lr.photo_url,
+ lastAuthDate: now,
+ },
+ create: {
+ id: lr.id,
+ firstName: lr.first_name,
+ lastName: lr.last_name,
+ username: lr.username,
+ photoUrl: lr.photo_url,
+ lastAuthDate: now,
+ }
+ })
+
+ const tokenString = cryptoRandomString({length: 16, type: "base64"})
+ const tokenExpiration = new Date(+ now + validity_ms)
+
+ prisma.token.create({
+ data: {
+ userId: lr.id,
+ token: tokenString,
+ expiresAt: tokenExpiration,
+ }
+ })
+
+ return res.status(200).json({
+ token: tokenString,
+ expiresAt: tokenExpiration.toISOString(),
+ })
+
+ default:
+ return res.status(405).json({error: "Invalid method"})
+ }
+}
\ No newline at end of file
diff --git a/pages/index.tsx b/pages/index.tsx
index 9c6c345..18a83d7 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -2,19 +2,42 @@ import type { NextPage, NextPageContext } from 'next'
import { useTranslation } from 'next-i18next'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
import { Intro } from '../components/Intro';
-import { LoginButton } from '../components/LoginButton';
+import { TutorialTelegramLogin } from '../components/TutorialTelegramLogin';
+import { LoginContext } from '../contexts/login';
+import { useDefinedContext } from '../utils/definedContext';
export async function getStaticProps(context: NextPageContext) {
- return {props: {
- ...(await serverSideTranslations(context.locale ?? "it-IT", ["common"]))
- }}
+ return {
+ props: {
+ ...(await serverSideTranslations(context.locale ?? "it-IT", ["common"]))
+ }
+ }
}
const Page: NextPage = () => {
- const {t} = useTranslation("common")
+ const { t } = useTranslation("common")
+ const [login, setLogin] = useDefinedContext(LoginContext)
+
+ if (!login) {
+ return (
+
+
+
+ {t("siteTitle")}
+
+
+ {t("siteSubtitle")}
+
+
+
+
+
+
+ )
+ }
return (
-
+
{t("siteTitle")}
@@ -23,10 +46,7 @@ const Page: NextPage = () => {
{t("siteSubtitle")}
-
-
-
-