From b74705ccfa6f2591c863426e8500ab44ea61f7bd Mon Sep 17 00:00:00 2001
From: GME <guillaume.meneroud@gmail.com>
Date: Mon, 15 Apr 2019 22:25:15 +0200
Subject: [PATCH] u

---
 msp/org1/admin.context                        | Bin 1398 -> 1398 bytes
 .../java/restService/WelcomeResource.java     |  26 ++++++++++++++++++
 .../WalletImplementationTest.java             |   7 +++--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/msp/org1/admin.context b/msp/org1/admin.context
index 45ce6d3204fa299f2568b20cb52a3afe0addf8a4..b91b5d49621178902d032cd7d238ead932bc0250 100644
GIT binary patch
delta 480
zcmeyy^^I#o7Nb^(v$JDjX1Zg!r;}s4XK0{%mScKgmVRQnSA=<CP*G5zwtJ?ZV@|%Q
z$>b@FyJZZ0vm7h@svOJ1Gm`y)>~cRBR|6nj$>p0hIh!dw+_4}{+t4}5JSQ;JwX`7L
zDLKEO*xk!AN;{;?vCt?fs<^<hsIt(|gUdZQH8CYG%&4*?r>rR3!qDF^&$Kel(mx~3
z*d^87G&R&Qz#~6XJ14_1*Qe5ZvLv&Oj9Z1LbDB$GqJD~JmYH)wVVIY3T18$Jm$Oq@
z(Bwj9|N3M{U)MlqPsdE-;>;+gaz{r4v!t}t+`=#e!@}Z%q8xY2vd|2}Y*!=W@}f#Z
zuAI!U9LG#Y7uSFQGjjtEmw==czheCWQ^z8s0Iv{plgyH$@|1M<O24EepOW-~BDZo|
zTP|G?aP@OhaCQv}@pSWab_{U^i*XfCwrAN`pT2rQ{lO`0zD+U4`7VB1@0PrITb5E?
zvNiGI7F(vXUhfxhv2kd%d7QIlW@KOJ!tBJr!ZiKg6}8_}Sy^_?Vl3*)k(eL()B3>b
zw40kIXrEf^E~!4NthDUZ&HQ!#rq+=^PyY97{d>3~FD`)j_#*wK?UCIlDoPmG{fp8K
QeS-slEY`%7+|0ZJ0QDNG`~Uy|

delta 480
zcmeyy^^I#o7Nb^{v$JDjX1Zg!r;}s4XQ)Ssk%d!ehKWm<n^{PDKvHg?zK5y5YmTvR
z^5iLuyJf0;Ly`^rTpY{8Gm`y$vmDF)TwE(bVqE?qle3w^!!yz>%~Ff9eZ4}<O_I}{
zqY4Xh^;069sse-ZealP&Q=Pnh47GFgGq@7-e4Q-(69X!>vvLv(&58@04f6wYjB{Lz
zOG6V&s>(A=Q;Vt$LcIJfGqZ}#CQCBg$oLid`WpBd<pdOEJ69CC8mIes`3AW}a2Z5Z
zrcW+p_ODNO^mPq&_6&51%=Jku&dv#_@-ho{4M=k-3Q9M~sVpzd$qClZaf%2mFb^q<
z;7TktF!y%!O!p`+bT!Wp4oOKja4yS@G|zI5C<$?n%q>hx3@QsYF|jZ#2+c}N@-)}>
zwdK+U0arg41!vcw5KlKxXU7m%uozeIWP6s4_0yXszbM!$zI&<R#3zXcy^}Aue^t%c
z*id(4f~D`Ypp)4PxY#(f+C0wLGBdI-bYXU4U}^ndRkf2x)yJZUVdkot`%4>&9i@2o
zx5%+9`uZ#WVOBBYhiCn#Up&oPw`PfMhEwcQq0>{c?tEyUzWTh&N$VSnH&>J}u=^LK
R8~O$Z09mYwDY=<>1pxVjtwaC-

diff --git a/src/main/java/restService/WelcomeResource.java b/src/main/java/restService/WelcomeResource.java
index 933e27e..0273b5a 100644
--- a/src/main/java/restService/WelcomeResource.java
+++ b/src/main/java/restService/WelcomeResource.java
@@ -1,11 +1,37 @@
 package restService;
 
+import blockchain.client.CAClientWrapper;
+import blockchain.configuration.Config;
+import blockchain.user.UserContext;
+import org.hyperledger.fabric.sdk.Enrollment;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import static org.junit.Assert.assertEquals;
+
 @RestController
 public class WelcomeResource {
     @RequestMapping("/")
     public String index(){return "Welcome from Monnethic !";}
 
+    @RequestMapping("/bc/register/admin")
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public void registerAdminApp(){
+        String caUrl = Config.CA_ORG1_URL;
+        try {
+            CAClientWrapper caClientWrapper = new CAClientWrapper(caUrl,null);
+            UserContext adminContext = new UserContext();
+            adminContext.setName(Config.ADMIN);
+            adminContext.setAffiliation(Config.ORG1);
+            adminContext.setMspId(Config.ORG1_MSP);
+            caClientWrapper.setAdminContext(adminContext);
+            caClientWrapper.enrollAdmin(adminContext.getName(),Config.ADMIN_PASSWORD,adminContext.getAffiliation());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/test/java/restImplementation/WalletImplementationTest.java b/src/test/java/restImplementation/WalletImplementationTest.java
index c0dc0e7..6b2b667 100644
--- a/src/test/java/restImplementation/WalletImplementationTest.java
+++ b/src/test/java/restImplementation/WalletImplementationTest.java
@@ -35,6 +35,8 @@ public class WalletImplementationTest {
     }
     */
 
+    /*
+
     @Test
     public void TestDeleteWallet() { //OK
         BasicConfigurator.configure();
@@ -82,15 +84,16 @@ public class WalletImplementationTest {
             logger.warn("Error: "+e.getMessage());
         }
     }
-
+    */
     @Test
     public void TestGetUserWallet(){ //OK
         BasicConfigurator.configure();
         WalletImplementation walletImplementation = new WalletImplementation();
         try{
-            walletImplementation.getAllUserWallets("$2a$10$EBoYmkW7mdss58LtrNvcg.Igtkx/Vyncnw3o0MA99SJi32UXyKgwe");
+            walletImplementation.getAllUserWallets("$2a$10$r7jlPdeESPFd1dKjvrEmB.SoxOXh3jHtWiPTAFKB3lGSgvda.zMyC");
         } catch (Exception e){
             logger.warn("Error: "+e.getMessage());
         }
     }
+
 }