Manifest.json bugfix #675

Changed how we get the webapp hosted url for the manifest.json

Author: Persijn Kwekkeboom

build.gradle

@@ -21,6 +21,7 @@ node {
 dependencies {
     compile "com.enonic.xp:core-api:${xpVersion}"
     compile "com.enonic.xp:portal-api:${xpVersion}"
+    implementation "com.enonic.xp:web-api:${xpVersion}"
     include "com.enonic.xp:lib-auth:${xpVersion}"
     include "com.enonic.xp:lib-content:${xpVersion}"
     include "com.enonic.xp:lib-context:${xpVersion}"

src/main/java/com/enonic/app/officeleague/VhostHandler.java

@@ -0,0 +1,24 @@
+package com.enonic.app.officeleague;
+
+import com.enonic.xp.portal.PortalRequest;
+import com.enonic.xp.script.bean.BeanContext;
+import com.enonic.xp.script.bean.ScriptBean;
+import com.enonic.xp.web.vhost.VirtualHostHelper;
+
+public class VhostHandler
+    implements ScriptBean
+{
+    protected PortalRequest request;
+
+    @Override
+    public void initialize( final BeanContext context )
+    {
+        this.request = context.getBinding( PortalRequest.class ).get();
+    }
+
+    public String getVirtualHost() {
+        return VirtualHostHelper.getVirtualHost(this.request.getRawRequest())
+            .getHost();
+
+    }
+}

src/main/resources/lib/pwa/manifest-controller.js

@@ -2,14 +2,18 @@ var portalLib = require('/lib/xp/portal');
 var mustache = require('/lib/mustache');
 
 exports.get = function(req) {
-    var startUrl = portalLib.url({ path: "/", type: "absolute" });
+
+    var bean = __.newBean('com.enonic.app.officeleague.VhostHandler');
+    const vhost = bean.getVirtualHost();
+
+    var startUrl = vhost + "/app";
 
     var params = {
         startUrl,
         iconUrl : portalLib.assetUrl({path: '/icons'})
     };
     var res = mustache.render(resolve('manifest.json'), params);
-    
+
     return {
         body: res,
         contentType: 'application/json'

src/main/resources/lib/pwa/manifest.json

@@ -1,6 +1,7 @@
 {
   "name": "Office League",
   "short_name": "Office League",
+  "id": "office league",
   "description": "Foosball app for leagues, teams, matches and score keeping",
   "theme_color": "#1C2641",
   "background_color": "#1C2641",