Merge pull request #19 from HideyoshiNakazone/devel

- Implements automatic profile image reload
- Implements Better Github Actions
This commit is contained in:
2023-08-29 02:29:10 -03:00
committed by GitHub
2 changed files with 17 additions and 18 deletions

View File

@@ -6,7 +6,7 @@ on:
- 'main' - 'main'
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -19,35 +19,26 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
env:
PORT: '5000'
BACKEND_PATH: 'unsecure'
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
cache: 'npm' cache: 'npm'
- run: npm ci - run: npm install
- run: npm run build --if-present - run: npm run build --if-present
docker: docker:
needs: [build] needs: [build]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push - name: Build and push
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:

View File

@@ -46,6 +46,10 @@ export class AuthService {
} }
refresh(): void {
this.validateUser(this.refreshAccessToken());
}
autoLogin(): void { autoLogin(): void {
this.validateUser(this.validateSession()); this.validateUser(this.validateSession());
} }
@@ -68,7 +72,11 @@ export class AuthService {
(response: Observable<any>) => { (response: Observable<any>) => {
response.subscribe({ response.subscribe({
next: (response: any) => { next: (response: any) => {
this.processProfilePicture().subscribe(); this.processProfilePicture().subscribe(
() => {
this.refresh();
}
);
} }
}); });
} }
@@ -146,11 +154,11 @@ export class AuthService {
} }
private refreshAccessToken() { private refreshAccessToken() {
return firstValueFrom(this.http.post( return this.http.post<User>(
this.BACKEND_PATH + "/user/login/refresh", this.BACKEND_PATH + "/user/login/refresh",
this.userAuthenticated.refreshToken, this.userAuthenticated.refreshToken,
{ withCredentials: true } { withCredentials: true }
)); );
} }
private validateSession(): Observable<User> { private validateSession(): Observable<User> {