removed hardcoded s3 keys-> migrated to GetAmazonTokenRequest

Author: Jevgeni Koltšin

src/main/java/com/creatubbles/api/CreatubblesAPI.java

@@ -1,15 +1,16 @@
 package com.creatubbles.api;
 
 import com.creatubbles.api.core.Creation;
+import com.creatubbles.api.core.Credentials;
 import com.creatubbles.api.core.Gallery;
-import com.creatubbles.api.core.Image;
+import com.creatubbles.api.request.amazon.GetAmazonTokenRequest;
 import com.creatubbles.api.request.amazon.UploadS3ImageRequest;
 import com.creatubbles.api.request.auth.SignInRequest;
 import com.creatubbles.api.request.creation.UpdateCreationRequest;
 import com.creatubbles.api.request.creation.UploadCreationRequest;
+import com.creatubbles.api.response.amazon.GetAmazonTokenResponse;
 import com.creatubbles.api.response.auth.SignInResponse;
 import com.creatubbles.api.response.auth.SignUpResponse;
-import com.creatubbles.api.response.creation.UpdateCreationResponse;
 import com.creatubbles.api.response.creation.UploadCreationResponse;
 import com.creatubbles.api.response.creator.CreateCreatorResponse;
 import com.creatubbles.api.response.gallery.CreateUserGalleryResponse;
@@ -45,18 +46,26 @@ public static String buildURL(final String endPoint) {
     }
 
     public static void main(String[] args) throws IOException {
+        //login
         SignInResponse response = new SignInRequest("jevgeni.koltsin@gmail.com", "ccttbb").execute().getResponse();
         System.out.println(response.access_token);
+        //create creation
         UploadCreationResponse uploadResponse = new UploadCreationRequest(response.access_token).execute().getResponse();
+        //get required info for s3
+        GetAmazonTokenResponse amazonTokenResponse = new GetAmazonTokenRequest(response.access_token).execute().getResponse();
+        Credentials credentials = amazonTokenResponse.credentials;
         //TODO: last screenshot
         File file = new File("C:/dev/1.png");
         byte[] data = Files.readAllBytes(file.toPath());
         String fileName = System.currentTimeMillis() + "creation.png";
         Creation creation = uploadResponse.creation;
         String relativePath = creation.store_dir + "/" + fileName;
-        new UploadS3ImageRequest(data, relativePath).execute().getResponse();
+        //upload image
+        new UploadS3ImageRequest(data, relativePath, credentials.access_key_id, credentials.secret_access_key, credentials.session_token)
+                .execute().getResponse();
         creation.url = relativePath;
-        UpdateCreationResponse updateResponse = new UpdateCreationRequest(response.access_token, creation).execute().getResponse();
+        //update creation(url)
+        new UpdateCreationRequest(response.access_token, creation).execute().getResponse();
         System.exit(0);
     }
 }

src/main/java/com/creatubbles/api/request/amazon/UploadS3ImageRequest.java

@@ -4,7 +4,6 @@
 import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.services.s3.model.PutObjectResult;
 import com.creatubbles.api.core.CreatubblesRequest;
 import com.creatubbles.api.response.amazon.UploadS3ImageResponse;
 import com.creatubbles.api.util.S3ClientUtil;
@@ -18,11 +17,17 @@ public class UploadS3ImageRequest extends CreatubblesRequest<UploadS3ImageRespon
 
     private String filePath;
     private byte[] data;
+    private String accessKey;
+    private String secretKey;
+    private String sessionToken;
 
-    public UploadS3ImageRequest(byte[] data, String filePath) {
+    public UploadS3ImageRequest(byte[] data, String filePath, String accessKey, String secretKey, String sessionToken) {
         super(null, null);
         this.filePath = filePath;
         this.data = data;
+        this.accessKey = accessKey;
+        this.secretKey = secretKey;
+        this.sessionToken = sessionToken;
     }
 
     @Override
@@ -33,7 +38,7 @@ public Class<? extends UploadS3ImageResponse> getResponseClass() {
     @Override
     public CreatubblesRequest<UploadS3ImageResponse> execute() {
         resetResponse();
-        AmazonS3 client = S3ClientUtil.getClient();
+        AmazonS3 client = S3ClientUtil.getClient(accessKey, secretKey, sessionToken);
         ObjectMetadata metadata = new ObjectMetadata();
         metadata.setContentLength(data.length);
         PutObjectRequest putObjectRequest = new PutObjectRequest(S3ClientUtil.AWS_S3_BUCKET_NAME, filePath, new ByteArrayInputStream(data), metadata)

src/main/java/com/creatubbles/api/util/S3ClientUtil.java

@@ -1,22 +1,22 @@
 package com.creatubbles.api.util;
 
 import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.auth.BasicSessionCredentials;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
 
 /**
  * Created by Jevgeni on 27.10.2015.
  */
 public class S3ClientUtil {
-    private static final String AWS_S3_ACCESS_KEY = "AKIAJJCG5PC6P7E7URLQ";
-    private static final String AWS_S3_SECRET_KEY = "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";
-    private static final AWSCredentials AWS_S3_CREDENTIALS = new BasicAWSCredentials(AWS_S3_ACCESS_KEY, AWS_S3_SECRET_KEY);
-    private static final AmazonS3 s3Client = new AmazonS3Client(AWS_S3_CREDENTIALS);
     public static final String AWS_S3_BUCKET_NAME = "ctbstaging";
     public static final String AWS_S3_BASE_URL = "http://" + AWS_S3_BUCKET_NAME + ".s3.amazonaws.com/";
 
-    public static AmazonS3 getClient() {
-        return s3Client;
+    public static AmazonS3 getClient(String accessKey, String secretKey, String sessionToken) {
+        return new AmazonS3Client(getCredentials(accessKey, secretKey, sessionToken));
+    }
+
+    private static AWSCredentials getCredentials(String accessKey, String secretKey, String sessionToken) {
+        return new BasicSessionCredentials(accessKey, secretKey, sessionToken);
     }
 }