<%#
 Copyright 2013-2017 the original author or authors from the JHipster project.

 This file is part of the JHipster project, see http://www.jhipster.tech/
 for more information.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-%>
package <%=packageName%>.gateway;
<%_ if (authenticationType === 'oauth2') { _%>

import <%=packageName%>.security.oauth2.AuthorizationHeaderUtil;
<%_ } _%>

import com.netflix.zuul.ZuulFilter;
import com.netflix.zuul.context.RequestContext;
import org.springframework.stereotype.Component;
<%_ if (authenticationType === 'jwt') { _%>

import java.util.Set;
<%_ } _%>

@Component
public class TokenRelayFilter extends ZuulFilter {
<%_ if (authenticationType === 'oauth2') { _%>

    public static final String AUTHORIZATION_HEADER = "Authorization";
<%_ } _%>

    @Override
    public Object run() {
        RequestContext ctx = RequestContext.getCurrentContext();
        <%_ if (authenticationType === 'jwt') { _%>
        Set<String> headers = (Set<String>) ctx.get("ignoredHeaders");
        // JWT tokens should be relayed to the resource servers
        headers.remove("authorization");
        <%_ } _%>
        <%_ if (authenticationType === 'oauth2') { _%>
        // Add specific authorization headers for OAuth2
        ctx.addZuulRequestHeader(AUTHORIZATION_HEADER,
            AuthorizationHeaderUtil.getAuthorizationHeader());

        <%_ } _%>
        return null;
    }

    @Override
    public boolean shouldFilter() {
        return true;
    }

    @Override
    public String filterType() {
        return "pre";
    }

    @Override
    public int filterOrder() {
        return 10000;
    }
}

@@ -1415,32 +1415,64 @@
 onType === 'jwt'
+ %7C%7C authenticationType === 'uaa'
 ) %7B _%25%3E%0A        

add uaa back to tokenRelay filter