Merge pull request #812 from scalecube/cleanup-services-security

Cleanup services security

Author: artem-v

pom.xml

@@ -59,8 +59,7 @@
   <properties>
     <scalecube-cluster.version>2.6.7</scalecube-cluster.version>
     <scalecube-commons.version>1.0.13</scalecube-commons.version>
-    <scalecube-security-tokens.version>1.0.18</scalecube-security-tokens.version>
-    <scalecube-config.version>0.4.16</scalecube-config.version>
+    <scalecube-security.version>1.0.19</scalecube-security.version>
 
     <reactor.version>2020.0.5</reactor.version>
     <jackson.version>2.11.0</jackson.version>
@@ -85,7 +84,7 @@
     <module>services-transport-parent</module>
     <module>services-discovery</module>
     <module>services-bytebuf-codec</module>
-    <module>services-security-parent</module>
+    <module>services-security</module>
     <module>services-examples</module>
   </modules>
 
@@ -103,14 +102,7 @@
       <dependency>
         <groupId>io.scalecube</groupId>
         <artifactId>scalecube-security-tokens</artifactId>
-        <version>${scalecube-security-tokens.version}</version>
-      </dependency>
-
-      <!-- Scalecube config -->
-      <dependency>
-        <groupId>io.scalecube</groupId>
-        <artifactId>scalecube-config-vault</artifactId>
-        <version>${scalecube-config.version}</version>
+        <version>${scalecube-security.version}</version>
       </dependency>
 
       <!-- Scalecube cluster -->

services-examples/src/main/java/io/scalecube/services/examples/auth/PrincipalMapperAuthExample.java

@@ -39,7 +39,8 @@ public static void main(String[] args) {
     Microservices userProfileCaller =
         Microservices.builder()
             .discovery("caller", endpoint -> discovery(service, endpoint))
-            .transport(() -> new RSocketServiceTransport().credentialsSupplier(credsSupplier()))
+            .transport(
+                () -> new RSocketServiceTransport().credentialsSupplier(credentialsSupplier()))
             .startAwait();
 
     String responseByUserProfile =
@@ -54,7 +55,8 @@ public static void main(String[] args) {
     Microservices apiKeyCaller =
         Microservices.builder()
             .discovery("caller", endpoint -> discovery(service, endpoint))
-            .transport(() -> new RSocketServiceTransport().credentialsSupplier(credsSupplier()))
+            .transport(
+                () -> new RSocketServiceTransport().credentialsSupplier(credentialsSupplier()))
             .startAwait();
 
     String responseByApiKey =
@@ -82,7 +84,7 @@ private static Authenticator<Map<String, String>> authenticator() {
     };
   }
 
-  private static CredentialsSupplier credsSupplier() {
+  private static CredentialsSupplier credentialsSupplier() {
     return service -> {
       String namespace = service.namespace(); // decide by service