chore: use email from token when creating a demo organization

Signed-off-by: Alessandro Yuichi Okimoto <yuichijpn@gmail.com>

Author: cre8ivejp

api-description/web-api.swagger.yaml

@@ -10776,14 +10776,11 @@ definitions:
         type: string
       urlCode:
         type: string
-      ownerEmail:
-        type: string
       description:
         type: string
     required:
       - name
       - urlCode
-      - ownerEmail
   environmentCreateDemoOrganizationResponse:
     type: object
     properties:

pkg/environment/api/api_test.go

@@ -71,7 +71,7 @@ func createDemoContextWithToken(t *testing.T) context.Context {
 		Audience: "audience",
 		Expiry:   time.Now().AddDate(100, 0, 0),
 		IssuedAt: time.Now(),
-		Email:    "email",
+		Email:    "test@example.com",
 	}
 	ctx := context.TODO()
 	return context.WithValue(ctx, rpc.Key, token)

pkg/environment/api/organization.go

@@ -250,7 +250,7 @@ func (s *EnvironmentService) CreateDemoOrganization(
 		ctx,
 		req.Name,
 		req.UrlCode,
-		req.OwnerEmail,
+		demoToken.Email,
 		req.Description,
 		false,
 		false,
@@ -344,18 +344,6 @@ func validateCreateDemoOrganizationRequest(
 		}
 		return dt.Err()
 	}
-
-	req.OwnerEmail = strings.TrimSpace(req.OwnerEmail)
-	if !emailRegex.MatchString(req.OwnerEmail) {
-		dt, err := statusInvalidOrganizationCreatorEmail.WithDetails(&errdetails.LocalizedMessage{
-			Locale:  localizer.GetLocale(),
-			Message: localizer.MustLocalizeWithTemplate(locale.InvalidArgumentError, "owner_email"),
-		})
-		if err != nil {
-			return statusInternal.Err()
-		}
-		return dt.Err()
-	}
 	return nil
 }
 

pkg/environment/api/organization_test.go

