Merge branch 'release-1.0.0' into dev

This commit is contained in:
Marko Zivanovic
2014-11-30 22:10:01 +01:00
4 changed files with 68 additions and 7 deletions
+2 -2
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>rs.in.zivanovic</groupId>
<artifactId>share-a-secret-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0</version>
<name>share-a-secret-api</name>
<description>Share-a-Secret REST API service.</description>
@@ -59,4 +59,4 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
</properties>
</project>
</project>
@@ -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() {
}
}
+3 -1
View File
@@ -62,4 +62,6 @@ angular.module('sasApp', [
otherwise({
redirectTo: '/'
});
}]);
}
]);
+6 -4
View File
@@ -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"
}
});