Merge pull request #220 from inversion-api/dq/modify-authAction-to-ac…

…cept-groups-from-other-JWT_2 0.9.27.2
inversion-api · Mar 16, 2022 · 9803013 · 9803013
2 parents e0c5e1b + c727c1d
commit 9803013
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 42 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=0.9.27.1
+version=0.9.27.2
 
 #We attempt to keep these libs in sync with the spring boot lib versions.
 # @see https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-dependency-versions.html#dependency-versions-coordinates

diff --git a/inversion-api/pom.xml b/inversion-api/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-api</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-api</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>

diff --git a/inversion-api/src/main/java/io/inversion/action/security/AuthAction.java b/inversion-api/src/main/java/io/inversion/action/security/AuthAction.java
@@ -394,13 +394,17 @@ protected User createUserFromValidJwt(DecodedJWT jwt) {
             c = jwt.getClaim("groups");
             if (c != null && !c.isNull()) {
                 List<String> groups = c.asList(String.class);
-                user.withRoles(groups.toArray(new String[0]));
+                if (groups != null) {
+                    user.withRoles(groups.toArray(new String[0]));
+                }
             }
 
             c = jwt.getClaim("roles");
             if (c != null && !c.isNull()) {
                 List<String> roles = c.asList(String.class);
-                user.withRoles(roles.toArray(new String[0]));
+                if (roles != null) {
+                    user.withRoles(roles.toArray(new String[0]));
+                }
             }
 
             c = jwt.getClaim("tenantId");//legacy support

diff --git a/inversion-azure-functions/pom.xml b/inversion-azure-functions/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-azure-functions</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-azure-functions</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-jdbc</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/inversion-cosmosdb/pom.xml b/inversion-cosmosdb/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-cosmosdb</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-cosmosdb</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-jdbc</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/inversion-demos/pom.xml b/inversion-demos/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-demos</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-demos</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,67 +36,67 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-cosmosdb</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-dynamodb</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-elasticsearch</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-jdbc</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-kinesis</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-lambda</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-redis</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-s3</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-script</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-spring-boot</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/inversion-dynamodb/pom.xml b/inversion-dynamodb/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-dynamodb</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-dynamodb</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-jdbc</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/inversion-elasticsearch/pom.xml b/inversion-elasticsearch/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-elasticsearch</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-elasticsearch</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,13 +36,13 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-jdbc</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/inversion-jdbc/pom.xml b/inversion-jdbc/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-jdbc</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-jdbc</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/inversion-kinesis/pom.xml b/inversion-kinesis/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-kinesis</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-kinesis</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/inversion-lambda/pom.xml b/inversion-lambda/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-lambda</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-lambda</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/inversion-redis/pom.xml b/inversion-redis/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-redis</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-redis</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/inversion-s3/pom.xml b/inversion-s3/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-s3</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-s3</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/inversion-script/pom.xml b/inversion-script/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-script</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-script</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/inversion-spring-boot/pom.xml b/inversion-spring-boot/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.inversion</groupId>
   <artifactId>inversion-spring-boot</artifactId>
-  <version>0.9.27</version>
+  <version>0.9.27.2</version>
   <name>inversion-spring-boot</name>
   <description>Inversion Cloud API Engine</description>
   <url>https://inversion.io</url>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.inversion</groupId>
       <artifactId>inversion-api</artifactId>
-      <version>0.9.27</version>
+      <version>0.9.27.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>