@@ -196,7 +196,7 @@ func TestCreateOrganizationMySQL(t *testing.T) {
 	orgExpected, err := domain.NewOrganization(
 		"name",
 		"url-code",
-		"test@test.org",
+		"test@example.com",
 		"description",
 		false,
 		false,
@@ -1147,7 +1147,7 @@ func TestEnvironmentService_CreateDemoOrganization(t *testing.T) {
 	orgExpected, err := domain.NewOrganization(
 		"name",
 		"url-code",
-		"test@test.org",
+		"test@example.com",
 		"description",
 		false,
 		false,
@@ -1198,7 +1198,7 @@ func TestEnvironmentService_CreateDemoOrganization(t *testing.T) {
 					gomock.Any(), gomock.Any(),
 				).Return(v2es.ErrOrganizationAlreadyExists)
 			},
-			req:         &proto.CreateDemoOrganizationRequest{Name: "id-0", UrlCode: "id-0", OwnerEmail: "test@test.org"},
+			req:         &proto.CreateDemoOrganizationRequest{Name: "id-0", UrlCode: "id-0"},
 			expectedErr: createError(statusOrganizationAlreadyExists, localizer.MustLocalize(locale.AlreadyExistsError)),
 		},
 		{
@@ -1208,7 +1208,7 @@ func TestEnvironmentService_CreateDemoOrganization(t *testing.T) {
 					gomock.Any(), gomock.Any(),
 				).Return(errors.New("error"))
 			},
-			req:         &proto.CreateDemoOrganizationRequest{Name: "id-1", UrlCode: "id-1", OwnerEmail: "test@test.org"},
+			req:         &proto.CreateDemoOrganizationRequest{Name: "id-1", UrlCode: "id-1"},
 			expectedErr: createError(statusInternal, localizer.MustLocalize(locale.InternalServerError)),
 		},
 		{
@@ -1237,7 +1237,6 @@ func TestEnvironmentService_CreateDemoOrganization(t *testing.T) {
 				Name:        orgExpected.Name,
 				UrlCode:     orgExpected.UrlCode,
 				Description: orgExpected.Description,
-				OwnerEmail:  "test@test.org",
 			},
 			expected:    orgExpected.Organization,
 			expectedErr: nil,

proto/environment/service.pb.go

@@ -404,8 +404,7 @@ message DemoCreationToken {
 message CreateDemoOrganizationRequest {
   string name = 1 [(google.api.field_behavior) = REQUIRED];
   string url_code = 2 [(google.api.field_behavior) = REQUIRED];
-  string owner_email = 3 [(google.api.field_behavior) = REQUIRED];
-  string description = 4;
+  string description = 3;
 }
 
 message CreateDemoOrganizationResponse {

proto/environment/service.proto

@@ -14722,17 +14722,6 @@
               },
               {
                 "id": 3,
-                "name": "owner_email",
-                "type": "string",
-                "options": [
-                  {
-                    "name": "(google.api.field_behavior)",
-                    "value": "REQUIRED"
-                  }
-                ]
-              },
-              {
-                "id": 4,
                 "name": "description",
                 "type": "string"
               }

proto/proto.lock

@@ -2151,9 +2151,6 @@ export class CreateDemoOrganizationRequest extends jspb.Message {
   getUrlCode(): string;
   setUrlCode(value: string): void;
 
-  getOwnerEmail(): string;
-  setOwnerEmail(value: string): void;
-
   getDescription(): string;
   setDescription(value: string): void;
 
@@ -2182,7 +2179,6 @@ export namespace CreateDemoOrganizationRequest {
   export type AsObject = {
     name: string;
     urlCode: string;
-    ownerEmail: string;
     description: string;
   };
 }

ui/web-v2/src/proto/environment/service_pb.d.ts

@@ -12593,8 +12593,7 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
         obj = {
           name: jspb.Message.getFieldWithDefault(msg, 1, ''),
           urlCode: jspb.Message.getFieldWithDefault(msg, 2, ''),
-          ownerEmail: jspb.Message.getFieldWithDefault(msg, 3, ''),
-          description: jspb.Message.getFieldWithDefault(msg, 4, '')
+          description: jspb.Message.getFieldWithDefault(msg, 3, '')
         };
 
       if (includeInstance) {
@@ -12643,10 +12642,6 @@ proto.bucketeer.environment.CreateDemoOrganizationRequest.deserializeBinaryFromR
           msg.setUrlCode(value);
           break;
         case 3:
-          var value = /** @type {string} */ (reader.readString());
-          msg.setOwnerEmail(value);
-          break;
-        case 4:
           var value = /** @type {string} */ (reader.readString());
           msg.setDescription(value);
           break;
@@ -12690,13 +12685,9 @@ proto.bucketeer.environment.CreateDemoOrganizationRequest.serializeBinaryToWrite
     if (f.length > 0) {
       writer.writeString(2, f);
     }
-    f = message.getOwnerEmail();
-    if (f.length > 0) {
-      writer.writeString(3, f);
-    }
     f = message.getDescription();
     if (f.length > 0) {
-      writer.writeString(4, f);
+      writer.writeString(3, f);
     }
   };
 
@@ -12741,33 +12732,13 @@ proto.bucketeer.environment.CreateDemoOrganizationRequest.prototype.setUrlCode =
   };
 
 /**
- * optional string owner_email = 3;
- * @return {string}
- */
-proto.bucketeer.environment.CreateDemoOrganizationRequest.prototype.getOwnerEmail =
-  function () {
-    return /** @type {string} */ (
-      jspb.Message.getFieldWithDefault(this, 3, '')
-    );
-  };
-
-/**
- * @param {string} value
- * @return {!proto.bucketeer.environment.CreateDemoOrganizationRequest} returns this
- */
-proto.bucketeer.environment.CreateDemoOrganizationRequest.prototype.setOwnerEmail =
-  function (value) {
-    return jspb.Message.setProto3StringField(this, 3, value);
-  };
-
-/**
- * optional string description = 4;
+ * optional string description = 3;
  * @return {string}
  */
 proto.bucketeer.environment.CreateDemoOrganizationRequest.prototype.getDescription =
   function () {
     return /** @type {string} */ (
-      jspb.Message.getFieldWithDefault(this, 4, '')
+      jspb.Message.getFieldWithDefault(this, 3, '')
     );
   };
 
@@ -12777,7 +12748,7 @@ proto.bucketeer.environment.CreateDemoOrganizationRequest.prototype.getDescripti
  */
 proto.bucketeer.environment.CreateDemoOrganizationRequest.prototype.setDescription =
   function (value) {
-    return jspb.Message.setProto3StringField(this, 4, value);
+    return jspb.Message.setProto3StringField(this, 3, value);
   };
 
 if (jspb.Message.GENERATE_TO_OBJECT) {