Merge branch 'master' into more_endpoints

* master: Apply CORS headers to every endpoint for Web vault (#33)
vvondra · Sep 2, 2018 · 0a2b7ef · 0a2b7ef
2 parents d4592fe + 3e4aa04
commit 0a2b7ef
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 84 deletions.
diff --git a/src/ciphers.js b/src/ciphers.js
@@ -31,10 +31,7 @@ export const postHandler = async (event, context, callback) => {
 
     await touch(user);
 
-    callback(null, {
-      statusCode: 200,
-      body: JSON.stringify({ ...mapCipher(cipher), Edit: true }),
-    });
+    callback(null, utils.okResponse({ ...mapCipher(cipher), Edit: true }));
   } catch (e) {
     callback(null, utils.serverError('Server error saving vault item', e));
   }
@@ -80,10 +77,7 @@ export const putHandler = async (event, context, callback) => {
     cipher = await cipher.updateAsync();
     await touch(user);
 
-    callback(null, {
-      statusCode: 200,
-      body: JSON.stringify({ ...mapCipher(cipher), Edit: true }),
-    });
+    callback(null, utils.okResponse({ ...mapCipher(cipher), Edit: true }));
   } catch (e) {
     callback(null, utils.serverError('Server error saving vault item', e));
   }
@@ -108,10 +102,7 @@ export const deleteHandler = async (event, context, callback) => {
     await Cipher.destroyAsync(user.get('uuid'), cipherUuid);
     await touch(user);
 
-    callback(null, {
-      statusCode: 200,
-      body: '',
-    });
+    callback(null, utils.okResponse(''));
   } catch (e) {
     callback(null, utils.validationError(e.toString()));
   }

diff --git a/src/folders.js b/src/folders.js
@@ -33,10 +33,7 @@ export const postHandler = async (event, context, callback) => {
     });
     await touch(user);
 
-    callback(null, {
-      statusCode: 200,
-      body: JSON.stringify(mapFolder(folder)),
-    });
+    callback(null, utils.okResponse(mapFolder(folder)));
   } catch (e) {
     callback(null, utils.serverError('Server error saving folder', e));
   }
@@ -82,10 +79,7 @@ export const putHandler = async (event, context, callback) => {
 
     folder = await folder.updateAsync();
 
-    callback(null, {
-      statusCode: 200,
-      body: JSON.stringify(mapFolder(folder)),
-    });
+    callback(null, utils.okResponse(mapFolder(folder)));
   } catch (e) {
     callback(null, utils.serverError('Server error saving folder', e));
   }
@@ -110,10 +104,7 @@ export const deleteHandler = async (event, context, callback) => {
     await Folder.destroyAsync(user.get('uuid'), folderUuid);
     await touch(user);
 
-    callback(null, {
-      statusCode: 200,
-      body: '',
-    });
+    callback(null, utils.okResponse(''));
   } catch (e) {
     callback(null, utils.validationError(e.toString()));
   }

diff --git a/src/import.js b/src/import.js
@@ -1,4 +1,4 @@
-import { normalizeBody, validationError } from './lib/api_utils';
+import { normalizeBody, validationError, okResponse } from './lib/api_utils';
 import { Cipher, Folder } from './lib/models';
 import { loadContextFromHeader, buildCipherDocument, touch } from './lib/bitwarden';
 
@@ -142,8 +142,5 @@ export const postHandler = async (event, context, callback) => {
 
   await touch(user);
 
-  callback(null, {
-    statusCode: 200,
-    body: '',
-  });
+  callback(null, okResponse(''));
 };
