Host the static website separately from api in the LIVE environment

This simplifies routing and the deployment structure and makes the dev
env more similar to the production ones.

Author: Jan Mikolajczak

README.md

@@ -1,12 +1,10 @@
 # Aviary
 There are two components, aviary-api and aviary-angular with the front-end code.
-They are designed to run together as a single 
-[gae](https://cloud.google.com/appengine/docs/standard/java/runtime-java8)
-app, currently available at https://aviary-130922.appspot.com
+The aviary-angular module is an angular website, hosted on a static-files bucket.
+The aviary-api module is a [gae app](https://cloud.google.com/appengine/docs/standard/java/runtime-java8).
 
 ## Releasing
-1. Build the frontend (see its README)
-2. Deploy the backend (see its README), the deployment will include the front-end build
+The two modules need to be released separately, see respective READMES for instructions
 
 ## Services used
 Aviary uses 
@@ -36,4 +34,4 @@ To provide a range of sign-in options for users, aviary utilises firebase.
 ### A user authentication flow:
 1. Front-end talks directly to firebase to login a user, obtaining an auth token
 1. It passes the firebase id and token to the backend with requests
-1. The backed uses firebase sdk to authenticate the token
+1. The backed uses authenticates the token

aviary-angular/README.md

@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
 
 ## Build
 Run `ng build` to build the project into  the `dist/` directory.
-`dist/` will be included in the server deployment as the frontend resources. Run before deploying.
+This `dist/` should be deployed to one of the website-hosting buckets in Google storage under the appropriate name.
 Use the `--env=prod` flag for a production build. Ideally we'd use the `--prod` flag which also turns AOT compilation
 on, but this throws an error at the time of writing.  
 

aviary-angular/src/environments/environment.prod.ts

@@ -1,5 +1,5 @@
 // noinspection JSUnusedGlobalSymbols
 export const environment = {
   production: true,
-  apiAddress: "/api/"
+  apiAddress: "https://aviary-130922.appspot.com/api/"
 };

aviary-api/README.md

@@ -44,16 +44,15 @@ To run the application:`mvn appengine:run`
 To use visit: http://localhost:8080/
 
 ### Deploying
-1. First, make sure aviary-angular has been built into its /dist folder.
-2. Set up a Google App Enginge Deployment (Tools -> Google Cloud Tools -> Deploy to App Engine)
+Set up a Google App Enginge Deployment (Tools -> Google Cloud Tools -> Deploy to App Engine)
    * As `Deployment:` select `Maven Build: aviary-api`
    * Log in to your google account and select the `aviary-130922` project
 
 (This may not be possible without the plugin at the moment. If it is, something along the lines of 
 `mvn package appengine:deploy`
 might work, but it's not tested)
 
-To use vist:  https://aviary-130922.appspot.com
+The api gets deployed to: https://aviary-130922.appspot.com.
 
 ## Testing
 

aviary-api/pom.xml

@@ -32,7 +32,6 @@ limitations under the License.
 
   <dependencies>
     <dependency>
-      <!--TODO update and see if servlets 3.0 work on deployment -->
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
       <version>1.9.54</version>
@@ -211,13 +210,6 @@ limitations under the License.
         <configuration>
           <archiveClasses>true</archiveClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
-          <webResources>
-            <resource>
-              <!-- Would be good to add a step capable of building this - rn it needs `ng build -prod -e` run-->
-              <!-- this is relative to the pom.xml directory -->
-              <directory>../aviary-angular/dist/</directory>
-            </resource>
-          </webResources>
         </configuration>
       </plugin>
       <!-- [START cloudplugin] -->

aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/controllers/ApiResponseFilter.kt

@@ -1,14 +1,18 @@
 package eu.bluehawkqs.aviary.api.controllers
 
+import com.google.appengine.api.utils.SystemProperty
 import javax.ws.rs.container.ContainerRequestContext
 import javax.ws.rs.container.ContainerResponseContext
 import javax.ws.rs.container.ContainerResponseFilter
 
 class ApiResponseFilter : ContainerResponseFilter {
     override fun filter(requestContext: ContainerRequestContext, responseContext: ContainerResponseContext) {
         responseContext.headers.apply {
-            // TODO Investigate setting up a proxy in dev angular to remove all cross-origin stuff. either way tighten this up
-            add("Access-Control-Allow-Origin", "*")
+            add("Access-Control-Allow-Origin", when(SystemProperty.environment.value()) {
+                SystemProperty.Environment.Value.Production -> "http://aviary.bluehawkqs.eu"
+                SystemProperty.Environment.Value.Development -> "http://localhost:4200"
+                else -> throw Exception("Environment not recognised")
+            })
             add("Access-Control-Allow-Headers", "Authorization")
             add("Access-Control-Allow-Headers", "Content-Type")
         }

aviary-api/src/main/webapp/WEB-INF/web.xml

@@ -4,16 +4,6 @@
     <listener-class>eu.bluehawkqs.aviary.api.di.DaggerServletContextListener</listener-class>
   </listener>
 
-
-  <servlet>
-    <servlet-name>Index</servlet-name>
-    <jsp-file>/index.html</jsp-file>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Index</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>Jersey Web Application</servlet-name>
     <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
@@ -40,4 +30,5 @@
     <servlet-name>Jersey Web Application</servlet-name>
     <url-pattern>/api/*</url-pattern>
   </servlet-mapping>
+
 </web-app>