Add support for did.request in frontend

block-core · Oct 8, 2023 · 07de06e · 07de06e
1 parent 6a06a3f
commit 07de06e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/angular/src/app/loading/loading.component.ts b/angular/src/app/loading/loading.component.ts
@@ -40,7 +40,7 @@ export class LoadingComponent implements OnInit, OnDestroy {
     private orchestrator: OrchestratorService,
     private runtime: RuntimeService,
     @Inject(DOCUMENT) private document: Document
-  ) {}
+  ) { }
 
   ngOnDestroy(): void {
     if (this.sub) {
@@ -52,6 +52,18 @@ export class LoadingComponent implements OnInit, OnDestroy {
     window.location.href = 'index.html';
   }
 
+  hasJsonStructure(str: any) {
+    if (typeof str !== 'string') return false;
+    try {
+      const result = JSON.parse(str);
+      const type = Object.prototype.toString.call(result);
+      return type === '[object Object]'
+        || type === '[object Array]';
+    } catch (err) {
+      return false;
+    }
+  }
+
   instanceName: string;
 
   async ngOnInit() {
@@ -133,10 +145,13 @@ export class LoadingComponent implements OnInit, OnDestroy {
       }
 
       if (parameters.action) {
+        // Transform the content to be displayed to user.
+        const parsedContent = this.hasJsonStructure(parameters.content) ? JSON.parse(parameters.content) : parameters.content;
+
         this.uiState.action = {
           action: parameters.action,
           id: parameters.id,
-          content: JSON.parse(parameters.content), // Transform the content to be displayed to user.
+          content: parsedContent,
           params: JSON.parse(parameters.params), // Transform the params from string to object here after we've received it through the query string.
           app: parameters.app,
           verify: verify,

diff --git a/angular/src/app/services/frontend.service.ts b/angular/src/app/services/frontend.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, OnInit, NgZone } from '@angular/core';
+import { Injectable, OnInit, NgZone, Inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { DecentralizedWebNode, Message, MessageService } from 'src/shared';
 import { BackgroundManager, ProcessResult } from 'src/shared/background-manager';
@@ -9,6 +9,7 @@ import { EventBus } from '../../shared/event-bus';
 import { SettingsService } from './settings.service';
 import { StateService } from './state.service';
 import { WalletManager } from './wallet-manager';
+import { DOCUMENT } from '@angular/common';
 
 @Injectable({
   providedIn: 'root',
@@ -21,6 +22,7 @@ export class FrontendService implements OnInit {
   private indexing: boolean;
 
   constructor(
+    @Inject(DOCUMENT) private document: Document,
     private ngZone: NgZone,
     private walletManager: WalletManager,
     private events: EventBus,
@@ -78,6 +80,14 @@ export class FrontendService implements OnInit {
           await this.state.refresh();
           return 'ok';
         }
+        case 'did.request': {
+          debugger;
+          const msg = message as any;
+          let url = msg.request.params[0].callback;
+          url = url.replace('%s', msg.key); // This is the DID.
+          this.document.location.href = url;
+          return 'ok';
+        }
         case 'reload': {
           // console.log('Wallet / Account might be deleted, so we must reload state.');
           await this.state.reload();
@@ -186,7 +196,7 @@ export class FrontendService implements OnInit {
   runIndexer = async () => {
     // Stop and ensure watcher doesn't start up while indexer is running.
     if (this.watchManager) {
-      this.watchManager.onStopped = () => {};
+      this.watchManager.onStopped = () => { };
       this.watchManager.stop();
       this.watchManager = null;
     }