add property to schema

mozilla · Jul 19, 2017 · 32a0827 · 32a0827
1 parent a0c58ef
commit 32a0827
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/docs/api.md b/docs/api.md
@@ -1202,6 +1202,12 @@ for the authenticated user.
 
   <!--end-response-body-get-accountsessions-isCurrentDevice-->
 
+* `isMemoryToken`: *boolean*
+
+  <!--begin-response-body-get-accountsessions-isMemoryToken-->
+
+  <!--end-response-body-get-accountsessions-isMemoryToken-->
+
 
 #### POST /account/device/destroy
 

diff --git a/lib/routes/devices-sessions.js b/lib/routes/devices-sessions.js
@@ -326,7 +326,8 @@ module.exports = (log, db, config, customs, push, devices) => {
             deviceCallbackPublicKey: isA.string().max(88).regex(URL_SAFE_BASE_64).optional().allow('').allow(null),
             deviceCallbackAuthKey: isA.string().max(24).regex(URL_SAFE_BASE_64).optional().allow('').allow(null),
             isDevice: isA.boolean().required(),
-            isCurrentDevice: isA.boolean().required()
+            isCurrentDevice: isA.boolean().required(),
+            isMemoryToken: isA.boolean()
           }))
         }
       },
@@ -372,7 +373,8 @@ module.exports = (log, db, config, customs, push, devices) => {
                   request.headers['accept-language']
                 ),
                 os: session.uaOS,
-                userAgent
+                userAgent,
+                isMemoryToken: session.isMemoryToken || false
               }
             }))
           },

diff --git a/test/local/routes/devices-sessions.js b/test/local/routes/devices-sessions.js
@@ -514,13 +514,15 @@ describe('/account/sessions', () => {
       tokenId: tokenIds[0], uid: 'qux', createdAt: times[0], lastAccessTime: times[1],
       uaBrowser: 'Firefox', uaBrowserVersion: '50', uaOS: 'Windows', uaOSVersion: '10',
       uaDeviceType: null, deviceId: null, deviceCreatedAt: times[2],
-      deviceCallbackURL: 'callback', deviceCallbackPublicKey: 'publicKey', deviceCallbackAuthKey: 'authKey'
+      deviceCallbackURL: 'callback', deviceCallbackPublicKey: 'publicKey', deviceCallbackAuthKey: 'authKey',
+      isMemoryToken: true
     },
     {
       tokenId: tokenIds[1], uid: 'wibble', createdAt: times[3], lastAccessTime: times[4],
       uaBrowser: 'Nightly', uaBrowserVersion: null, uaOS: 'Android', uaOSVersion: '6',
       uaDeviceType: 'mobile', deviceId: 'deviceId', deviceCreatedAt: times[5],
-      deviceCallbackURL: null, deviceCallbackPublicKey: null, deviceCallbackAuthKey: null
+      deviceCallbackURL: null, deviceCallbackPublicKey: null, deviceCallbackAuthKey: null,
+      isMemoryToken: true
     },
     {
       tokenId: tokenIds[2], uid: 'blee', createdAt: times[6], lastAccessTime: times[7],
@@ -559,7 +561,8 @@ describe('/account/sessions', () => {
           lastAccessTime: times[1],
           lastAccessTimeFormatted: 'a few seconds ago',
           os: 'Windows',
-          userAgent: 'Firefox 50'
+          userAgent: 'Firefox 50',
+          isMemoryToken: true
         },
         {
           deviceId: 'deviceId',
@@ -574,7 +577,8 @@ describe('/account/sessions', () => {
           lastAccessTime: times[4],
           lastAccessTimeFormatted: 'a few seconds ago',
           os: 'Android',
-          userAgent: 'Nightly'
+          userAgent: 'Nightly',
+          isMemoryToken: true
         },
         {
           deviceId: 'deviceId',
@@ -589,7 +593,8 @@ describe('/account/sessions', () => {
           lastAccessTime: times[7],
           lastAccessTimeFormatted: 'a few seconds ago',
           os: null,
-          userAgent: ''
+          userAgent: '',
+          isMemoryToken: false
         },
       ])
     })