Commit d4cb9838 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Included FE dist files inside Spring application; Groups model logic

parent 032148ba

.gitignore

+2 −0
Original line number Original line Diff line number Diff line 
.DS_Store

.DS_Store

node_modules

node_modules

gms-ui/dist

gms-ui/dist

gms-ui/node/





# local env files

# local env files

.env.local

.env.local
@@ -53,3 +54,4 @@ nbactions.xml 
### VS Code ###

### VS Code ###

.vscode/

.vscode/





/gms-ui/target/

gms-ui/.env.production

+1 −0
Original line number Original line Diff line number Diff line 
VUE_APP_API_CLIENT = 'server'

VUE_APP_API_CLIENT = 'server'

BASE_API_URL = 'http://localhost:8081/'

gms-ui/src/api/server/index.js

+12 −6
Original line number Original line Diff line number Diff line 
//import axios from 'axios'

const BASE_API_URL = "http://localhost:8081/"





export default {

export default {

  fetchPosts () {

  fetchMainModel () {

    return null;//axios

    return fetch(BASE_API_URL + 'groups?groupId=ROOT&tab=groups&paginatorPageSize=20&paginatorPage=1', {

      //.get('https://jsonplaceholder.typicode.com/posts')

      method: 'GET',

      //.then(response => response.data)

      mode: 'cors',

      cache: 'no-cache',

      credentials: 'include',

      headers: {

        'Content-Type': 'application/json'

      }

      }

    });

  }

  }

};

gms/pom.xml

+21 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,27 @@ 




    <build>

    <build>

        <plugins>

        <plugins>

            <plugin>

                <artifactId>maven-resources-plugin</artifactId>

                <version>3.1.0</version>

                <executions>

                    <execution>

                        <id>copy-resources</id>

                        <phase>prepare-package</phase>

                        <goals>

                            <goal>copy-resources</goal>

                        </goals>

                        <configuration>

                            <outputDirectory>${basedir}/target/classes/static</outputDirectory>

                            <resources>

                                <resource>

                                    <directory>../gms-ui/dist</directory>

                                </resource>

                            </resources>

                        </configuration>

                    </execution>

                </executions>

            </plugin>

            <plugin>

            <plugin>

                <groupId>org.springframework.boot</groupId>

                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <artifactId>spring-boot-maven-plugin</artifactId>

gms/src/main/java/it/inaf/ia2/gms/authn/OAuth2Config.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ import org.springframework.security.oauth2.provider.ClientDetailsService; 
import org.springframework.security.oauth2.provider.client.InMemoryClientDetailsService;

import org.springframework.security.oauth2.provider.client.InMemoryClientDetailsService;

import org.springframework.security.oauth2.provider.token.DefaultAccessTokenConverter;

import org.springframework.security.oauth2.provider.token.DefaultAccessTokenConverter;

import org.springframework.security.oauth2.provider.token.RemoteTokenServices;

import org.springframework.security.oauth2.provider.token.RemoteTokenServices;

import org.springframework.web.client.RestTemplate;





/**

/**

 * Extending the AuthorizationServerEndpointsConfiguration disables the Spring

 * Extending the AuthorizationServerEndpointsConfiguration disables the Spring
@@ -63,4 +64,9 @@ public class OAuth2Config extends AuthorizationServerEndpointsConfiguration { 
        return new DefaultUserInfoRestTemplateFactory(customizers, details,

        return new DefaultUserInfoRestTemplateFactory(customizers, details,

                oauth2ClientContext);

                oauth2ClientContext);

    }

    }



    @Bean

    public RestTemplate rapRestTemplate() {

        return new RestTemplate();

    }

}
 
}