Merge pull request #81 from MainframeHQ/integration-tests

Integration tests for dev app creation flow, permissions fixes

Author: PaulLeCam

README.md

@@ -130,6 +130,12 @@ Once your Swarm node is running and you vault settings updated you can publish y
 ./packages/cli/bin/run app:publishContents --id <APP_ID>
 ```
 
+If you don't know your app's ID, you can view details of all your apps by running:
+
+```
+./packages/cli/bin/run app:list
+```
+
 When the upload is complete, you should be presented with a swarm hash, used to identify the location of your contents in the network.
 
 #### 2. Write the App Manifest File

packages/app-permissions/src/index.js

@@ -22,6 +22,27 @@ export const EMPTY_DEFINITIONS: StrictPermissionsDefinitions = {
   WEB_REQUEST: [],
 }
 
+export const definitionsExist = (
+  definitions: StrictPermissionsDefinitions,
+): boolean => {
+  if (!definitions) {
+    return false
+  }
+  return Object.keys(definitions).length > 1 || !!definitions.WEB_REQUEST.length
+}
+
+export const havePermissionsToGrant = (
+  requirements: ?StrictPermissionsRequirements,
+): boolean => {
+  if (!requirements) {
+    return false
+  }
+  return (
+    definitionsExist(requirements.optional) ||
+    definitionsExist(requirements.required)
+  )
+}
+
 export const createWebRequestGrant = (
   granted?: WebRequestDefinition = [],
   denied?: WebRequestDefinition = [],

packages/cli/manifest.json

@@ -0,0 +1 @@
+{"version":1,"contents":{"version":1,"type":"signed","signed":{"keys":["Bhrta1toa8zb+CAuA+QbunDZGyC6IyBMnl8L4aPM/1k=","YSMwHof04iqgwFg7f80P3ROAW6+/MMmqcFBfyXNkPv8="],"message":"3pDWLtB/fs+//XbUObKRhlmMj5g+OTsKGJ2qyz4LjaMw7Y3fhEwL7CnBUJcN5nNTwlxr8fiZVurPtXQnxItXDvnzo+FSLyJTZj/VQWbHrc8KLnVVKbXV9aNcpBPMVs0VndKVWZ/axTAJW0VWBMpal19rfNb5ppyhwTsZJld9sgt7ImlkIjoidXJuOmVkMjU1MTktcHViLW11bHRpYmFzZTp1QmhydGExdG9hOHpiLUNBdUErUWJ1bkRaR3lDNkl5Qk1ubDhMNGFQTV8xayIsImF1dGhvciI6eyJpZCI6InVybjplZDI1NTE5LXB1Yi1tdWx0aWJhc2U6dVlTTXdIb2YwNGlxZ3dGZzdmODBQM1JPQVc2LV9NTW1xY0ZCZnlYTmtQdjgifSwibmFtZSI6Im1peGVkIiwidmVyc2lvbiI6IjEuMC4wIiwiY29udGVudHNVUkkiOiJ1cm46Ynp6OmIzYzUwMDI1ZTM3NDljNDY0NmZkNzIxM2JiYWFiNjAyY2EyMWIwY2YwOGJhOWVkMWJlYTUyMzZmOGNhMDUzYWEiLCJwZXJtaXNzaW9ucyI6eyJvcHRpb25hbCI6eyJTV0FSTV9ET1dOTE9BRCI6dHJ1ZSwiU1dBUk1fVVBMT0FEIjp0cnVlLCJXRUJfUkVRVUVTVCI6WyJtYWluZnJhbWUuY29tIl19LCJyZXF1aXJlZCI6eyJCTE9DS0NIQUlOX1NFTkQiOnRydWUsIldFQl9SRVFVRVNUIjpbXX19fQ=="}}}

packages/cli/src/commands/app/list.js

@@ -0,0 +1,31 @@
+// @flow
+import util from 'util'
+
+import Command from '../../OpenVaultCommand'
+
+export default class AppListCommand extends Command {
+  static description = `List apps you've created and installed`
+  static flags = Command.flags
+
+  async run() {
+    // $FlowFixMe: indexer property
+    const res = await this.client.app.getAll()
+    Object.keys(res).forEach(type => {
+      this.log(`\n${type === 'own' ? 'Created' : 'Installed'} Apps\n`)
+      res[type].forEach(app => {
+        this.log(`\n  ${app.manifest.name}, v${app.manifest.version}\n`)
+        this.log('      ID:', app.appID)
+        if (type === 'own') {
+          this.log('     MainframeID: ', app.manifest.mainframeID)
+          this.log('     Developer: ', app.manifest.developerID)
+          this.log('     Contents Path: ', app.manifest.contentsPath)
+        } else {
+          this.log('     Author: ', app.manifest.author.id)
+          this.log('     Contents URI: ', app.manifest.contentsURI)
+          this.log('     Permissions: ', util.inspect(app.manifest.permissions))
+        }
+        this.log('     Users: ', app.users, '\n')
+      })
+    })
+  }
+}

packages/cli/src/commands/identity/list.js

