Commit 898a6c68 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Merge branch 'master' into franco

parents e60cd7fb 55432f71

.gitignore

+1 −3
Original line number Original line Diff line number Diff line
@@ -54,12 +54,10 @@ nbactions.xml 
### VS Code ###

### VS Code ###

.vscode/

.vscode/





/gms-ui/target/

/gms/nbactions-release-profile.xml

/gms/nbactions-release-profile.xml





/gms-client/gms-client-lib/target/

/gms-client/gms-cli/target/

/gms/node/

/gms/node/

**/target/*





nb-configuration.xml

nb-configuration.xml

dependency-reduced-pom.xml

dependency-reduced-pom.xml

.gitlab-ci.yml

0 → 100644
+42 −0
Original line number Original line Diff line number Diff line 
stages:

  - build

  - test

  - deploy



build_gms_client:

  stage: build

  tags:

    - docker

  script:

    - cd gms-client/gms-client

    - mvn clean package -DskipTests -DfinalName=gms-client

  artifacts:

    paths:

      - gms-client/gms-client/target/gms-client.jar

      - gms-client/gms-client/pom.xml

    expire_in: 7 days

  only:

    - master



test_gms_client:

  stage: test

  tags:

    - docker

  script:

    - cd gms-client/gms-client

    - mvn clean test

  only:

    - master



deploy_gms_client:

  stage: deploy

  tags:

    - docker

  script:

    - mvn deploy:deploy-file

        -Dfile=gms-client/gms-client/target/gms-client.jar

        -DrepositoryId=ia2.snapshots

        -DpomFile=gms-client/gms-client/pom.xml

        -Durl=${IA2_MVN_REPO_SNAPSHOTS}

  only:

    - master

gms-client/gms-cli/gms.properties

+4 −2
Original line number Original line Diff line number Diff line 
base_url=http://localhost:8082/gms/ws/jwt

gms_url=http://localhost:8082/gms/ws/jwt

token=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IjM0ZmU4MDcwMDVhNTcxMTYifQ.eyJpc3MiOiJzc28uaWEyLmluYWYuaXQiLCJzdWIiOiIyMzg2IiwiaWF0IjoxNTg3NjU5NzYxLCJleHAiOjE1ODc3NDYxNjEsImF1ZCI6ImdtcyJ9.KcXRAciG3ApqlE8MFM8VYW9WAX3hEZb7Vk8jB9uJtWsOMU48ha_Ybb4k_f0nrD2jhOxwaNn2QMxWZuflwCf1N-KiCj5Ff9f8xKOrrXZrl-w1H3_dwtMlIS8t2b0-w0WwRJ7UIhrwVBzmCcWinD3qJhFPzyO2pi-A4aXV57RpJ68VXfALQXeHK0sslrf-RgAU3xWYOgjGTUoGB5BQYC9huA_bZ0eV1HFcancs9pDdoTusqZs8OkPFCJbo7-L5eibsuykqnLHztYdCcP2Vtvtwb0pww-ofWZblIHzoMI8i-ipnfLJETG8Dpc7FrhjCYLw3AEGZg4U1wYTeqG3HRbPXSQ
 
client_id=gms_cli

client_secret=gms

rap_url=http://localhost/rap-ia2

gms-client/gms-cli/pom.xml

+7 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
    <dependencies>

    <dependencies>

        <dependency>

        <dependency>

            <groupId>${project.groupId}</groupId>

            <groupId>${project.groupId}</groupId>

            <artifactId>gms-client-lib</artifactId>

            <artifactId>gms-client</artifactId>

            <version>1.0-SNAPSHOT</version>

            <version>1.0-SNAPSHOT</version>

        </dependency>

        </dependency>

    </dependencies>

    </dependencies>
@@ -46,4 +46,10 @@ 
            </plugin>

            </plugin>

        </plugins>

        </plugins>

    </build>

    </build>

    <repositories>

        <repository>

            <id>ia2.snapshot</id>

            <url>http://repo.ia2.inaf.it/maven/repository/snapshots</url>

        </repository>

    </repositories>

</project>
 
</project>

gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java

+17 −11
Original line number Original line Diff line number Diff line 
package it.inaf.ia2.gms.cli;

package it.inaf.ia2.gms.cli;





import it.inaf.ia2.client.ClientException;

import it.inaf.ia2.gms.client.GmsClient;

import it.inaf.ia2.gms.client.GmsClient;

import it.inaf.ia2.gms.client.GmsClientBuilder;

import it.inaf.ia2.gms.client.model.Permission;

import it.inaf.ia2.gms.client.model.Permission;

import it.inaf.ia2.rap.client.RapClient;

import it.inaf.ia2.rap.data.AccessTokenResponse;

import java.io.File;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileInputStream;

import java.io.IOException;

import java.io.IOException;
@@ -61,7 +63,11 @@ public class CLI { 
                default:

                default:

                    verifyConfigLoaded();

                    verifyConfigLoaded();

                    createClient();

                    createClient();

                    try {

                        parseCommand();

                        parseCommand();

                    } catch (ClientException ex) {

                        System.err.println(ex.getMessage());

                    }

                    commandParsed = true;

                    commandParsed = true;

                    break;

                    break;

            }

            }
@@ -96,17 +102,17 @@ public class CLI { 
    }

    }





    private void createClient() {

    private void createClient() {

        GmsClientBuilder clientBuilder = new GmsClientBuilder()



                .setGmsBaseUrl(gmsBaseUrl);

        client = new GmsClient(gmsBaseUrl);





        if (token != null) {

        if (token != null) {

            client = clientBuilder.build();

            client.setAccessToken(token);

            client.setAccessToken(token);

        } else {

        } else {

            client = clientBuilder.setClientId(clientId)

            RapClient rapClient = new RapClient(rapBaseUrl)

                    .setClientSecret(clientSecret)

                    .setClientId(clientId)

                    .setRapBaseUrl(rapBaseUrl)

                    .setClientSecret(clientSecret);

                    .build();

            AccessTokenResponse accessTokenResponse = rapClient.getAccessTokenFromClientCredentials();

            client.setAccessToken(accessTokenResponse.getAccessToken());

        }

        }

    }

    }