update phone auth, idv, api dropdown

Author: karissarjacobsen

Gemfile.lock

@@ -97,7 +97,7 @@ GEM
       json (~> 2.1, >= 2.1.0)
       jwt (~> 2.2, >= 2.2.1)
       typhoeus (~> 1.0, >= 1.0.1)
-    docusign_esign (3.13.0.rc1)
+    docusign_esign (3.13.0)
       addressable (~> 2.7, >= 2.7.0)
       json (~> 2.1, >= 2.1.0)
       jwt (~> 2.2, >= 2.2.1)
@@ -113,10 +113,10 @@ GEM
       jwt (~> 2.2, >= 2.2.1)
       typhoeus (~> 1.0, >= 1.0.1)
     erubi (1.10.0)
-    ethon (0.14.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     execjs (2.8.1)
-    faraday (1.7.0)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -135,17 +135,17 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    ffi (1.15.3)
+    ffi (1.15.4)
     globalid (0.5.2)
       activesupport (>= 5.0)
     hashie (4.1.0)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
     jbuilder (2.10.2)
       activesupport (>= 5.0.0)
-    json (2.5.1)
-    jwt (2.2.3)
+    json (2.6.1)
+    jwt (2.3.0)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -154,9 +154,9 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (0.9.2)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     minitest (5.14.4)
     msgpack (1.4.2)
     multi_json (1.15.0)
@@ -177,7 +177,7 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection
-    omniauth-oauth2 (1.7.1)
+    omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
     omniauth-rails_csrf_protection (1.0.0)
@@ -191,9 +191,9 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (4.3.9)
+    puma (4.3.10)
       nio4r (~> 2.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
@@ -279,7 +279,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   x86_64-darwin-20

app/controllers/ds_common_controller.rb

@@ -6,22 +6,33 @@ class DsCommonController < ApplicationController
 
   def index
     @show_doc = Rails.application.config.documentation
-    if Rails.configuration.examples_API['Rooms']
+    if session[:examples_API] == 'Rooms'
       render 'room_api/index'
-    elsif Rails.configuration.examples_API['Click']
+    elsif session[:examples_API] == 'Click'
       render 'clickwrap/index'
-    elsif Rails.configuration.examples_API['Monitor']
+    elsif session[:examples_API] == 'Monitor'
       render 'monitor_api/index'
-    elsif Rails.configuration.examples_API['Admin']
+    elsif session[:examples_API] == 'Admin'
       render 'admin_api/index'
     else
+      session[:examples_API] = 'eSignature'
       @show_doc = Rails.application.config.documentation
       if Rails.configuration.quickstart && session[:been_here].nil?
         redirect_to '/eg001'
       end
     end
   end
 
+  def choose_api
+    render 'ds_common/choose_api'
+  end
+
+  def api_selected
+    session.delete :eg
+    session[:examples_API] = params[:chosen_api]
+    redirect_to '/ds/mustAuthenticate'
+  end
+
   def ds_return
     # To break out of the Quickstart loop an example has been completed
     session[:been_here] = true
@@ -32,17 +43,17 @@ def ds_return
   end
 
   def ds_must_authenticate
-    if Rails.configuration.examples_API['Monitor']
+    if session[:examples_API] == 'Monitor'
       jwt_auth
     end
-    if Rails.configuration.quickstart
-      redirect_to('/auth/docusign')
+    if Rails.configuration.quickstart and session[:been_here].nil? and session[:examples_API] == 'eSignature'
+      redirect_to "/auth/docusign"
     end
     @title = 'Authenticate with DocuSign'
     @show_doc = Rails.application.config.documentation
 
     if params[:auth] == 'grand-auth'
-      redirect_to('/auth/docusign')
+      redirect_to "/auth/docusign"
     elsif params[:auth] == 'jwt-auth'
       jwt_auth
     end
@@ -57,16 +68,16 @@ def jwt_auth
       end
     else
       session['omniauth.state'] = SecureRandom.hex
-      url = JwtAuth::JwtCreator.consent_url(session['omniauth.state'])
+      url = JwtAuth::JwtCreator.consent_url(session['omniauth.state'], session['examples_API'])
     redirect_to root_path if session[:token].present?
     end
-    if Rails.configuration.examples_API['Rooms']
+    if session[:examples_API] == 'Rooms'
       configuration = DocuSign_Rooms::Configuration.new
       api_client = DocuSign_Rooms::ApiClient.new(configuration)
-    elsif Rails.configuration.examples_API['Click']
+    elsif session[:examples_API] == 'Click'
       configuration = DocuSign_Click::Configuration.new
       api_client = DocuSign_Click::ApiClient.new configuration
-    elsif Rails.configuration.examples_API['Admin']
+    elsif session[:examples_API] == 'Admin'
       configuration = DocuSign_Admin::Configuration.new
       api_client = DocuSign_Admin::ApiClient.new configuration
     end

app/controllers/e_sign/eg020_phone_authentication_controller.rb

@@ -6,11 +6,18 @@ def create
     if check_token(minimum_buffer_min)
       begin
         results = ESign::Eg020PhoneAuthenticationService.new(request, session).call
-        session[:envelope_id] = results.envelope_id
-        @title = 'Require Phone Authentication for a Recipient'
-        @h1 = 'Require Phone Authentication for a Recipient'
-        @message = "The envelope has been created and sent!<br/>Envelope ID #{results.envelope_id}."
-        render 'ds_common/example_done'
+        if results.to_s == "phone_auth_not_enabled"
+          @error_code = "IDENTITY_WORKFLOW_INVALID_ID"
+          @error_message = "The identity workflow ID specified is not valid."
+          @error_information = "Please contact <a target='_blank' rel='noopener noreferrer' href='https://support.docusign.com/'>Support</a> to enable ID verification in your account."
+          render 'ds_common/error'
+        else
+          session[:envelope_id] = results.envelope_id
+          @title = 'Require Phone Authentication for a Recipient'
+          @h1 = 'Require Phone Authentication for a Recipient'
+          @message = "The envelope has been created and sent!<br/>Envelope ID #{results.envelope_id}."
+          render 'ds_common/example_done'
+        end
       rescue DocuSign_eSign::ApiError => e
         error = JSON.parse e.response_body
         @error_code = error['errorCode']

app/controllers/e_sign/eg023_idv_authentication_controller.rb

@@ -6,12 +6,12 @@ def create
     if check_token(minimum_buffer_min)
       begin
         results = ESign::Eg023IdvAuthenticationService.new(request, session).call
-        if results.to_s == 'needs_idv_activated'
-          @title = 'Error'
-          @h1 = 'Error'
-          @message = 'Please activate IDV on your account to use this example.'
-          render 'ds_common/example_done'
-          
+        if results.to_s == "idv_not_enabled"
+          @error_code = "IDENTITY_WORKFLOW_INVALID_ID"
+          @error_message = "The identity workflow ID specified is not valid."
+          @error_information = "Please contact <a target='_blank' rel='noopener noreferrer' href='https://support.docusign.com/'>Support</a> to enable ID verification in your account."
+          render 'ds_common/error'
+
         else
           @title = 'Envelope sent'
           @h1 = 'Envelope sent'

app/controllers/session_controller.rb

@@ -24,6 +24,10 @@ def destroy
     redirect_to root_path
   end
 
+  # def switch_api
+  #   internal_destroy
+  # end
+
   # GET /auth/failure
   def omniauth_failure
     error_msg = "OmniAuth authentication failure message: #{params[:message]} for strategy: #{params[:strategy]} and HTTP_REFERER: #{params[:origin]}"

app/services/admin_api/get_data_service.rb

@@ -32,7 +32,6 @@ def get_ds_groups
 
     def get_organization_id
       worker
-      puts "\n\n getting org_id \n\n"
       accounts_api = DocuSign_Admin::AccountsApi.new(@api_client)
       accounts_api.get_organizations().organizations[0].as_json['id']
     end

app/services/e_sign/eg020_phone_authentication_service.rb

@@ -24,10 +24,12 @@ def initialize(request, session)
   end
 
   def call
-    envelope_api = create_envelope_api(args)
+    if session[:workflow_id].blank?
+      return "phone_auth_not_enabled"
+    end
 
     # Construct your envelope JSON body
-    # Step 3 start
+    # Step 4 start
     envelope_definition = DocuSign_eSign::EnvelopeDefinition.new
     envelope_definition.email_subject = 'Please sign this document set'
 
@@ -64,8 +66,8 @@ def call
     input_option.phone_number_list = [phone_number]
 
     identity_verification = DocuSign_eSign::RecipientIdentityVerification.new
-
     identity_verification.workflow_id = session[:workflow_id]
+
     identity_verification.input_options = [input_option]
 
     signer1.identity_verification = identity_verification
@@ -92,30 +94,47 @@ def call
     # To request that the envelope be created as a draft, set to "created"
     envelope_definition.recipients = recipients
     envelope_definition.status = envelope_args[:status]
+<<<<<<< HEAD
     # Step 3 end
-    
+
     # Call the eSignature REST API
     # Step 4 start
     results = envelope_api.create_envelope args[:account_id], envelope_definition
     # Step 4 end
+=======
+    # Step 4 end
+
+    # Call the eSignature REST API
+    # Step 5 start
+    envelope_api = create_envelope_api(args)
+    results = envelope_api.create_envelope args[:account_id], envelope_definition
+    # Step 5 end
+>>>>>>> 05e033800b84776cb28f1e661209b778096626a5
   end
 
   def get_workflow(args)
     #Retrieve the workflow id
+
     begin
+      # Step 3 start
       workflow_details = create_account_api(args)
       workflow_response = workflow_details.get_account_identity_verification(args[:account_id])
 
       # Check that idv authentication is enabled
-      # The workflow ID is a hard-coded value which is unique to this phone authentication workflow
       if workflow_response.identity_verification
-          session[:workflow_id] = "c368e411-1592-4001-a3df-dca94ac539ae"
+        phone_auth_workflow = workflow_response.identity_verification.find{ |item| item.default_name == "Phone Authentication" }
+        if phone_auth_workflow
+          session[:workflow_id] = phone_auth_workflow.workflow_id
           return session[:workflow_id]
+        else
+          return ""
+        end
       else
-          return None
+          return ""
       end
+      # Step 3 end
 
-    rescue DocuSign_Admin::ApiError => e
+    rescue DocuSign_eSign::ApiError => e
       error = JSON.parse e.response_body
       @error_code = e.code
       @error_message = error['error_description']