Commit ad64cb71 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Redefine variable de ruta hacia server OAuth

See merge request redmic-project/client/web!3
parents 5b98f544 d32136c3

.gitlab-ci.yml

+13 −6
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ docker-build-commit-non-master-branches: 
    - branches

  except:

    - master

    - schedules

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .
@@ -131,6 +132,8 @@ docker-build-commit-master-branch: 
    - docker:dind

  only:

    - master

  except:

    - schedules

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .
@@ -145,6 +148,8 @@ docker-tag-already-built-image: 
    - docker:dind

  only:

    - tags

  except:

    - schedules

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}
@@ -160,6 +165,8 @@ container-scanning: 
    - docker:stable-dind

  only:

    - branches

  except:

    - schedules

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
@@ -186,14 +193,14 @@ deploy-dev: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    OAUTH_URL: ${DEV_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: https://appdev.${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}
@@ -212,14 +219,14 @@ deploy-supporting-branch: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    OAUTH_URL: ${DEV_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: https://appdev.${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}
@@ -269,14 +276,14 @@ deploy-pro: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_TAG}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    OAUTH_URL: ${PRO_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: https://${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}

app/exposure.js

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ var express = require('express'), 
	request = require('request');



var logger, params, version,

	publicHostname = process.env.PUBLIC_HOSTNAME,

	oauthUrl = process.env.OAUTH_URL,

	oauthClientSecret = process.env.OAUTH_CLIENT_SECRET;



function getLang(req) {
@@ -100,7 +100,7 @@ function onOauthTokenRequest(req, res) { 
		clientCredentials = clientId + ':' + oauthClientSecret,

		base64ClientCredentials = Buffer.from(clientCredentials).toString('base64'),



		url = publicHostname + '/api/oauth/token',

		url = oauthUrl + '/api/oauth/token',

		authorization = 'Basic ' + base64ClientCredentials,

		bodyData = "grant_type=password&username=" + username + "&password=" + password + "&scope=write",

docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ services: 
    networks:

      - redmic-net

    environment:

      - OAUTH_URL

      - OAUTH_CLIENT_SECRET

      - PUBLIC_HOSTNAME

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${WEB_PORT}

      interval: 30s

grunt/config/buildModules.js

+2 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ module.exports = function(grunt) { 
	var preBuildCmds = ['yarn install'];



	grunt.config('redmicConfig.buildModules', {

		'public/javascript/pruneCluster': preBuildCmds.concat([

		'public/javascript/pruneCluster': [

			'npm install',

			'grunt build:dist --force'

		]),

		],

		'public/javascript/redmic-widgets': preBuildCmds.concat([

			'grunt addModules buildModules'

		]),

tests/support/CustomReporter.js

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ intern.registerReporter('customreporter', function(options) { 
			testStatus = '[ SKIP ]';

		} else if (test.error) {

			failCounter++;

			testStatus = '[ FAIL ]';

			testStatus = '[ FAIL ] ' + moment().format() + ' - ';

		} else {

			passCounter++;

			testStatus = '[ PASS ]';