getUserAndAccountFromSesstion -> getUserAndAccountFromSession (NangoH…

…Q#551)
khaliqgant · Apr 19, 2023 · a220f0e · a220f0e
1 parent 0f19dc6
commit a220f0e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/packages/server/lib/controllers/account.controller.ts b/packages/server/lib/controllers/account.controller.ts
@@ -1,12 +1,12 @@
 import type { Request, Response, NextFunction } from 'express';
 import accountService from '../services/account.service.js';
-import { getUserAndAccountFromSesstion, isCloud, getOauthCallbackUrl } from '../utils/utils.js';
+import { getUserAndAccountFromSession, isCloud, getOauthCallbackUrl } from '../utils/utils.js';
 import errorManager from '../utils/error.manager.js';
 
 class AccountController {
     async getAccount(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
 
             if (!isCloud()) {
                 account.callback_url = await getOauthCallbackUrl();
@@ -31,7 +31,7 @@ class AccountController {
                 return;
             }
 
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
 
             await accountService.editAccountCallbackUrl(req.body['callback_url'], account.id);
             res.status(200).send();

diff --git a/packages/server/lib/controllers/auth.controller.ts b/packages/server/lib/controllers/auth.controller.ts
@@ -5,7 +5,7 @@ import errorManager from '../utils/error.manager.js';
 import accountService from '../services/account.service.js';
 import util from 'util';
 import analytics from '../utils/analytics.js';
-import { isCloud, resetPasswordSecret, getBaseUrl, getUserAndAccountFromSesstion } from '../utils/utils.js';
+import { isCloud, resetPasswordSecret, getBaseUrl, getUserAndAccountFromSession } from '../utils/utils.js';
 import jwt from 'jsonwebtoken';
 import Mailgun from 'mailgun.js';
 import type { User } from '../models.js';
@@ -23,7 +23,7 @@ export interface WebUser {
 class AuthController {
     async signin(req: Request, res: Response, next: NextFunction) {
         try {
-            let user = (await getUserAndAccountFromSesstion(req)).user;
+            let user = (await getUserAndAccountFromSession(req)).user;
             let webUser: WebUser = {
                 id: user.id,
                 accountId: user.account_id,

diff --git a/packages/server/lib/controllers/config.controller.ts b/packages/server/lib/controllers/config.controller.ts
@@ -2,7 +2,7 @@ import type { NextFunction, Request, Response } from 'express';
 import configService from '../services/config.service.js';
 import type { ProviderConfig } from '../models.js';
 import analytics from '../utils/analytics.js';
-import { getAccount, getUserAndAccountFromSesstion, parseConnectionConfigParamsFromTemplate } from '../utils/utils.js';
+import { getAccount, getUserAndAccountFromSession, parseConnectionConfigParamsFromTemplate } from '../utils/utils.js';
 import errorManager from '../utils/error.manager.js';
 import connectionService from '../services/connection.service.js';
 import { NangoError } from '../utils/error.js';
@@ -14,7 +14,7 @@ class ConfigController {
 
     async listProviderConfigsWeb(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
 
             let configs = await configService.listProviderConfigs(account.id);
 
@@ -47,7 +47,7 @@ class ConfigController {
 
     async createProviderConfigWeb(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
 
             if (req.body == null) {
                 errorManager.errRes(res, 'missing_body');
@@ -121,7 +121,7 @@ class ConfigController {
 
     async editProviderConfigWeb(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
 
             if (req.body == null) {
                 errorManager.errRes(res, 'missing_body');
@@ -176,7 +176,7 @@ class ConfigController {
 
     async deleteProviderConfigWeb(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
             let providerConfigKey = req.params['providerConfigKey'] as string;
 
             if (providerConfigKey == null) {
@@ -194,7 +194,7 @@ class ConfigController {
 
     async getProviderConfigWeb(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
             let providerConfigKey = req.params['providerConfigKey'] as string;
 
             if (providerConfigKey == null) {

diff --git a/packages/server/lib/controllers/connection.controller.ts b/packages/server/lib/controllers/connection.controller.ts
@@ -4,7 +4,7 @@ import type { NextFunction } from 'express';
 import configService from '../services/config.service.js';
 import { ProviderConfig, ProviderTemplate, Connection, ProviderAuthModes, ProviderTemplateOAuth2 } from '../models.js';
 import analytics from '../utils/analytics.js';
-import { getAccount, getUserAndAccountFromSesstion } from '../utils/utils.js';
+import { getAccount, getUserAndAccountFromSession } from '../utils/utils.js';
 import errorManager from '../utils/error.manager.js';
 
 class ConnectionController {
@@ -14,7 +14,7 @@ class ConnectionController {
 
     async getConnectionWeb(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
 
             let connectionId = req.params['connectionId'] as string;
             let providerConfigKey = req.query['provider_config_key'] as string;
@@ -74,7 +74,7 @@ class ConnectionController {
 
     async getConnectionsWeb(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
 
             let connections = await connectionService.listConnections(account.id);
 
@@ -111,7 +111,7 @@ class ConnectionController {
 
     async deleteConnectionWeb(req: Request, res: Response, next: NextFunction) {
         try {
-            let account = (await getUserAndAccountFromSesstion(req)).account;
+            let account = (await getUserAndAccountFromSession(req)).account;
             let connectionId = req.params['connectionId'] as string;
             let providerConfigKey = req.query['provider_config_key'] as string;
 

diff --git a/packages/server/lib/controllers/user.controller.ts b/packages/server/lib/controllers/user.controller.ts
@@ -1,10 +1,10 @@
-import { getUserAndAccountFromSesstion } from '../utils/utils.js';
+import { getUserAndAccountFromSession } from '../utils/utils.js';
 import type { Request, Response, NextFunction } from 'express';
 
 class UserController {
     async getUser(req: Request, res: Response, next: NextFunction) {
         try {
-            let user = (await getUserAndAccountFromSesstion(req)).user;
+            let user = (await getUserAndAccountFromSession(req)).user;
 
             res.status(200).send({
                 user: {

diff --git a/packages/server/lib/utils/utils.ts b/packages/server/lib/utils/utils.ts
@@ -89,7 +89,7 @@ export function isUserAuthenticated(req: Request): boolean {
     return req.isAuthenticated() && req.user != null && req.user.id != null;
 }
 
-export async function getUserAndAccountFromSesstion(req: Request): Promise<{ user: User; account: Account }> {
+export async function getUserAndAccountFromSession(req: Request): Promise<{ user: User; account: Account }> {
     let sessionUser = req.user;
 
     if (sessionUser == null) {