summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-10-17 22:28:16 +0200
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-10-17 22:28:16 +0200
commitae5fd086a2f472026ae7e8eb0af237bcce22e543 (patch)
tree9c79ffaf07b0937e123adc7f2d5df0b9bf39cd64
parent:bug: also receive events for newly added members/relationships (diff)
parentMerge pull request #475 from Thesourtimes/master (diff)
downloadserver-ae5fd086a2f472026ae7e8eb0af237bcce22e543.tar.xz
Merge branch 'master' of http://github.com/fosscord/fosscord-server
-rw-r--r--Dockerfile5
-rw-r--r--README.md1
-rw-r--r--api/src/routes/oauth2/tokens.ts10
3 files changed, 13 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index 4eed2f40..c0f3ab20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,7 @@
-FROM alpine
-RUN apk add --update nodejs npm
+FROM nikolaik/python-nodejs:latest
 WORKDIR /usr/src/fosscord-server/
 COPY . .
 WORKDIR /usr/src/fosscord-server/bundle
 RUN npm run setup
 EXPOSE 3001
-CMD [ "npm", "run", "start:bundle" ]
\ No newline at end of file
+CMD [ "npm", "run", "start:bundle" ]
diff --git a/README.md b/README.md
index 9386ebdd..b8e2e573 100644
--- a/README.md
+++ b/README.md
@@ -32,3 +32,4 @@ This repository contains:
 
 ## [Setup](https://docs.fosscord.com/setup/server/)
 
+- [Download](https://github.com/fosscord/fosscord-server/releases)
diff --git a/api/src/routes/oauth2/tokens.ts b/api/src/routes/oauth2/tokens.ts
new file mode 100644
index 00000000..3657176d
--- /dev/null
+++ b/api/src/routes/oauth2/tokens.ts
@@ -0,0 +1,10 @@
+import { Router, Request, Response } from "express";
+import { route } from "@fosscord/api";
+const router = Router();
+
+router.get("/",route({}), async (req: Request, res: Response) => {
+    //TODO
+	res.json([]);
+});
+
+export default router;