Merge branch 'hotfix/fix-imagemin-dependency'

openmhealth · Dec 3, 2015 · 76417d9 · 76417d9
2 parents 85aaebc + 8d8804f
commit 76417d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/docker.sh b/docker.sh
diff --git a/shim-server-ui/package.json b/shim-server-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shim-server-ui",
-  "version": "0.2.1",
+  "version": "0.4.1",
   "dependencies": {},
   "devDependencies": {
     "grunt": "~0.4.5",
@@ -13,7 +13,7 @@
     "grunt-contrib-copy": "~0.8.0",
     "grunt-contrib-cssmin": "~0.12.3",
     "grunt-contrib-htmlmin": "~0.4.0",
-    "grunt-contrib-imagemin": "~0.9.4",
+    "grunt-contrib-imagemin": "~1.0.0",
     "grunt-contrib-jshint": "~0.11.2",
     "grunt-contrib-uglify": "~0.9.1",
     "grunt-contrib-watch": "~0.6.1",

diff --git a/shim-server/src/main/java/org/openmhealth/shim/Application.java b/shim-server/src/main/java/org/openmhealth/shim/Application.java
@@ -70,6 +70,9 @@ public class Application extends WebSecurityConfigurerAdapter {
     @Autowired
     private ShimRegistry shimRegistry;
 
+    @Autowired
+    private ShimServerConfig shimServerProperties;
+
     // TODO clarify what this is for
     private static final String REDIRECT_OOB = "oob";
 
@@ -276,7 +279,7 @@ public AuthorizationResponse approve(
             }
 
             try{
-                servletResponse.sendRedirect(authorizationStatusURL);
+                servletResponse.sendRedirect(shimServerProperties.getCallbackUrlBase() + authorizationStatusURL);
             }
             catch (IOException e) {
                 e.printStackTrace();