diff --git a/src/keys.js b/src/keys.js
@@ -43,29 +43,25 @@ export const handler = async (event, context, callback) => {
   await user.updateAsync();
 
   try {
-    callback(null, {
-      statusCode: 200,
-      headers: utils.CORS_HEADERS,
-      body: JSON.stringify({
-        access_token: tokens.accessToken,
-        expires_in: DEFAULT_VALIDITY,
-        token_type: 'Bearer',
-        refresh_token: tokens.refreshToken,
-        Key: user.get('key'),
-        Id: user.get('uuid'),
-        Name: user.get('name'),
-        Email: user.get('email'),
-        EmailVerified: user.get('emailVerified'),
-        Premium: user.get('premium'),
-        MasterPasswordHint: user.get('passwordHint'),
-        Culture: user.get('culture'),
-        TwoFactorEnabled: user.get('totpSecret'),
-        PrivateKey: user.get('privateKey'),
-        SecurityStamp: user.get('securityStamp'),
-        Organizations: '[]',
-        Object: 'profile',
-      }),
-    });
+    callback(null, utils.okResponse({
+      access_token: tokens.accessToken,
+      expires_in: DEFAULT_VALIDITY,
+      token_type: 'Bearer',
+      refresh_token: tokens.refreshToken,
+      Key: user.get('key'),
+      Id: user.get('uuid'),
+      Name: user.get('name'),
+      Email: user.get('email'),
+      EmailVerified: user.get('emailVerified'),
+      Premium: user.get('premium'),
+      MasterPasswordHint: user.get('passwordHint'),
+      Culture: user.get('culture'),
+      TwoFactorEnabled: user.get('totpSecret'),
+      PrivateKey: user.get('privateKey'),
+      SecurityStamp: user.get('securityStamp'),
+      Organizations: '[]',
+      Object: 'profile',
+    }));
   } catch (e) {
     callback(null, utils.serverError('Internal error', e));
   }

diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
@@ -23,6 +23,15 @@ export const CORS_HEADERS = {
   'access-control-allow-headers': 'Content-Type,Authorization,Accept,Device-type,Pragma,Cache-Control',
 };
 
+export function okResponse(body) {
+  console.log('Success response', { body });
+  return {
+    statusCode: 200,
+    headers: CORS_HEADERS,
+    body: typeof body === 'string' ? body : JSON.stringify(body),
+  };
+}
+
 export function validationError(message) {
   console.log('Validation error', { message });
   return {

diff --git a/src/login.js b/src/login.js
@@ -149,18 +149,14 @@ export const handler = async (event, context, callback) => {
 
     device = await device.updateAsync();
 
-    callback(null, {
-      statusCode: 200,
-      headers: utils.CORS_HEADERS,
-      body: JSON.stringify({
-        access_token: tokens.accessToken,
-        expires_in: DEFAULT_VALIDITY,
-        token_type: 'Bearer',
-        refresh_token: tokens.refreshToken,
-        Key: user.get('key'),
-        PrivateKey: (user.get('privateKey') || '').toString('utf8'),
-      }),
-    });
+    callback(null, utils.okResponse({
+      access_token: tokens.accessToken,
+      expires_in: DEFAULT_VALIDITY,
+      token_type: 'Bearer',
+      refresh_token: tokens.refreshToken,
+      Key: user.get('key'),
+      PrivateKey: (user.get('privateKey') || '').toString('utf8'),
+    }));
   } catch (e) {
     callback(null, utils.serverError('Internal error', e));
   }

diff --git a/src/prelogin.js b/src/prelogin.js
@@ -22,12 +22,8 @@ export const handler = async (event, context, callback) => {
     return;
   }
 
-  callback(null, {
-    statusCode: 200,
-    headers: utils.CORS_HEADERS,
-    body: JSON.stringify({
-      Kdf: KDF_PBKDF2,
-      KdfIterations: user.get('kdfIterations') || KDF_PBKDF2_ITERATIONS_DEFAULT,
-    }),
-  });
+  callback(null, utils.okResponse({
+    Kdf: KDF_PBKDF2,
+    KdfIterations: user.get('kdfIterations') || KDF_PBKDF2_ITERATIONS_DEFAULT,
+  }));
 };
diff --git a/src/register.js b/src/register.js
@@ -32,20 +32,14 @@ export const handler = async (event, context, callback) => {
       .select('COUNT')
       .execAsync();
 
-    console.log(existingUser);
-
     if (existingUser.Count > 0) {
       callback(null, utils.validationError('E-mail already taken'));
       return;
     }
 
     await User.createAsync(buildUserDocument(body));
 
-    callback(null, {
-      statusCode: 200,
-      headers: utils.CORS_HEADERS,
-      body: '',
-    });
+    callback(null, utils.okResponse(''));
   } catch (e) {
     callback(null, utils.serverError(e.message, e));
   }

diff --git a/src/sync.js b/src/sync.js
@@ -37,9 +37,5 @@ export const handler = async (event, context, callback) => {
     Object: 'sync',
   };
 
-  callback(null, {
-    statusCode: 200,
-    headers: utils.CORS_HEADERS,
-    body: JSON.stringify(response),
-  });
+  callback(null, utils.okResponse(response));
 };