Merge remote-tracking branch 'upstream/master' into upgrade_postgres

Author: gedorinku

.env.ci

@@ -9,9 +9,18 @@ OAUTH2_LOGIN_URL=http://localhost:8080/oauth/login
 # for ridgepole
 DATABASE_URL_RIDGEPOLE=postgresql://postgres:@localhost/accounts?sslmode=disable
 
+# for minio
+MINIO_ACCESS_KEY=youReallyNeedToChangeThis
+MINIO_SECRET_KEY=youReallyNeedToChangeThis
+MINIO_BROWSER=off
+
 # for app
 DATABASE_URL=postgresql://postgres:@localhost/accounts?sslmode=disable
 
+MINIO_PUBLIC_URL=http://localhost:9100
+MINIO_ENDPOINT=minio:9000
+MINIO_BUCKET_NAME=public
+
 REDIS_ADDR=localhost:6379
 
 DEBUG_LOG=true

.env.sample

@@ -9,10 +9,19 @@ OAUTH2_LOGIN_URL=http://localhost:8080/oauth/login
 # for ridgepole
 DATABASE_URL_RIDGEPOLE=postgresql://postgres:@localhost/accounts?sslmode=disable
 
+# for minio
+MINIO_ACCESS_KEY=youReallyNeedToChangeThis
+MINIO_SECRET_KEY=youReallyNeedToChangeThis
+MINIO_BROWSER=off
+
 # for app
 DATABASE_URL=postgresql://postgres:@pg/accounts?sslmode=disable
 POSTGRES_PASSWORD=
 
+MINIO_PUBLIC_URL=http://localhost:9100
+MINIO_ENDPOINT=minio:9000
+MINIO_BUCKET_NAME=public
+
 REDIS_ADDR=redis:6379
 
 DEBUG_LOG=true

Gopkg.lock

@@ -5,3 +5,7 @@
 [[constraint]]
   name = "github.com/ory/hydra"
   version = "1.0.0-rc.6+oryOS.10"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/mwitkow/go-proto-validators"

Gopkg.toml

@@ -5,6 +5,7 @@ package programming_lab.prolab_accounts;
 option go_package = "github.com/ProgrammingLab/prolab-accounts/api;api_pb";
 
 
+import "github.com/mwitkow/go-proto-validators/validator.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/empty.proto";
 
@@ -32,10 +33,16 @@ service UserService {
       get: "/user"
     };
   }
-  rpc UpdateUser (UpdateUserRequest) returns (User) {
+  rpc UpdateUserProfile (UpdateUserProfileRequest) returns (User) {
     option (google.api.http) = {
-      patch: "/user"
-      body: "user"
+      patch: "/user/profile"
+      body: "*"
+    };
+  }
+  rpc UpdateUserIcon (UpdateUserIconRequest) returns (User) {
+    option (google.api.http) = {
+      post: "/user/icon"
+      body: "*"
     };
   }
   rpc UpdatePassword (UpdatePasswordRequest) returns (google.protobuf.Empty) {
@@ -50,15 +57,20 @@ message User {
   string name = 2;
   string email = 3;
   string full_name = 4;
-  string avatar_url = 5;
+  string icon_url = 5;
   string description = 6;
   int32 grade = 7;
   bool left = 8;
-  string short_department = 10;
   string role = 11;
   string twitter_screen_name = 12;
   string github_user_name = 13;
   type.Department department = 14;
+  ProfileScope profile_scope = 15;
+}
+
+enum ProfileScope {
+  MEMBERS_ONLY = 0;
+  PUBLIC = 1;
 }
 
 message ListUsersRequest {
@@ -82,8 +94,20 @@ message CreateUserRequest {
 
 message GetCurrentUserRequest {}
 
-message UpdateUserRequest {
-  User user = 1;
+message UpdateUserProfileRequest {
+  string full_name = 1 [(validator.field) = {length_lt: 128}];
+  string description = 2 [(validator.field) = {length_lt: 1024}];
+  int32 grade = 3 [(validator.field) = {int_gt: 0, int_lt: 6}];
+  bool left = 4;
+  uint32 role_id = 5;
+  string twitter_screen_name = 6 [(validator.field) = {regex: "^[A-Za-z0-9_]{0,15}$"}];
+  string github_user_name = 7 [(validator.field) = {regex: "^([a-z\\d]+-)*[a-z\\d]+$", length_lt: 40}];
+  uint32 department_id = 8;
+  ProfileScope profile_scope = 9 [(validator.field) = {is_in_enum : true}];
+}
+
+message UpdateUserIconRequest {
+  bytes image = 1;
 }
 
 message UpdatePasswordRequest {