From a78a900b571615c9facba726208880505782db34 Mon Sep 17 00:00:00 2001
From: Azher2Ali <121898125+Azher2Ali@users.noreply.github.com>
Date: Fri, 5 May 2023 14:52:49 -0400
Subject: [PATCH 1/3] Commiting changes

---
 pom.xml                            | 14 +++++++++-----
 src/main/resources/application.yml |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 20fcf2d3..934054ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
         <version>3.0.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -241,6 +240,11 @@
             <artifactId>spring-cloud-starter-vault-config</artifactId>
             <version>2.1.2.RELEASE</version>
         </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-vault-config-databases</artifactId>
+                <version>4.0.1</version>
+            </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-core</artifactId>
@@ -396,14 +400,14 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.6.1</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>
+                    <!--<protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>-->
                     <!-- for Mac OS compatibility -->
-                    <!--<protocArtifact>com.google.protobuf:protoc:3.21.7:exe:osx-x86_64</protocArtifact>-->
+                    <protocArtifact>com.google.protobuf:protoc:3.21.7:exe:osx-x86_64</protocArtifact>
                     <protoSourceRoot>${basedir}/src/main/proto</protoSourceRoot>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.54.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <!--<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.54.0:exe:${os.detected.classifier}</pluginArtifact>-->
                     <!-- for Mac Os compatibility -->
-                    <!--<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:osx-x86_64</pluginArtifact>-->
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:osx-x86_64</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bcf27223..3eec0363 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -61,7 +61,7 @@ spring:
           google:
             provider: google
             clientName: ego
-            client_id: ego-client
+            clientId: ego-client
             clientSecret:
             authorizationGrantType: authorization_code
             clientAuthenticationMethod: client_secret_post
@@ -73,7 +73,7 @@ spring:
 
           github:
             clientName: ego
-            client_id: ego-client
+            clientId: ego-client
             clientSecret:
             redirectUri: "http://localhost:8081/oauth/code/github"
             clientAuthenticationMethod: client_secret_post

From 924397534b9e83ce48069064b8423048bc2beb2a Mon Sep 17 00:00:00 2001
From: Azher2Ali <121898125+Azher2Ali@users.noreply.github.com>
Date: Fri, 5 May 2023 15:00:34 -0400
Subject: [PATCH 2/3] Reverting the changes to feature/develop-passport

---
 pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 934054ab..b97fcaab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
         <version>3.0.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -400,14 +401,14 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.6.1</version>
                 <configuration>
-                    <!--<protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>-->
+                    <protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>
                     <!-- for Mac OS compatibility -->
-                    <protocArtifact>com.google.protobuf:protoc:3.21.7:exe:osx-x86_64</protocArtifact>
+                    <!--<protocArtifact>com.google.protobuf:protoc:3.21.7:exe:osx-x86_64</protocArtifact>-->
                     <protoSourceRoot>${basedir}/src/main/proto</protoSourceRoot>
                     <pluginId>grpc-java</pluginId>
-                    <!--<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.54.0:exe:${os.detected.classifier}</pluginArtifact>-->
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.54.0:exe:${os.detected.classifier}</pluginArtifact>
                     <!-- for Mac Os compatibility -->
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:osx-x86_64</pluginArtifact>
+                    <!--<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:osx-x86_64</pluginArtifact>-->
                 </configuration>
                 <executions>
                     <execution>

From 3e6c876be9143b3aebe74bcd8b55731f20e87986 Mon Sep 17 00:00:00 2001
From: Azher2Ali <121898125+Azher2Ali@users.noreply.github.com>
Date: Fri, 5 May 2023 15:13:35 -0400
Subject: [PATCH 3/3] changes to Key-Value Backend

---
 src/main/resources/application.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3eec0363..ee273dfd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -131,7 +131,9 @@ spring:
             jwkSetUri: https://orcid.org/oauth/jwks
   cloud:
     vault:
-      enabled: false
+      kv:
+        backend: kv
+        enabled: true
   flyway:
     enabled: true
     locations: "classpath:flyway/sql,classpath:db/migration"
