github/quartz-manager
1
0
Fork 0
mirror of https://github.com/fabioformosa/quartz-manager.git synced 2026-01-15 22:03:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from fabioformosa/#6_fix_websocket_with_jwt_header

Browse Source 
#6 fix websocket with jwt header
This commit is contained in:
Fabio Formosa
2020-05-08 01:13:26 +02:00
committed by GitHub
parent d0f391f539 25028774d7
commit 7d2e15a831
6 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quartz-manager-api/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenHelper.java
View File

@@ -150,6 +150,9 @@ public class JwtTokenHelper {
return authHeader.substring(7);
}
if(request.getParameter("access_token") != null)
return request.getParameter("access_token");
return null;
}

5
quartz-manager-frontend/src/app/model/SocketOption.model.ts
View File

@@ -4,11 +4,14 @@ export class SocketOption{
brokerName : string;
reconnectionTimeout : number = 30000
constructor(socketUrl : string, topicName : string, brokerName : string = null, reconnectionTimeout : number = 30000){
getAccessToken: Function = () => null;
constructor(socketUrl : string, topicName : string, getAccessToken?: Function, brokerName : string = null, reconnectionTimeout : number = 30000){
this.socketUrl = socketUrl;
this.topicName = topicName;
this.brokerName = brokerName;
this.reconnectionTimeout = reconnectionTimeout;
this.getAccessToken = getAccessToken || (() => null);
}
}

10
quartz-manager-frontend/src/app/services/api.service.ts
View File

@@ -41,6 +41,8 @@ export class ApiService {
this.jwtToken = token;
}
getToken = () => this.jwtToken;
get(path: string, args?: any): Observable<any> {
const options = {
headers: this.headers,
@@ -50,8 +52,8 @@ export class ApiService {
if (args)
options['params'] = serialize(args);
if(this.jwtToken)
options.headers = options.headers.set('Authorization', `Bearer ${this.jwtToken}`);
// if(this.jwtToken)
// options.headers = options.headers.set('Authorization', `Bearer ${this.jwtToken}`);
return this.http.get(path, options)
.pipe(catchError(this.checkError.bind(this)));
@@ -75,8 +77,8 @@ export class ApiService {
withCredentials: true
}
if(this.jwtToken)
options.headers = options.headers.append('Authorization', `Bearer ${this.jwtToken}`);
// if(this.jwtToken)
// options.headers = options.headers.append('Authorization', `Bearer ${this.jwtToken}`);
const req = new HttpRequest(method, path, body, options);

6
quartz-manager-frontend/src/app/services/logs.websocket.service.ts
View File

@@ -1,12 +1,12 @@
import { Injectable, OnInit } from '@angular/core';
import { WebsocketService } from '.';
import { WebsocketService, ApiService } from '.';
import { SocketOption } from '../model/SocketOption.model';
@Injectable()
export class LogsWebsocketService extends WebsocketService {
constructor(){
super(new SocketOption('/quartz-manager/logs', '/topic/logs'))
constructor(private apiService: ApiService){
super(new SocketOption('/quartz-manager/logs', '/topic/logs', apiService.getToken))
}
}

6
quartz-manager-frontend/src/app/services/progress.websocket.service.ts
View File

@@ -1,12 +1,12 @@
import { Injectable, OnInit } from '@angular/core';
import { WebsocketService } from '.';
import { WebsocketService, ApiService } from '.';
import { SocketOption } from '../model/SocketOption.model';
@Injectable()
export class ProgressWebsocketService extends WebsocketService {
constructor(){
super(new SocketOption('/quartz-manager/progress', '/topic/progress'))
constructor(private apiService: ApiService){
super(new SocketOption('/quartz-manager/progress', '/topic/progress', apiService.getToken))
}
}

7
quartz-manager-frontend/src/app/services/websocket.service.ts
View File

@@ -109,7 +109,12 @@ export class WebsocketService {
connect = () => {
const headers = {};
this._socket.client = new SockJS(this._options.socketUrl);
let socketUrl = this._options.socketUrl;
if(this._options.getAccessToken())
socketUrl += `?access_token=${this._options.getAccessToken()}`
this._socket.client = new SockJS(socketUrl);
this._socket.stomp = Stomp.over(this._socket.client);
this._socket.stomp.connect(headers, this._socketListener, this._onSocketError);
this._socket.stomp.onclose = this.scheduleReconnection;