Issue #521 Fix (#606)

* initial commit * parsing credentials before calling db method * changed upsert method accordingly
NangoHQ · May 5, 2023 · a373fc4 · a373fc4
1 parent ff364e8
commit a373fc4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/packages/server/lib/controllers/oauth.controller.ts b/packages/server/lib/controllers/oauth.controller.ts
@@ -14,7 +14,7 @@ import {
     getAccount,
     getConnectionMetadataFromTokenResponse
 } from '../utils/utils.js';
-import { ProviderConfig, ProviderTemplate, ProviderTemplateOAuth2, ProviderAuthModes, OAuthSession, OAuth1RequestTokenResult } from '../models.js';
+import { ProviderConfig, ProviderTemplate, ProviderTemplateOAuth2, ProviderAuthModes, OAuthSession, OAuth1RequestTokenResult, AuthCredentials } from '../models.js';
 import logger from '../utils/logger.js';
 import type { NextFunction } from 'express';
 import errorManager from '../utils/error.manager.js';
@@ -314,13 +314,14 @@ class OAuthController {
             logger.debug(`OAuth 2 for ${providerConfigKey} (connection ${connectionId}) successful.`);
 
             const tokenMetadata = getConnectionMetadataFromTokenResponse(rawCredentials, template);
+
+            var parsedRawCredentials : AuthCredentials = connectionService.parseRawCredentials(rawCredentials, ProviderAuthModes.OAuth2);
 
             connectionService.upsertConnection(
                 connectionId,
                 providerConfigKey,
                 session.provider,
-                rawCredentials,
-                ProviderAuthModes.OAuth2,
+                parsedRawCredentials,
                 session.connectionConfig,
                 session.accountId,
                 { ...callbackMetadata, ...tokenMetadata }
@@ -352,12 +353,13 @@ class OAuthController {
             .then((accessTokenResult) => {
                 logger.debug(`OAuth 1.0a for ${providerConfigKey} (connection: ${connectionId}) successful.`);
 
+                let parsedAccessTokenResult = connectionService.parseRawCredentials(accessTokenResult, ProviderAuthModes.OAuth1);
+
                 connectionService.upsertConnection(
                     connectionId,
                     providerConfigKey,
                     session.provider,
-                    accessTokenResult,
-                    ProviderAuthModes.OAuth1,
+                    parsedAccessTokenResult,
                     session.connectionConfig,
                     session.accountId,
                     metadata

diff --git a/packages/server/lib/services/connection.service.ts b/packages/server/lib/services/connection.service.ts
@@ -17,8 +17,7 @@ class ConnectionService {
         connectionId: string,
         providerConfigKey: string,
         provider: string,
-        rawCredentials: object,
-        authMode: ProviderAuthModes,
+        parsedRawCredentials: AuthCredentials,
         connectionConfig: Record<string, string>,
         accountId: number,
         metadata: Record<string, string>
@@ -30,7 +29,7 @@ class ConnectionService {
                 encryptionManager.encryptConnection({
                     connection_id: connectionId,
                     provider_config_key: providerConfigKey,
-                    credentials: this.parseRawCredentials(rawCredentials, authMode),
+                    credentials: parsedRawCredentials,
                     connection_config: connectionConfig,
                     account_id: accountId,
                     metadata: metadata