Added support for new permission request

src/stream.ts

@@ -151,6 +151,9 @@ export default class Stream {
       case 1100006:
       case 1100004:
         break;
+      case 1100011:
+        callback({ status: `Notification: ${data.custom.message}` });
+        break;
       default:
         callback(data);
     }

src/util/questions.ts

@@ -3,29 +3,36 @@ import tui from './tui';
 import { Manifest } from '../types/custom.d';
 import { OauthExternal21, OauthClient21 } from '../types/application.d';
 import Spinner from './spinner';
+import Wappsto from '../wappsto';
 
 type Request = {
+  method: string[],
   collection: string;
   message: string;
+  data?: Record<string, any>[],
   name_installation: string;
   type: string;
 };
 
 class Questions {
   private async ask(questions: any[]): Promise<any | false> {
-    Spinner.stop();
+    const start = Spinner.stop();
     let done = false;
     return new Promise<any | false>((resolve) => {
       const onCancel = () => {
-        Spinner.start();
+        if (start) {
+          Spinner.start();
+        }
         done = true;
         resolve(false);
         return false;
       };
       prompts(questions, { onCancel }).then((answers) => {
         if (!done) {
           done = true;
-          Spinner.start();
+          if (start) {
+            Spinner.start();
+          }
           resolve(answers);
         }
       });
@@ -543,8 +550,9 @@ class Questions {
     ]);
   }
 
-  precisePermissionRequest(
-    request: Request
+  async precisePermissionRequest(
+    request: Request,
+    wappsto: Wappsto,
   ): Promise<{ accept: boolean } | false> {
     let msg = '';
     let type = 'data';
@@ -556,7 +564,27 @@ class Questions {
     if (request.message) {
       msg = request.message;
     } else {
-      msg = `${request.name_installation} would like to save ${type} under your account. Allow?`;
+      const method = request.method?.length ? request.method[0] : 'save';
+      msg = `${request.name_installation} would like to ${method} ${type} under your account. Allow?`;
+      if (method === 'retrieve') {
+        if (request.data) {
+          const type = request.data[0].meta.type;
+          const id = request.data[0].meta.id;
+          const model = await wappsto.getModel(type, id);
+          if (model) {
+            if(model.name) {
+              msg = `${request.name_installation} would like access to the ${type} ${model.name} (${id}). Allow?`;
+            } else {
+              msg = `${request.name_installation} would like access to the ${type} with id ${id}. Allow?`;
+            }
+          } else {
+            Spinner.stop();
+            tui.unblock();
+            tui.showError(`Failed to find a ${type} with id ${id}`);
+            return false;
+          }
+        }
+      }
     }
 
     return this.ask([

src/util/spinner.ts

@@ -21,19 +21,26 @@ class Spinner {
     let i = 0;
 
     this.timer = setInterval(() => {
-      const str = this.frames[i % len];
-      i += 1;
-      clearLine(process.stdout, 0);
-      cursorTo(process.stdout, 0);
-      tui.write(`${str} ${this.title}`);
+      if (this.timer) {
+        const str = this.frames[i % len];
+        i += 1;
+        clearLine(process.stdout, 0);
+        cursorTo(process.stdout, 0);
+        tui.write(`${str} ${this.title}`);
+      }
     }, 80);
   }
 
-  stop(): void {
+  stop(): boolean {
+    if (!this.timer) {
+      return false;
+    }
+
     clearLine(process.stdout, 0);
     cursorTo(process.stdout, 0);
     clearInterval(this.timer);
     this.timer = undefined;
+    return true;
   }
 }
 

src/util/tui.ts

@@ -20,8 +20,12 @@ class Tui {
   }
 
   clear(): void {
-    clearLine(process.stdout, 0);
-    cursorTo(process.stdout, 0);
+    if (this.blocked) {
+      this.blocked.push('');
+    } else {
+      clearLine(process.stdout, 0);
+      cursorTo(process.stdout, 0);
+    }
   }
 
   header(text: string): Promise<void> {
@@ -50,8 +54,13 @@ class Tui {
 
     if (tmp) {
       tmp.forEach((item) => {
-        /* istanbul ignore next */
-        this.write(item);
+        if (item === '') {
+          /* istanbul ignore next */
+          this.clear();
+        } else {
+          /* istanbul ignore next */
+          this.write(item);
+        }
       });
     }
   }

src/util/version.ts

@@ -1,2 +1,2 @@
-const VERSION = '2.0.18';
+const VERSION = '2.0.19';
 export { VERSION };

src/wapp.serve.ts

@@ -149,29 +149,35 @@ export default class ServeWapp extends UpdateWapp {
             );
           }
         } else if (data.req.collection) {
-          const answers = await questions.precisePermissionRequest(data.req);
+          const answers = await questions.precisePermissionRequest(data.req, this.wappsto);
           if (answers === false) {
             /* istanbul ignore next */
             return;
           }
 
           if (answers.accept) {
-            if (data.req.method[0] === 'add') {
-              await this.wappsto.updateACLRestriction(
-                data.installation,
-                data.req.collection
-              );
-            } else {
-              tui.showWarning(
-                `Unknown '${data.req.method[0]}' permission request`
-              );
+            switch(data.req.method[0]) {
+              case 'add': 
+                await this.wappsto.updateACLRestriction(
+                  data.installation,
+                  data.req.collection
+                );
+                break;
+              case 'retrieve':
+                await this.wappsto.updateACLAccess(data.req.data[0].meta.id, data.installation);
+                break;
+              default:
+                tui.showWarning(
+                  `Unknown '${data.req.method[0]}' permission request`
+                );
+                break;
             }
             await this.wappsto.readNotification(data.id, 'accepted');
           } else {
             await this.wappsto.readNotification(data.id, 'denied');
           }
         } else if (data.req.name_installation) {
-          const answers = await questions.precisePermissionRequest(data.req);
+          const answers = await questions.precisePermissionRequest(data.req, this.wappsto);
           if (answers === false) {
             /* istanbul ignore next */
             return;

src/wappsto.ts

@@ -98,6 +98,28 @@ export default class Wappsto {
     }
   }
 
+  async updateACLAccess(
+    modelID: string,
+    installationID: string
+  ): Promise<void> {
+    try {
+      // Append the new user to the acl restriction for the item
+      await HTTP.patch(
+        `${this.HOST}/services/2.1/acl?id=${modelID}&propagate=true`,
+        {
+          permission: [
+            {
+              meta: { id: installationID },
+              restriction: [{ method: { retrieve: true } }],
+            },
+          ],
+        }
+      );
+    } catch (err) {
+      tui.showError('Failed to update ACL Access', err);
+    }
+  }
+
   async find(
     type: string,
     search: string,
@@ -134,4 +156,18 @@ export default class Wappsto {
       }
     }
   }
+
+  async getModel(
+    type: string,
+    id: string
+  ): Promise<Record<string, any> | undefined> {
+    let result = undefined;
+    try {
+      const response = await HTTP.get(`${this.HOST}/services/${type}/${id}`);
+      result = response.data;
+    } catch (err) {
+      tui.showError('Failed to get model', err);
+    }
+    return result;
+  }
 }