Merge pull request #4887 from linuxfoundation/unicron-disable-v1-corporate-console-prod

Unicron disable v1 corporate console prod

Author: lukaszgryglicki

cla-backend-go/cmd/dynamo_events_lambda/main.go

@@ -138,7 +138,7 @@ func init() {
 	v2RepositoryService := v2Repositories.NewService(repositoriesRepo, v2Repository, projectClaGroupRepo, githubOrganizationsRepo, gitlabOrganizationRepo, eventsService)
 	gitlabOrgService := gitlab_organizations.NewService(gitlabOrganizationRepo, v2RepositoryService, projectClaGroupRepo, storeRepo, usersService, signaturesRepo, companyRepo)
 
-	companyService := company.NewService(companyRepo, configFile.CorporateConsoleV1URL, userRepo, usersService)
+	companyService := company.NewService(companyRepo, configFile.CorporateConsoleV2URL, userRepo, usersService)
 	v2CompanyService := v2Company.NewService(companyService, signaturesRepo, projectRepo, usersRepo, companyRepo, projectClaGroupRepo, eventsService)
 	organization_service.InitClient(configFile.APIGatewayURL, eventsService)
 	acs_service.InitClient(configFile.APIGatewayURL, configFile.AcsAPIKey)

cla-backend-go/cmd/server.go

@@ -316,10 +316,10 @@ func server(localMode bool) http.Handler {
 	healthService := health.New(Version, Commit, Branch, BuildDate)
 	templateService := template.NewService(stage, templateRepo, docraptorClient, awsSession)
 	v1ProjectService := service.NewService(v1CLAGroupRepo, gitV1Repository, gerritRepo, v1ProjectClaGroupRepo, usersRepo)
-	emailTemplateService := emails.NewEmailTemplateService(v1CLAGroupRepo, v1ProjectClaGroupRepo, v1ProjectService, configFile.CorporateConsoleV1URL, configFile.CorporateConsoleV2URL)
+	emailTemplateService := emails.NewEmailTemplateService(v1CLAGroupRepo, v1ProjectClaGroupRepo, v1ProjectService, configFile.CorporateConsoleV2URL, configFile.CorporateConsoleV2URL)
 	emailService := emails.NewService(emailTemplateService, v1ProjectService)
 	v2ProjectService := v2Project.NewService(v1ProjectService, v1CLAGroupRepo, v1ProjectClaGroupRepo)
-	v1CompanyService := v1Company.NewService(v1CompanyRepo, configFile.CorporateConsoleV1URL, userRepo, usersService)
+	v1CompanyService := v1Company.NewService(v1CompanyRepo, configFile.CorporateConsoleV2URL, userRepo, usersService)
 	v2CompanyService := v2Company.NewService(v1CompanyService, signaturesRepo, v1CLAGroupRepo, usersRepo, v1CompanyRepo, v1ProjectClaGroupRepo, eventsService)
 	v2CurrentUserService := v2CurrentUser.NewService()
 
@@ -329,7 +329,7 @@ func server(localMode bool) http.Handler {
 	gitlabOrganizationsService := gitlab_organizations.NewService(gitlabOrganizationRepo, v2RepositoriesService, v1ProjectClaGroupRepo, storeRepository, usersService, signaturesRepo, v1CompanyRepo)
 	v1SignaturesService := signatures.NewService(signaturesRepo, v1CompanyService, usersService, eventsService, githubOrgValidation, v1RepositoriesService, githubOrganizationsService, v1ProjectService, gitlabApp, configFile.ClaV1ApiURL, configFile.CLALandingPage, configFile.CLALogoURL)
 	v2SignatureService := v2Signatures.NewService(awsSession, configFile.SignatureFilesBucket, v1ProjectService, v1CompanyService, v1SignaturesService, v1ProjectClaGroupRepo, signaturesRepo, usersService, approvalsRepo)
-	v1ClaManagerService := cla_manager.NewService(claManagerReqRepo, v1ProjectClaGroupRepo, v1CompanyService, v1ProjectService, usersService, v1SignaturesService, eventsService, emailTemplateService, configFile.CorporateConsoleV1URL)
+	v1ClaManagerService := cla_manager.NewService(claManagerReqRepo, v1ProjectClaGroupRepo, v1CompanyService, v1ProjectService, usersService, v1SignaturesService, eventsService, emailTemplateService, configFile.CorporateConsoleV2URL)
 	v2ClaManagerService := v2ClaManager.NewService(emailTemplateService, v1CompanyService, v1ProjectService, v1ClaManagerService, usersService, v1RepositoriesService, v2CompanyService, eventsService, v1ProjectClaGroupRepo)
 	v1ApprovalListService := approval_list.NewService(approvalListRepo, v1ProjectClaGroupRepo, v1ProjectService, usersRepo, v1CompanyRepo, v1CLAGroupRepo, signaturesRepo, emailTemplateService, configFile.CorporateConsoleV2URL, http.DefaultClient)
 	authorizer := auth.NewAuthorizer(authValidator, userRepo)
@@ -383,7 +383,7 @@ func server(localMode bool) http.Handler {
 	v2Repositories.Configure(v2API, v2RepositoriesService, eventsService)
 	gerrits.Configure(api, gerritService, v1ProjectService, eventsService)
 	v2Gerrits.Configure(v2API, gerritService, v1ProjectService, eventsService, v1ProjectClaGroupRepo)
-	v2Company.Configure(v2API, v2CompanyService, v1ProjectClaGroupRepo, configFile.LFXPortalURL, configFile.CorporateConsoleV1URL)
+	v2Company.Configure(v2API, v2CompanyService, v1ProjectClaGroupRepo, configFile.LFXPortalURL)
 	v2CurrentUser.Configure(v2API, v2CurrentUserService)
 	cla_manager.Configure(api, v1ClaManagerService, v1CompanyService, v1ProjectService, usersService, v1SignaturesService, eventsService, emailTemplateService)
 	v2ClaManager.Configure(v2API, v2ClaManagerService, v1CompanyService, configFile.LFXPortalURL, configFile.CorporateConsoleV2URL, v1ProjectClaGroupRepo, userRepo)

cla-backend-go/company/service.go

@@ -471,7 +471,7 @@ company.You can choose to accept or deny the request.
 </p>
 %s
 %s`,
-		recipientName, companyName, companyName, requestedUserInfo, utils.GetCorporateURL(false),
+		recipientName, companyName, companyName, requestedUserInfo, utils.GetCorporateURL(),
 		utils.GetEmailHelpContent(false), utils.GetEmailSignOffContent())
 
 	err := utils.SendEmail(subject, body, recipients)
@@ -508,7 +508,7 @@ Manager status.
 </p>
 %s
 %s`,
-		recipientName, companyName, companyName, utils.GetCorporateURL(false),
+		recipientName, companyName, companyName, utils.GetCorporateURL(),
 		utils.GetEmailHelpContent(false), utils.GetEmailSignOffContent())
 
 	err := utils.SendEmail(subject, body, recipients)

cla-backend-go/config/config.go

@@ -64,7 +64,6 @@ type Config struct {
 	AllowedOrigins               []string `json:"-"`
 
 	CorporateConsoleURL   string `json:"corporateConsoleURL"`
-	CorporateConsoleV1URL string `json:"corporateConsoleV1URL"`
 	CorporateConsoleV2URL string `json:"corporateConsoleV2URL"`
 
 	CLAContributorv2Base string `json:"cla-contributor-v2-base"`

cla-backend-go/config/ssm.go

@@ -76,7 +76,7 @@ func loadSSMConfig(awsSession *session.Session, stage string) Config { //nolint
 		fmt.Sprintf("cla-gitlab-app-redirect-uri-%s", stage),
 		fmt.Sprintf("cla-gitlab-app-web-hook-uri-%s", stage),
 		fmt.Sprintf("cla-corporate-base-%s", stage),
-		fmt.Sprintf("cla-corporate-v1-base-%s", stage),
+
 		fmt.Sprintf("cla-corporate-v2-base-%s", stage),
 		fmt.Sprintf("cla-contributor-v2-base-%s", stage),
 		fmt.Sprintf("cla-doc-raptor-api-key-%s", stage),
@@ -187,8 +187,7 @@ func loadSSMConfig(awsSession *session.Session, stage string) Config { //nolint
 			config.CLALogoURL = resp.value
 		case fmt.Sprintf("cla-corporate-base-%s", stage):
 			config.CorporateConsoleURL = resp.value
-		case fmt.Sprintf("cla-corporate-v1-base-%s", stage):
-			config.CorporateConsoleV1URL = resp.value
+
 		case fmt.Sprintf("cla-corporate-v2-base-%s", stage):
 			config.CorporateConsoleV2URL = resp.value
 		case fmt.Sprintf("cla-doc-raptor-api-key-%s", stage):

cla-backend-go/utils/email.go

@@ -99,12 +99,10 @@ func SendEmail(subject string, body string, recipients []string) error {
 	return emailSender.SendEmail(subject, body, recipients)
 }
 
-// GetCorporateURL returns the corporate URL based on the specified flag
-func GetCorporateURL(isV2Project bool) string {
-	if isV2Project {
-		return config.GetConfig().CorporateConsoleV2URL
-	}
-	return config.GetConfig().CorporateConsoleV1URL
+// GetCorporateURL returns the corporate V2 URL (V1 has been shut down)
+func GetCorporateURL() string {
+	// V1 corporate console has been shut down - always return V2 URL
+	return config.GetConfig().CorporateConsoleV2URL
 }
 
 // GetEmailHelpContent returns the standard email help paragraph details.

cla-backend-go/v2/company/handlers.go

@@ -27,7 +27,7 @@ import (
 )
 
 // Configure sets up the middleware handlers
-func Configure(api *operations.EasyclaAPI, service Service, projectClaGroupRepo projects_cla_groups.Repository, LFXPortalURL, v1CorporateConsole string) { // nolint
+func Configure(api *operations.EasyclaAPI, service Service, projectClaGroupRepo projects_cla_groups.Repository, LFXPortalURL string) { // nolint
 
 	api.CompanyGetCompanyByInternalIDHandler = company.GetCompanyByInternalIDHandlerFunc(
 		func(params company.GetCompanyByInternalIDParams, authUser *auth.User) middleware.Responder {
@@ -636,13 +636,8 @@ func Configure(api *operations.EasyclaAPI, service Service, projectClaGroupRepo
 			reqID := utils.GetRequestID(params.XREQUESTID)
 			ctx := context.WithValue(context.Background(), utils.XREQUESTID, reqID) // nolint
 
-			corporateLink := ""
-			// Get appropirate corporate link (v1|v2)
-			if params.Body.Version == "v1" {
-				corporateLink = v1CorporateConsole
-			} else if params.Body.Version == "v2" {
-				corporateLink = LFXPortalURL
-			}
+			// V1 corporate console has been shut down - always use V2 console
+			corporateLink := LFXPortalURL
 
 			err := service.RequestCompanyAdmin(ctx, params.UserID, params.Body.ClaManagerEmail.String(), params.Body.ClaManagerName, params.Body.ContributorName, params.Body.ContributorEmail.String(), params.Body.ProjectName, params.Body.CompanyName, corporateLink)
 			if err != nil {

cla-backend/cla/models/docusign_models.py

@@ -2481,7 +2481,7 @@ def document_signed_email_content(icla: bool, project: Project, signature: Signa
                     f'signatures/{project.get_project_id()}/'
                     f'{signature.get_signature_reference_id()}/ccla/pdf')
 
-    corporate_url = get_corporate_url(project.get_version())
+    corporate_url = get_corporate_url()
 
     recipient_name = user.get_user_name() or user.get_lf_username() or None
     # some defensive code

cla-backend/cla/routes.py

@@ -1275,7 +1275,7 @@ def request_corporate_signature(
     {
       "project_id": "d8cead54-92b7-48c5-a2c8-b1e295e8f7f1",
       "company_id": "83f61e34-4457-45a6-a7ab-449ad6efcfbb",
-      "return_url": "https://corporate.v1.easycla.lfx.linuxfoundation.org/#/company/83f61e34-4457-45a6-a7ab-449ad6efcfbb"
+      "return_url": "https://organization.lfx.linuxfoundation.org/#/company/83f61e34-4457-45a6-a7ab-449ad6efcfbb"
     }
 
     Creates a new signature given project and company IDs. The manager will be redirected to the

cla-backend/cla/utils.py

@@ -1924,13 +1924,14 @@ def get_email_sign_off_content() -> str:
     return "<p>Thanks,</p><p>EasyCLA Support Team</p>"
 
 
-def get_corporate_url(project_version: str) -> str:
+def get_corporate_url() -> str:
     """
-    helper method that returns appropriate corporate link based on EasyCLA version
-    :param project_version: cla_group version(v1|v2)
-    :return: default is v1 corporate console
+    helper method that returns the corporate V2 console URL
+    V1 corporate console has been shut down - always returns V2
+    :return: V2 corporate console URL
     """
-    return CORPORATE_V2_BASE if project_version == "v2" else CORPORATE_BASE
+    # V1 corporate console has been shut down - always return V2
+    return CORPORATE_V2_BASE
 
 
 def append_email_help_sign_off_content(body: str, project_version: str) -> str: