From 6a93d242b93d1e31d92755dbe53d30d99f1c7ed3 Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Mon, 2 Apr 2018 18:17:24 +0300
Subject: [PATCH 1/2] Update set/getBucketPolicy definitions

---
 types/minio/index.d.ts     | 11 +++++------
 types/minio/minio-tests.ts | 14 ++++++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index 7e920428ff..94d28cdd5a 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for minio 4.0
+// Type definitions for minio 5.0
 // Project: https://github.com/minio/minio-js#readme
 // Definitions by: Barin Britva <https://github.com/barinbritva>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,7 +11,6 @@ import EventEmitter = NodeJS.EventEmitter;
 
 // Exports only from typings
 export type Region = 'us-east-1'|'us-west-1'|'us-west-2'|'eu-west-1'|'eu-central-1'|'ap-southeast-1'|'ap-northeast-1'|'ap-southeast-2'|'sa-east-1'|'cn-north-1'|string;
-export type PolicyValue = 'none'|'readonly'|'writeonly'|'readwrite';
 export type NoResultCallback = (error: Error|null) => void;
 export type ResultCallback<T> = (error: Error|null, result: T) => void;
 
@@ -158,11 +157,11 @@ export class Client {
     // todo #low Specify events
     listenBucketNotification(bucketName: string, prefix: string, suffix: string, events: string[]): EventEmitter;
 
-    getBucketPolicy(bucketName: string, objectPrefix: string, callback: ResultCallback<PolicyValue>): void;
-    getBucketPolicy(bucketName: string, objectPrefix: string): Promise<PolicyValue>;
+    getBucketPolicy(bucketName: string, callback: ResultCallback<string>): void;
+    getBucketPolicy(bucketName: string): Promise<string>;
 
-    setBucketPolicy(bucketName: string, objectPrefix: string, bucketPolice: PolicyValue, callback: NoResultCallback): void;
-    setBucketPolicy(bucketName: string, objectPrefix: string, bucketPolice: PolicyValue): Promise<void>;
+    setBucketPolicy(bucketName: string, bucketPolicy: string, callback: NoResultCallback): void;
+    setBucketPolicy(bucketName: string, bucketPolicy: string): Promise<void>;
 
     // Other
     newPostPolicy(): PostPolicy;
diff --git a/types/minio/minio-tests.ts b/types/minio/minio-tests.ts
index 78a7fab267..9307e68b20 100644
--- a/types/minio/minio-tests.ts
+++ b/types/minio/minio-tests.ts
@@ -106,8 +106,14 @@ minio.removeAllBucketNotification('testBucket');
 
 minio.listenBucketNotification('testBucket', 'pref_', '_suf', [ Minio.ObjectCreatedAll ]);
 
-minio.getBucketPolicy('testBucket', 'pref_', (error: Error|null, policy: Minio.PolicyValue) => { console.log(error, policy); });
-minio.getBucketPolicy('testBucket', '');
+minio.getBucketPolicy('testBucket', (error: Error|null, policy: string) => { console.log(error, policy); });
+minio.getBucketPolicy('testBucket');
 
-minio.setBucketPolicy('testBucket', '', Minio.Policy.READWRITE, (error: Error|null) => { console.log(error); });
-minio.setBucketPolicy('testBucket', 'pref_', Minio.Policy.WRITEONLY);
+const testPolicy = `{"Version":"2012-10-17","Statement":[{"Action":["s3:GetBucketLocation"],"Effect":"Allow",
+"Principal":{"AWS":["*"]},"Resource":["arn:aws:s3:::bucketName"],"Sid":""},{"Action":["s3:ListBucket"],
+"Condition":{"StringEquals":{"s3:prefix":["foo","prefix/"]}},"Effect":"Allow","Principal":{"AWS":["*"]},
+"Resource":["arn:aws:s3:::bucketName"],"Sid":""},{"Action":["s3:GetObject"],"Effect":"Allow",
+"Principal":{"AWS":["*"]},"Resource":["arn:aws:s3:::bucketName/foo*","arn:aws:s3:::bucketName/prefix/*"],"Sid":""}]}
+`;
+minio.setBucketPolicy('testBucket',  testPolicy, (error: Error|null) => { console.log(error); });
+minio.setBucketPolicy('testBucket', testPolicy);

From 86eb0fa035a3ce4529c78eda782ed9886c8b0c2f Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Mon, 2 Apr 2018 18:24:55 +0300
Subject: [PATCH 2/2] Also update bucketExists

---
 types/minio/index.d.ts     | 4 ++--
 types/minio/minio-tests.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index 94d28cdd5a..2dda500396 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -84,8 +84,8 @@ export class Client {
     listBuckets(callback: ResultCallback<BucketItemFromList[]>): void;
     listBuckets(): Promise<BucketItemFromList>;
 
-    bucketExists(bucketName: string, callback: NoResultCallback): void;
-    bucketExists(bucketName: string): Promise<void>;
+    bucketExists(bucketName: string, callback: ResultCallback<boolean>): void;
+    bucketExists(bucketName: string): Promise<boolean>;
 
     removeBucket(bucketName: string, callback: NoResultCallback): void;
     removeBucket(bucketName: string): Promise<void>;
diff --git a/types/minio/minio-tests.ts b/types/minio/minio-tests.ts
index 9307e68b20..05f8283d32 100644
--- a/types/minio/minio-tests.ts
+++ b/types/minio/minio-tests.ts
@@ -16,7 +16,7 @@ minio.makeBucket('testBucket', 'region-not-from-list');
 minio.listBuckets((error: Error|null, bucketList: Minio.BucketItemFromList[]) => { console.log(error, bucketList); });
 minio.listBuckets();
 
-minio.bucketExists('testBucket', (error: Error|null) => { console.log(error); });
+minio.bucketExists('testBucket', (error: Error|null, exists: boolean) => { console.log(error, exists); });
 minio.bucketExists('testBucket');
 
 minio.removeBucket('testBucket', (error: Error|null) => { console.log(error); });