diff --git a/.github/workflows/deploy-manually.yml b/.github/workflows/deploy-manually.yml index d3e9df1..b204e48 100644 --- a/.github/workflows/deploy-manually.yml +++ b/.github/workflows/deploy-manually.yml @@ -60,7 +60,7 @@ jobs: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} deploy: - if: ${{ (github.event_name != 'workflow_dispatch' && needs.semantic_release.outputs.new_release_published == 'true') || 'true' }} + if: ${{ github.event_name == 'workflow_dispatch' || needs.semantic_release.outputs.new_release_published == 'true' }} needs: [extract_environment, semantic_release] runs-on: [self-hosted, '${{ needs.extract_environment.outputs.environment }}'] @@ -71,7 +71,7 @@ jobs: EVENT: ${{ github.event_name }} IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }} ENV: ${{ needs.extract_environment.outputs.environment }} - run: echo ${EVENT} ${IMAGE_TAG} > ${ENV} + run: echo ${GITHUB_REF#refs/heads/} - name: Checkout uses: actions/checkout@v2 diff --git a/package.json b/package.json index a648a32..823db87 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@nestjs/platform-express": "^8.4.3", "@nestjs/schedule": "^1.1.0", "@nestjs/swagger": "^5.2.1", - "@victorradael/protospack": "2.4.1-1", + "@victorradael/protospack": "2.4.1", "axios": "^0.25.0", "dotenv": "^14.2.0", "helmet": "^5.0.2", diff --git a/src/clients/auth/client.service.ts b/src/clients/auth/client.service.ts index d56d238..a2fd32e 100644 --- a/src/clients/auth/client.service.ts +++ b/src/clients/auth/client.service.ts @@ -167,21 +167,18 @@ export class AuthClientService implements OnModuleInit { } async refreshAccessToken({ - username, refreshToken, }: AuthRefreshAccessTokenRequest): Promise { console.log('AuthClientService', 'RefreshAccessToken'); return new Promise((resolve, reject) => { - this.authService - .refreshAccessToken({ username, refreshToken }) - .subscribe({ - next: resolve, - error: (err) => reject(err.details), - complete() { - console.log('done'); - }, - }); + this.authService.refreshAccessToken({ refreshToken }).subscribe({ + next: resolve, + error: (err) => reject(err.details), + complete() { + console.log('done'); + }, + }); }); } } diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index b9fd145..692cfb4 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -57,12 +57,12 @@ export class AuthController { @Post('refresh-access-token') @HttpCode(HttpStatus.OK) async refreshAccessToken( - @Body() { username, refreshToken }: AuthRefreshAccessTokenRequest, + @Body() { refreshToken }: AuthRefreshAccessTokenRequest, ) { console.log(`/auth`, 'RefreshAccessToken'); const accessToken = await this.authClient - .refreshAccessToken({ username, refreshToken }) + .refreshAccessToken({ refreshToken }) .catch((err) => { throw ErrorBuilder(err); });