diff --git a/pom.xml b/pom.xml index 062268e..2d5d9c8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 rs.in.zivanovic share-a-secret-api - 1.0.0-SNAPSHOT + 1.0.0 share-a-secret-api Share-a-Secret REST API service. @@ -59,4 +59,4 @@ UTF-8 1.8 - \ No newline at end of file + diff --git a/src/main/java/rs/in/zivanovic/share/a/secret/api/SimpleCorsFilter.java b/src/main/java/rs/in/zivanovic/share/a/secret/api/SimpleCorsFilter.java new file mode 100644 index 0000000..a9c0b29 --- /dev/null +++ b/src/main/java/rs/in/zivanovic/share/a/secret/api/SimpleCorsFilter.java @@ -0,0 +1,57 @@ +/* + * The MIT License + * + * Copyright 2014 Marko Zivanovic. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package rs.in.zivanovic.share.a.secret.api; + +import java.io.IOException; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; + +@Component +public class SimpleCorsFilter implements Filter { + + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { + HttpServletResponse response = (HttpServletResponse) res; + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Headers", "x-requested-with"); + chain.doFilter(req, res); + } + + @Override + public void init(FilterConfig filterConfig) { + } + + @Override + public void destroy() { + } + +} diff --git a/src/main/resources/static/js/app.js b/src/main/resources/static/js/app.js index 90cd167..3e52aaf 100644 --- a/src/main/resources/static/js/app.js +++ b/src/main/resources/static/js/app.js @@ -62,4 +62,6 @@ angular.module('sasApp', [ otherwise({ redirectTo: '/' }); - }]); + } +]); + diff --git a/src/main/resources/static/js/services.js b/src/main/resources/static/js/services.js index ddb6f7e..85333f4 100644 --- a/src/main/resources/static/js/services.js +++ b/src/main/resources/static/js/services.js @@ -22,19 +22,21 @@ * THE SOFTWARE. */ +var API_BASE = "https://share-a-secret-api.herokuapp.com/sas"; + angular.module('sasServices', []). factory('SasService', ['$resource', function ($resource) { - return $resource("https://share-a-secret-api.herokuapp.com/sas", {}, { + return $resource(API_BASE, {}, { split: { - url: "https://share-a-secret-api.herokuapp.com/sas/split", + url: API_BASE + "/split", method: "POST" }, join: { - url: "https://share-a-secret-api.herokuapp.com/sas/join", + url: API_BASE + "/join", method: "POST" }, version: { - url: "https://share-a-secret-api.herokuapp.com/sas/version", + url: API_BASE + "/version", method: "GET" } });