@@ -5,17 +5,13 @@ import { prompt } from 'inquirer'
 import Command from '../../OpenVaultCommand'
 
 export default class IdentityListCommand extends Command {
-  static description = 'Manage Identities'
+  static description = 'List Identities'
   static flags = Command.flags
 
   async run() {
-    const client = this.createClient()
-    if (client == null) {
-      return
-    }
     const func = await promptSelectCommand()
     // $FlowFixMe: indexer property
-    const res = await client[func]()
+    const res = await this.client.identity[func]()
     Object.keys(res).forEach(type => {
       res[type].forEach(identity => {
         this.log('\nid: ', identity.id)
@@ -27,8 +23,8 @@ export default class IdentityListCommand extends Command {
 
 const promptSelectCommand = async () => {
   const identityListMethods = {
-    'Own Developers': 'getOwnDeveloperIdentities',
-    'Own Users': 'getOwnUserIdentities',
+    'Own Developers': 'getOwnDevelopers',
+    'Own Users': 'getOwnUsers',
   }
   const answers = await prompt([
     {

packages/daemon/src/app/AbstractApp.js

@@ -112,10 +112,6 @@ export default class AbstractApp {
     }
   }
 
-  getPermissionsChecked(userID: ID): boolean {
-    return this.getSettings(userID).permissionsChecked
-  }
-
   setPermissionsChecked(userID: ID, checked: boolean) {
     const settings = this.getSettings(userID)
     settings.permissionsChecked = checked

packages/daemon/src/app/App.js

@@ -3,6 +3,7 @@
 import type { ManifestData } from '@mainframe/app-manifest'
 import {
   createWebRequestGrant,
+  havePermissionsToGrant,
   mergeGrantsToDetails,
   PERMISSION_KEYS_BOOLEAN,
   type StrictPermissionsGrants,
@@ -65,6 +66,13 @@ export default class App extends AbstractApp {
     return this._manifest
   }
 
+  getPermissionsChecked(userID: ID): boolean {
+    if (!havePermissionsToGrant(this._manifest.permissions)) {
+      return true
+    }
+    return this.getSettings(userID).permissionsChecked
+  }
+
   // Session
 
   createSession(userID: ID): SessionData {

packages/daemon/src/rpc/methods/app.js

@@ -146,6 +146,7 @@ export const getAll = (ctx: RequestContext): AppGetAllResult => {
           acc.push({
             id: toClientID(id),
             data: user.data,
+            settings: app.getSettings(id),
           })
         }
         return acc

packages/launcher/src/renderer/launcher/AppInstallModal.js

@@ -1,7 +1,12 @@
 //@flow
 
-import type { PermissionsGrants } from '@mainframe/app-permissions'
+import {
+  havePermissionsToGrant,
+  type StrictPermissionsGrants,
+  createStrictPermissionGrants,
+} from '@mainframe/app-permissions'
 import type { ID } from '@mainframe/client'
+import type { ManifestData } from '@mainframe/app-manifest'
 import React, { createRef, Component, type ElementRef } from 'react'
 import { View, StyleSheet } from 'react-native-web'
 
@@ -10,7 +15,7 @@ import Text from '../UIComponents/Text'
 import ModalView from '../UIComponents/ModalView'
 
 import rpc from './rpc'
-import PermissionsView, { type PermissionOptions } from './PermissionsView'
+import PermissionsView from './PermissionsView'
 import IdentitySelectorView from './IdentitySelectorView'
 
 type Props = {
@@ -27,11 +32,8 @@ type User = {
 type State = {
   inputValue: string,
   installStep: 'manifest' | 'identity' | 'permissions' | 'download',
-  manifest: ?{
-    name: string,
-    permissions: PermissionOptions,
-  },
-  userPermissions?: PermissionsGrants,
+  manifest: ?ManifestData,
+  userPermissions?: StrictPermissionsGrants,
   userId?: ID,
   ownUsers: Array<User>,
 }
@@ -85,7 +87,7 @@ export default class AppInstallModal extends Component<Props, State> {
     }
   }
 
-  onSubmitPermissions = (userPermissions: PermissionsGrants) => {
+  onSubmitPermissions = (userPermissions: StrictPermissionsGrants) => {
     this.setState(
       {
         installStep: 'download',
@@ -107,7 +109,21 @@ export default class AppInstallModal extends Component<Props, State> {
   }
 
   onSelectId = (id: ID) => {
-    this.setState({ installStep: 'permissions', userId: id })
+    const { manifest } = this.state
+    if (
+      manifest &&
+      manifest.permissions &&
+      havePermissionsToGrant(manifest.permissions)
+    ) {
+      this.setState({
+        installStep: 'permissions',
+        userId: id,
+      })
+    } else {
+      this.setState({ userId: id })
+      const strictGrants = createStrictPermissionGrants({})
+      this.onSubmitPermissions(strictGrants)
+    }
   }
 
   onCreatedId = () => {

packages/launcher/src/renderer/launcher/IdentitySelectorView.js

@@ -28,7 +28,7 @@ type Props = {
   identities: Array<Identity>,
   enableCreate?: boolean,
   onSelectId: (id: ID) => any,
-  onCreatedId?: (id: ID) => void,
+  onCreatedId?: (id: ID) => any,
 }
 
 type State = {
@@ -47,7 +47,7 @@ export default class IdentitySelectorView extends Component<Props, State> {
     this.createId()
   }
 
-  async createId() {
+  createId = async () => {
     try {
       let createIdentity
       switch (this.props.type) {