From b65c93acfc9b50f9ae7c6ef5312d9647d22a82f0 Mon Sep 17 00:00:00 2001
From: Fabian Stamm <dev@fabianstamm.de>
Date: Tue, 6 Nov 2018 21:27:07 +0100
Subject: [PATCH] Fixing wrong database queries

---
 src/api/oauth/jwt.ts     | 2 +-
 src/api/oauth/refresh.ts | 2 +-
 src/testdata.ts          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/oauth/jwt.ts b/src/api/oauth/jwt.ts
index 8c41678..601dd3a 100644
--- a/src/api/oauth/jwt.ts
+++ b/src/api/oauth/jwt.ts
@@ -11,7 +11,7 @@ const JWTRoute = promiseMiddleware(async (req: Request, res: Response) => {
    let { refreshtoken } = req.query;
    if (!refreshtoken) throw new RequestError(req.__("Refresh token not set"), HttpStatusCode.BAD_REQUEST);
 
-   let token = await RefreshToken.findOne({ where: { token: refreshtoken }, include: [User, Permission, Client] });
+   let token = await RefreshToken.findOne({ token: refreshtoken });
    if (!token) throw new RequestError(req.__("Invalid token"), HttpStatusCode.BAD_REQUEST);
 
    let user = await User.findById(token.user);
diff --git a/src/api/oauth/refresh.ts b/src/api/oauth/refresh.ts
index 710d245..bf8ff56 100644
--- a/src/api/oauth/refresh.ts
+++ b/src/api/oauth/refresh.ts
@@ -19,7 +19,7 @@ const RefreshTokenRoute = Stacker(GetClientAuthMiddleware(false, false, true), a
    let redirect_uri = req.query.redirect_uri || req.body.redirect_uri;
    let grant_type = req.query.grant_type || req.body.grant_type;
    if (!grant_type || grant_type === "authorization_code") {
-      let c = await ClientCode.findOne({ where: { code: code }, include: [{ model: User, include: [Mail] }, Client, Permission] })
+      let c = await ClientCode.findOne({ code: code })
       if (!c) {
          throw new RequestError(req.__("Invalid code"), HttpStatusCode.BAD_REQUEST);
       }
diff --git a/src/testdata.ts b/src/testdata.ts
index de1ff95..99d47b0 100644
--- a/src/testdata.ts
+++ b/src/testdata.ts
@@ -39,7 +39,7 @@ export default async function TestData() {
       await Client.save(c);
    }
 
-   let perm = await Permission.findOne({ where: { id: 0 } });
+   let perm = await Permission.findOne({ id: 0 });
    if (!perm) {
       Logging.log("Adding test permission")
       perm = Permission.new({
@@ -51,7 +51,7 @@ export default async function TestData() {
       Permission.save(perm);
    }
 
-   let r = await RegCode.findOne({ where: {} });
+   let r = await RegCode.findOne({ token: "test" });
    if (!r) {
       Logging.log("Adding test reg_code")
       r = RegCode.new({