@@ -20,9 +20,11 @@ import java.net.InetAddress
20
20
21
21
import akka .http .scaladsl .Http
22
22
import akka .http .scaladsl .model ._
23
+ import akka .http .scaladsl .model .headers .RawHeader
23
24
import akka .http .scaladsl .unmarshalling .Unmarshal
24
25
import akka .util .ByteString
25
26
import de .upb .cs .swt .delphi .instancemanagement .InstanceEnums .{ComponentType , InstanceState }
27
+ import de .upb .cs .swt .delphi .webapi .authorization .AuthProvider
26
28
import de .upb .cs .swt .delphi .webapi .{AppLogging , Configuration , _ }
27
29
import spray .json ._
28
30
@@ -92,7 +94,7 @@ object InstanceRegistry extends InstanceJsonSupport with AppLogging {
92
94
method = HttpMethods .POST ,
93
95
configuration.instanceRegistryUri + ReportOperationType .toOperationUriString(operationType, id))
94
96
95
- Await .result(Http (system).singleRequest(request) map { response =>
97
+ Await .result(Http (system).singleRequest(request.withHeaders( RawHeader ( " Authorization " , s " Bearer ${ AuthProvider .generateJwt()} " )) ) map { response =>
96
98
if (response.status == StatusCodes .OK ) {
97
99
log.info(s " Successfully reported ${operationType.toString} to Instance Registry. " )
98
100
Success ()
@@ -146,7 +148,7 @@ object InstanceRegistry extends InstanceJsonSupport with AppLogging {
146
148
configuration.instanceRegistryUri +
147
149
s " /matchingInstance?Id= ${configuration.assignedID.getOrElse(- 1 )}&ComponentType=ElasticSearch " )
148
150
149
- Await .result(Http (system).singleRequest(request) map { response =>
151
+ Await .result(Http (system).singleRequest(request.withHeaders( RawHeader ( " Authorization " , s " Bearer ${ AuthProvider .generateJwt()} " )) ) map { response =>
150
152
response.status match {
151
153
case StatusCodes .OK =>
152
154
try {
@@ -189,7 +191,7 @@ object InstanceRegistry extends InstanceJsonSupport with AppLogging {
189
191
configuration.instanceRegistryUri +
190
192
s " /matchingResult?CallerId= ${configuration.assignedID.getOrElse(- 1 )}&MatchedInstanceId= $idToPost&MatchingSuccessful= $isElasticSearchReachable" )
191
193
192
- Await .result(Http (system).singleRequest(request) map { response =>
194
+ Await .result(Http (system).singleRequest(request.withHeaders( RawHeader ( " Authorization " , s " Bearer ${ AuthProvider .generateJwt()} " )) ) map { response =>
193
195
if (response.status == StatusCodes .OK ) {
194
196
log.info(s " Successfully posted matching result to Instance Registry. " )
195
197
Success ()
@@ -216,7 +218,7 @@ object InstanceRegistry extends InstanceJsonSupport with AppLogging {
216
218
217
219
val request = HttpRequest (method = HttpMethods .POST , configuration.instanceRegistryUri + s " /deregister?Id= $id" )
218
220
219
- Await .result(Http (system).singleRequest(request) map { response =>
221
+ Await .result(Http (system).singleRequest(request.withHeaders( RawHeader ( " Authorization " , s " Bearer ${ AuthProvider .generateJwt()} " )) ) map { response =>
220
222
if (response.status == StatusCodes .OK ) {
221
223
log.info(" Successfully deregistered from Instance Registry." )
222
224
Success ()
@@ -237,7 +239,7 @@ object InstanceRegistry extends InstanceJsonSupport with AppLogging {
237
239
def postInstance (instance : Instance , uri : String )(): Future [HttpResponse ] = {
238
240
try {
239
241
val request = HttpRequest (method = HttpMethods .POST , uri = uri, entity = instance.toJson(instanceFormat).toString())
240
- Http (system).singleRequest(request)
242
+ Http (system).singleRequest(request.withHeaders( RawHeader ( " Authorization " , s " Bearer ${ AuthProvider .generateJwt()} " )) )
241
243
} catch {
242
244
case dx : DeserializationException =>
243
245
log.warning(s " Failed to deregister to Instance Registry, exception: $dx" )
0 commit comments