WIP

Signed-off-by: Lukasz Gryglicki <[email protected]>

Author: lukaszgryglicki

cla-backend-go/swagger/cla.v2.yaml

@@ -2485,7 +2485,7 @@ paths:
         '404':
           $ref: '#/responses/not-found'
       tags:
-        - signatures
+        - sign
 
   /signatures/project/{projectSFID}/company/{companyID}/employee:
     get:

cla-backend-go/swagger/common/user-active-signature.yaml

@@ -17,11 +17,16 @@ properties:
   repository_id:
     type: string
     description: The unique ID of the associated repository
-    example: repo-abc123
+    example: '168926425'
   pull_request_id:
     type: string
     description: The pull request ID related to the signature
     example: '456'
+  merge_request_id:
+    type: string
+    description: The merge request ID related to the signature
+    example: '456'
+    x-nullable: true
   return_url:
     type: string
     format: uri

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

@@ -248,6 +248,26 @@ func Configure(api *operations.EasyclaAPI, service Service, userService users.Se
 			return sign.NewCclaCallbackOK()
 		})
 
+	api.SignGetUserActiveSignatureHandler = sign.GetUserActiveSignatureHandlerFunc(
+		func(params sign.GetUserActiveSignatureParams) middleware.Responder {
+			reqId := utils.GetRequestID(params.XREQUESTID)
+			ctx := context.WithValue(params.HTTPRequest.Context(), utils.XREQUESTIDKey, reqId)
+			f := logrus.Fields{
+				"functionName":   "v2.sign.handlers.SignGetUserActiveSignatureHandler",
+				utils.XREQUESTID: ctx.Value(utils.XREQUESTID),
+				"userID":         params.UserID,
+			}
+			var resp *models.UserActiveSignature
+			var err error
+
+			log.WithFields(f).Debug("getting user active signature")
+			resp, err = service.GetUserActiveSignature(ctx, params.UserID)
+			if err != nil {
+				return sign.NewGetUserActiveSignatureBadRequest().WithPayload(errorResponse(reqId, err))
+			}
+			return sign.NewGetUserActiveSignatureOK().WithPayload(resp)
+		})
+
 }
 
 type codedResponse interface {

cla-backend-go/v2/sign/service.go

@@ -90,6 +90,7 @@ type Service interface {
 	SignedIndividualCallbackGitlab(ctx context.Context, payload []byte, userID, organizationID, repositoryID, mergeRequestID string) error
 	SignedIndividualCallbackGerrit(ctx context.Context, payload []byte, userID string) error
 	SignedCorporateCallback(ctx context.Context, payload []byte, companyID, projectID string) error
+	GetUserActiveSignature(ctx context.Context, userID string) (*models.UserActiveSignature, error)
 }
 
 // service
@@ -2769,3 +2770,52 @@ func claSignatoryEmailContent(params ClaSignatoryEmailParams) (string, string) {
 
 	return emailSubject, emailBody
 }
+
+func (s *service) GetUserActiveSignature(ctx context.Context, userID string) (*models.UserActiveSignature, error) {
+	f := logrus.Fields{
+		"functionName":   "sign.GetUserActiveSignature",
+		utils.XREQUESTID: ctx.Value(utils.XREQUESTID),
+		"userID":         userID,
+	}
+	activeSignatureMetadata, err := s.storeRepository.GetActiveSignatureMetaData(ctx, userID)
+	if err != nil {
+		log.WithFields(f).WithError(err).Warnf("unable to get active signature meta data for user: %s", userID)
+		return nil, err
+	}
+
+	log.WithFields(f).Debugf("active signature metadata: %+v", activeSignatureMetadata)
+	isGitlab := false
+	var mergeRequestId *string
+	if mrId, ok := activeSignatureMetadata["merge_request_id"].(string); ok {
+		isGitlab = true
+		mergeRequestId = &mrId
+	}
+	log.WithFields(f).Debugf("generating signature callback url gitlab=%v...", isGitlab)
+
+	var callBackURL string
+	if isGitlab {
+		callBackURL, err = s.getIndividualSignatureCallbackURLGitlab(ctx, userID, activeSignatureMetadata)
+		if err != nil {
+			log.WithFields(f).WithError(err).Warnf("unable to get gitlab signature callback url for user: %s", userID)
+			return nil, err
+		}
+	} else {
+		callBackURL, err = s.getIndividualSignatureCallbackURL(ctx, userID, activeSignatureMetadata)
+		if err != nil {
+			log.WithFields(f).WithError(err).Warnf("unable to get github signature callback url for user: %s", userID)
+			return nil, err
+		}
+	}
+	log.WithFields(f).Debugf("signature callback url: %s", callBackURL)
+	projectId, _ := activeSignatureMetadata["project_id"].(string)
+	pullRequestId, _ := activeSignatureMetadata["pull_request_id"].(string)
+	repositoryId, _ := activeSignatureMetadata["repository_id"].(string)
+	return &models.UserActiveSignature{
+		MergeRequestID: mergeRequestId,
+		ProjectID:      projectId,
+		PullRequestID:  pullRequestId,
+		RepositoryID:   repositoryId,
+		ReturnURL:      strfmt.URI(callBackURL),
+		UserID:         userID,
+	}, nil
+}

utils/active_signature_go.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# user_id='9dcf5bbc-2492-11ed-97c7-3e2a23ea20b5'
+# select key, data:expire from fivetran_ingest.dynamodb_product_us_east1_dev.cla_dev_store where key like 'active_signature:%' order by data:expire desc limit 1;
+# select key, data:expire from fivetran_ingest.dynamodb_product_us_east_1.cla_prod_store where key like 'active_signature:%' order by data:expire desc limit 1;
+# API_URL=https://api-gw.dev.platform.linuxfoundation.org/cla-service DEBUG=1 ./utils/active_signature_go.sh '4b344ac4-f8d9-11ed-ac9b-b29c4ace74e9'
+# API_URL=https://api-gw.dev.platform.linuxfoundation.org/cla-service DEBUG=1 ./utils/active_signature_go.sh '4b344ac4-f8d9-11ed-ac9b-b29c4ace74e9'
+# API_URL=http://localhost:5001 DEBUG='' ./utils/active_signature_go.sh '564e571e-12d7-4857-abd4-898939accdd7'
+# ./utils/add_store_active_signature.sh b817eb57-045a-4fe0-8473-fbb416a01d70 d8cead54-92b7-48c5-a2c8-b1e295e8f7f1
+# DEBUG='' ./utils/active_signature_go.sh b817eb57-045a-4fe0-8473-fbb416a01d70 | jq '.'
+
+if [ -z "$1" ]
+then
+  echo "$0: you need to specify user_id as a 1st parameter"
+  exit 1
+fi
+export user_id="$1"
+
+if [ -z "$API_URL" ]
+then
+  export API_URL="http://localhost:5001"
+fi
+
+if [ ! -z "$DEBUG" ]
+then
+  echo "curl -s -XGET -H 'Content-Type: application/json' \"${API_URL}/v4/user/${user_id}/active-signature\""
+  curl -s -XGET -H "Content-Type: application/json" "${API_URL}/v4/user/${user_id}/active-signature"
+else
+  curl -s -XGET -H "Content-Type: application/json" "${API_URL}/v4/user/${user_id}/active-signature" | jq -r '.'
+fi

utils/add_store_active_signature.sh

@@ -20,7 +20,7 @@ aws --profile "lfproduct-${STAGE}" dynamodb put-item --table-name "cla-${STAGE}-
       "S": "active_signature:'"${1}"'"
     },
     "value": {
-      "S": "{\"user_id\": \"'"${1}"'\", \"project_id\": \"'"${2}"'\", \"repository_id\": 466156917, \"pull_request_id\": 3}"
+      "S": "{\"user_id\": \"'"${1}"'\", \"project_id\": \"'"${2}"'\", \"repository_id\": \"466156917\", \"pull_request_id\": \"3\"}"
     },
     "expire": {
       "N": "'"${EXPIRE_TS}"'"