From b0a0b72cc091e17eaa7154e45fc9ab1e29cb9635 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Mon, 26 Nov 2018 21:19:20 -0800 Subject: [PATCH] removed TokenApi --- app-backend/built/routes/LoginRouter.js | 8 +++++--- app-backend/built/routes/LoginRouter.js.map | 2 +- app-backend/built/routes/WebhooksRouter.js.map | 2 +- app-backend/src/api/TokenApi.ts | 10 ---------- app-backend/src/routes/LoginRouter.ts | 17 ++++++++++------- app-backend/src/routes/WebhooksRouter.ts | 1 - 6 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 app-backend/src/api/TokenApi.ts diff --git a/app-backend/built/routes/LoginRouter.js b/app-backend/built/routes/LoginRouter.js index 5da55ba..acdc771 100644 --- a/app-backend/built/routes/LoginRouter.js +++ b/app-backend/built/routes/LoginRouter.js @@ -1,6 +1,5 @@ "use strict"; const express = require("express"); -const TokenApi = require("../api/TokenApi"); const BaseApi = require("../api/BaseApi"); const Authenticator = require("../user/Authenticator"); const ApiStatusCodes = require("../api/ApiStatusCodes"); @@ -15,7 +14,8 @@ router.post('/', function (req, res, next) { return; } let authToken; - const namespace = InjectionExtractor.extractGlobalsFromInjected(res).namespace; + const namespace = InjectionExtractor.extractGlobalsFromInjected(res) + .namespace; Authenticator.get(namespace) .getAuthToken(password) .then(function (token) { @@ -24,7 +24,9 @@ router.post('/', function (req, res, next) { }) .then(function (cookieAuth) { res.cookie(CaptainConstants.header.cookieAuth, cookieAuth); - res.send(new TokenApi(authToken)); + let baseApi = new BaseApi(ApiStatusCodes.STATUS_OK, 'Login succeeded'); + baseApi.data = { token: authToken }; + res.send(baseApi); }) .catch(ApiStatusCodes.createCatcher(res)); }); diff --git a/app-backend/built/routes/LoginRouter.js.map b/app-backend/built/routes/LoginRouter.js.map index a32a420..b86214f 100644 --- a/app-backend/built/routes/LoginRouter.js.map +++ b/app-backend/built/routes/LoginRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"LoginRouter.js","sourceRoot":"","sources":["../../src/routes/LoginRouter.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,4CAA4C;AAC5C,0CAA0C;AAC1C,uDAAuD;AACvD,wDAAwD;AAExD,8DAA8D;AAC9D,sEAAuE;AAEvE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACpC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAEtC,IAAI,CAAC,QAAQ,EAAE;QACX,IAAI,QAAQ,GAAG,IAAI,OAAO,CACtB,cAAc,CAAC,oBAAoB,EACnC,oBAAoB,CACvB,CAAA;QACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClB,OAAM;KACT;IAED,IAAI,SAAiB,CAAA;IAErB,MAAM,SAAS,GAAG,kBAAkB,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC;IAE/E,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC;SACvB,YAAY,CAAC,QAAQ,CAAC;SACtB,IAAI,CAAC,UAAS,KAAK;QAChB,SAAS,GAAG,KAAK,CAAA;QACjB,OAAO,aAAa,CAAC,GAAG,CACpB,SAAS,CACZ,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,UAAU;QACrB,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QAC1D,GAAG,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAA;IACrC,CAAC,CAAC;SACD,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,iBAAS,MAAM,CAAA"} \ No newline at end of file +{"version":3,"file":"LoginRouter.js","sourceRoot":"","sources":["../../src/routes/LoginRouter.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,0CAA0C;AAC1C,uDAAuD;AACvD,wDAAwD;AAExD,8DAA8D;AAC9D,sEAAsE;AAEtE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACpC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAEtC,IAAI,CAAC,QAAQ,EAAE;QACX,IAAI,QAAQ,GAAG,IAAI,OAAO,CACtB,cAAc,CAAC,oBAAoB,EACnC,oBAAoB,CACvB,CAAA;QACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClB,OAAM;KACT;IAED,IAAI,SAAiB,CAAA;IAErB,MAAM,SAAS,GAAG,kBAAkB,CAAC,0BAA0B,CAAC,GAAG,CAAC;SAC/D,SAAS,CAAA;IAEd,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC;SACvB,YAAY,CAAC,QAAQ,CAAC;SACtB,IAAI,CAAC,UAAS,KAAK;QAChB,SAAS,GAAG,KAAK,CAAA;QACjB,OAAO,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;IACxE,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,UAAU;QACrB,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QAC1D,IAAI,OAAO,GAAG,IAAI,OAAO,CACrB,cAAc,CAAC,SAAS,EACxB,iBAAiB,CACpB,CAAA;QACD,OAAO,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QACnC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC,CAAC;SACD,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,iBAAS,MAAM,CAAA"} \ No newline at end of file diff --git a/app-backend/built/routes/WebhooksRouter.js.map b/app-backend/built/routes/WebhooksRouter.js.map index 5825a64..8a2cede 100644 --- a/app-backend/built/routes/WebhooksRouter.js.map +++ b/app-backend/built/routes/WebhooksRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"WebhooksRouter.js","sourceRoot":"","sources":["../../src/routes/WebhooksRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"WebhooksRouter.js","sourceRoot":"","sources":["../../src/routes/WebhooksRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/src/api/TokenApi.ts b/app-backend/src/api/TokenApi.ts deleted file mode 100644 index a7aa37c..0000000 --- a/app-backend/src/api/TokenApi.ts +++ /dev/null @@ -1,10 +0,0 @@ -import ApiStatusCodes = require('./ApiStatusCodes') -import BaseApi = require('./BaseApi') - -class TokenApi extends BaseApi { - constructor(private token: string) { - super(ApiStatusCodes.STATUS_OK, '') - } -} - -export = TokenApi diff --git a/app-backend/src/routes/LoginRouter.ts b/app-backend/src/routes/LoginRouter.ts index 33c2e61..867bc82 100644 --- a/app-backend/src/routes/LoginRouter.ts +++ b/app-backend/src/routes/LoginRouter.ts @@ -1,11 +1,10 @@ import express = require('express') -import TokenApi = require('../api/TokenApi') import BaseApi = require('../api/BaseApi') import Authenticator = require('../user/Authenticator') import ApiStatusCodes = require('../api/ApiStatusCodes') import Logger = require('../utils/Logger') import CaptainConstants = require('../utils/CaptainConstants') -import InjectionExtractor = require('../injection/InjectionExtractor'); +import InjectionExtractor = require('../injection/InjectionExtractor') const router = express.Router() @@ -23,19 +22,23 @@ router.post('/', function(req, res, next) { let authToken: string - const namespace = InjectionExtractor.extractGlobalsFromInjected(res).namespace; + const namespace = InjectionExtractor.extractGlobalsFromInjected(res) + .namespace Authenticator.get(namespace) .getAuthToken(password) .then(function(token) { authToken = token - return Authenticator.get( - namespace - ).getAuthTokenForCookies(password) + return Authenticator.get(namespace).getAuthTokenForCookies(password) }) .then(function(cookieAuth) { res.cookie(CaptainConstants.header.cookieAuth, cookieAuth) - res.send(new TokenApi(authToken)) + let baseApi = new BaseApi( + ApiStatusCodes.STATUS_OK, + 'Login succeeded' + ) + baseApi.data = { token: authToken } + res.send(baseApi) }) .catch(ApiStatusCodes.createCatcher(res)) }) diff --git a/app-backend/src/routes/WebhooksRouter.ts b/app-backend/src/routes/WebhooksRouter.ts index 21ee9b7..8e32a8f 100644 --- a/app-backend/src/routes/WebhooksRouter.ts +++ b/app-backend/src/routes/WebhooksRouter.ts @@ -1,6 +1,5 @@ import express = require('express') import bodyParser = require('body-parser') -import TokenApi = require('../api/TokenApi') import BaseApi = require('../api/BaseApi') import Authenticator = require('../user/Authenticator') import ApiStatusCodes = require('../api/ApiStatusCodes')