lingdocs
/
pashto-dictionary
mirror of https://github.com/lingdocs/pashto-dictionary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trying more stuff

This commit is contained in:
lingdocs 2021-08-24 16:51:25 +04:00
parent 41f401aa45
commit 4daf54106b
6 changed files with 92 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firebase.json
View File

@ -6,9 +6,13 @@
"hosting": {
"public": "public",
"rewrites": [
{
"source": "/testme",
"function": "testme"
{
"source": "/publishDictionary",
"function": "/publishDictionary"
},
{
"source": "/willError",
"function": "/willError"
}
]
}

39
functions/src/index.ts
View File

@ -1,29 +1,24 @@
import * as functions from "firebase-functions";
import fetch from "node-fetch";
import cors from "cors";
// import publish from "./publish";
// import * as BT from "../../website/src/lib/backend-types"
import * as FT from "../../website/src/lib/functions-types";
import auth from "./middleware/lingdocs-auth";
import publish from "./publish";
export const testme = functions
// .runWith({
// timeoutSeconds: 200,
// memory: "2GB"
// })
.https.onRequest((req, res) => {
return cors({ credentials: true, origin: /\.lingdocs\.com$/ })(req, res, () => {
const { headers: { cookie }} = req;
if (!cookie) {
return res.status(401).send({ ok: false, error: "unauthorized" });
}
fetch("https://account.lingdocs.com/api/user", {
headers: { cookie },
}).then(r => r.json()).then(r => {
res.send({ ok: true, r });
}).catch((error) => res.send({ ok: false, error }));
export const publishDictionary = functions.https.onRequest(
auth((req, res: functions.Response<FT.PublishDictionaryResponse | FT.FunctionError>) => {
if (req.user.level !== "editor") {
res.status(403).send({ ok: false, error: "403 forbidden" });
return;
});
});
}
publish().then(res.send);
})
);
export const willError = functions.https.onRequest((req, res) => {
auth((req, res: functions.Response<FT.PublishDictionaryResponse | FT.FunctionError>) => {
throw new Error("this is an error");
})
})
// TODO: BETTER HANDLING OF EXPRESS MIDDLEWARE
export const submissions = functions

43
functions/src/middleware/lingdocs-auth.ts Normal file
View File

@ -0,0 +1,43 @@
import cors from "cors";
import fetch from "node-fetch";
import type { https, Response } from "firebase-functions";
import * as FT from "../../../website/src/lib/functions-types";
import type { LingdocsUser } from "../../../website/src/lib/account-types";
const useCors = cors({ credentials: true, origin: /\.lingdocs\.com$/ });
interface ReqWUser extends https.Request {
user: LingdocsUser;
}
/**
* creates a handler to pass to a firebase https.onRequest function
*
*/
export default function makeHandler(toRun: (req: ReqWUser, res: Response<FT.FunctionResponse>) => any | Promise<any>): (req: https.Request, res: Response<any>) => void | Promise<void> {
return function(reqPlain: https.Request, resPlain: Response<any>) {
return useCors(reqPlain, resPlain, async () => {
const { req, res } = await lingdocsAuth(reqPlain, resPlain);
if (!req) {
res.status(401).send({ ok: false, error: "unauthorized" });
return;
};
toRun(req, res);
return;
});
}
}
async function lingdocsAuth(req: https.Request, res: Response<any>): Promise<{ req: ReqWUser | null, res: Response<FT.FunctionResponse> }> {
const { headers: { cookie }} = req;
if (!cookie) {
return { req: null, res };
}
const r = await fetch("https://account.lingdocs.com/api/user", { headers: { cookie }})
const { ok, user } = await r.json();
if (ok === true && user) {
req.user = user;
return { req: req as ReqWUser, res };
}
return { req: null, res };
}

11
website/src/lib/backend-calls.ts
View File

@ -22,12 +22,11 @@ async function accountApiFetch(url: string, method: "GET" | "POST" | "PUT" | "DE
return await response.json() as AT.APIResponse;
}
export async function publishDictionary(): Promise<FT.PublishDictionaryResponse> {
return {
ok: true,
// @ts-ignore
info: {},
};
export async function publishDictionary(): Promise<FT.PublishDictionaryResponse | FT.FunctionError> {
const r = await fetch("https://functions.lingdocs.com/publishDictionary", {
credentials: "include",
});
return (await r.json()) as FT.PublishDictionaryResponse | FT.FunctionError;
}
export async function upgradeAccount(password: string): Promise<AT.UpgradeUserResponse> {

4
website/src/lib/functions-types.ts
View File

@ -9,6 +9,10 @@
import { Types as T } from "@lingdocs/pashto-inflector";
import * as AT from "./account-types";
export type FunctionResponse = PublishDictionaryResponse | SubmissionsResponse | FunctionError;
export type FunctionError = { ok: false, error: string };
export type PublishDictionaryResponse = {
ok: true,
info: T.DictionaryInfo,

33
website/src/screens/Account.tsx
View File

@ -6,7 +6,7 @@ import { Modal, Button } from "react-bootstrap";
import {
upgradeAccount,
signOut,
// publishDictionary,
publishDictionary,
} from "../lib/backend-calls";
import LoadingElipses from "../components/LoadingElipses";
import { Helmet } from "react-helmet";
@ -24,16 +24,15 @@ const Account = ({ user, loadUser }: { user: AT.LingdocsUser | undefined, loadUs
const [upgradePassword, setUpgradePassword] = useState<string>("");
const [upgradeError, setUpgradeError] = useState<string>("");
const [waiting, setWaiting] = useState<boolean>(false);
// const [popup, setPopup] = useState<WindowProxy | null>(null);
// const [publishingStatus, setPublishingStatus] = useState<undefined | "publishing" | any>(undefined);
const [publishingStatus, setPublishingStatus] = useState<undefined | "publishing" | any>(undefined);
useEffect(() => {
setShowingUpgradePrompt(false);
setUpgradeError("");
setWaiting(false);
window.addEventListener("message", handleIncomingMessage);
console.log("send test func");
fetch("https://functions.lingdocs.com/testme", { credentials: "include" }).then((res) => res.text()).then((res) => {
console.log("test func here");
console.log("send test erroring func");
fetch("https://functions.lingdocs.com/willError", { credentials: "include" }).then((res) => res.text()).then((res) => {
console.log("test error here");
console.log(res);
});
return () => {
@ -76,15 +75,15 @@ const Account = ({ user, loadUser }: { user: AT.LingdocsUser | undefined, loadUs
function handleOpenSignup() {
popupRef = window.open("https://account.lingdocs.com");
}
// function handlePublish() {
// setPublishingStatus("publishing");
// publishDictionary().then((response) => {
// setPublishingStatus(response);
// }).catch((err) => {
// console.error(err);
// setPublishingStatus("Offline or connection error");
// });
// }
function handlePublish() {
setPublishingStatus("publishing");
publishDictionary().then((response) => {
setPublishingStatus(response);
}).catch((err) => {
console.error(err);
setPublishingStatus("Offline or connection error");
});
}
if (!user) {
return <div className="text-center mt-3">
<Helmet>
@ -104,7 +103,7 @@ const Account = ({ user, loadUser }: { user: AT.LingdocsUser | undefined, loadUs
<title>Account - LingDocs Pashto Dictionary</title>
</Helmet>
<h2 className="mb-4">Account</h2>
{/* {user.level === "editor" &&
{user.level === "editor" &&
<div className="mb-3">
<h4>Editor Tools</h4>
{publishingStatus !== "publishing" &&
@ -123,7 +122,7 @@ const Account = ({ user, loadUser }: { user: AT.LingdocsUser | undefined, loadUs
</>
}
</div>
} */}
}
<div>
{/* {user.p && <div className="mb-4 mt-3" style={{ textAlign: "center" }}>
<img src={user.photoURL} data-testid="userAvatar" alt="avatar" style={{ borderRadius: "50%", width: "5rem", height: "5rem" }}/>