AP-43 refactor bond server based on API changes (#505)

mozilla-release/mobile/android/app/src/bond/java/org/mozilla/gecko/authentication/TalkToServer.java

@@ -5,6 +5,7 @@
 import org.mozilla.gecko.BondV1Grpc;
 import org.mozilla.gecko.Error;
 import org.mozilla.gecko.ErrorCode;
+import org.mozilla.gecko.RegisterDeviceRequest;
 import org.mozilla.gecko.Response;
 import org.mozilla.gecko.UserAuth;
 
@@ -33,30 +34,33 @@
     static final int WAIT_FOR_ACTIVATION = 3;
     private ManagedChannel mChannel;
     private ServerCallbacks mServerCallbacks;
-    private UserAuth mUserAuth;
+    private RegisterDeviceRequest mRegisterDeviceRequest;
     private int mWhichCase;
 
     TalkToServer(ServerCallbacks serverCallbacks, int whichCase, String emailId, String secretKey) {
         mServerCallbacks = serverCallbacks;
         mWhichCase = whichCase;
-        mUserAuth = UserAuth.newBuilder().setUsername(emailId)
+        final UserAuth userAuth = UserAuth.newBuilder().setUsername(emailId)
                 .setPassword(secretKey).build();
+
+        mRegisterDeviceRequest = RegisterDeviceRequest.newBuilder().setAuth(userAuth)
+                .setDescription("mobile-android").build();
     }
 
     @Override
     protected Response doInBackground(Void... voids) {
         try {
-            mChannel = ManagedChannelBuilder.forAddress(HOST, PORT)
-                    .build();
+            mChannel = ManagedChannelBuilder.forAddress(HOST, PORT).build();
             BondV1Grpc.BondV1BlockingStub stub = BondV1Grpc.newBlockingStub(mChannel);
             switch (mWhichCase) {
                 case REGISTER_DEVICE:
-                    return stub.registerDevice(mUserAuth);
+                    return stub.registerDevice(mRegisterDeviceRequest);
                 case IS_DEVICE_ACTIVE:
                 case WAIT_FOR_ACTIVATION:
-                    return stub.isDeviceActivated(mUserAuth);
+                    return stub.isDeviceActivated(mRegisterDeviceRequest.getAuth());
+                default:
+                    return stub.registerDevice(mRegisterDeviceRequest);
             }
-            return stub.registerDevice(mUserAuth);
         } catch (Exception e) {
             StringWriter sw = new StringWriter();
             PrintWriter pw = new PrintWriter(sw);

mozilla-release/mobile/android/app/src/main/proto/bond_server.proto

@@ -5,11 +5,21 @@ option java_package = "org.mozilla.gecko";
 option java_outer_classname = "BondServerProto";
 
 service BondV1 {
-  rpc RegisterDevice(UserAuth) returns (Response);
+  rpc RegisterDevice(RegisterDeviceRequest) returns (Response);
+  rpc GetDevices(UserAuth) returns (GetDevicesResponse);
+  rpc UnregisterDevice(UnregisterDeviceRequest) returns (Response);
   rpc ResendActivationEmail(UserAuth) returns (Response);
   rpc IsDeviceActivated(UserAuth) returns (Response);
+  rpc RequestDelete(UserAuth) returns (Response);
+
+  // Subscription management
   rpc GetSubscriptions(UserAuth) returns (Subscriptions);
-  rpc GetVpnCredentials(UserAuth) returns (VpnResponse);
+  rpc Subscribe(SubscribeRequest) returns (Response);
+  rpc Unsubscribe(UnsubscribeRequest) returns (Response);
+
+  // Getting premium content
+  rpc GetOVPNConfig(UserAuth) returns (OVPNResponse);
+  rpc GetIPSecCreds(UserAuth) returns (IPSecResponse);
 }
 
 // General enume to hold error codes, common to the whole service
@@ -24,6 +34,13 @@ enum ErrorCode {
   INTERNAL = 7;
   UNAUTHORIZED = 8;
   EMAIL_UNCONFIRMED = 9;
+  NOT_SUBSCRIBED = 10;
+}
+
+enum SubscriptionType {
+  TRIAL = 0;
+  TRIAL_CODE = 1;
+  PREMIUM_MONTHLY = 2;
 }
 
 message Error {
@@ -43,13 +60,68 @@ message UserAuth {
   string password = 2;
 }
 
-message VpnResponse {
+message RegisterDeviceRequest {
+  UserAuth auth = 1;
+  string description = 2;
+}
+
+message UnregisterDeviceRequest {
+  UserAuth auth = 1;
+  int64 deviceId = 2;
+}
+
+message Device {
+  int64 id = 1;
+  string description = 2;
+  bool activated = 3;
+}
+
+message GetDevicesResponse {
+  repeated Error error = 1;
+  repeated Device devices = 2;
+  int64 requesterId = 3;
+}
+
+message OVPNResponse {
+  repeated Error error = 1;
+  map <string, OVPNConfig> config = 2;
+}
+
+message OVPNConfig {
+  string config = 1;
+  string username = 2;
+  string password = 3;
+}
+
+message IPSecResponse {
   repeated Error error = 1;
+  map <string, IPSecConfig> config = 2;
+}
+
+message IPSecConfig {
+  string secret = 1;
   string username = 2;
   string password = 3;
 }
 
+message Subscription {
+  SubscriptionType type = 1;
+  int64 expires = 2;
+  int64 id = 3;
+}
+
 message Subscriptions {
   repeated Error error = 1;
-  repeated string name = 2;
+  repeated Subscription subscriptions = 2;
+}
+
+message SubscribeRequest {
+  UserAuth auth = 1;
+  string token = 2;
+  SubscriptionType type = 3;
+}
+
+message UnsubscribeRequest {
+  UserAuth auth = 1;
+  Subscription subscription = 3;
 }