From f6fe6d0f1c1fdce60a3e22e54694225b29af8737 Mon Sep 17 00:00:00 2001
From: Soheel Chughtai <soheel_chughtai@uk.ibm.com>
Date: Thu, 24 Mar 2022 16:33:40 +0000
Subject: [PATCH] Remove username/password fields

---
 README.md                      |  9 +--------
 services/tone_analyzer/v3.html | 13 ++-----------
 services/tone_analyzer/v3.js   | 23 +----------------------
 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index ed50716f..20760f90 100644
--- a/README.md
+++ b/README.md
@@ -13,14 +13,7 @@ Node-RED Watson Nodes for IBM Cloud
 - Min version of Node is 12.20.0
 - Drop Personality Insights node
 - Drop Visual Recognition nodes
-- Remove Username / Password fields from nodes for
-  - Assistant V1
-  - Assistant V2
-  - Discovery V1
-  - Language Translator nodes
-  - Natural Language Classifier
-  - Speech to Text
-  - Text to Speech
+- Remove Username / Password fields from all nodes 
 
 
 ### Watson Nodes for Node-RED
diff --git a/services/tone_analyzer/v3.html b/services/tone_analyzer/v3.html
index d5e7ca3d..abcfbb1f 100644
--- a/services/tone_analyzer/v3.html
+++ b/services/tone_analyzer/v3.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013,2015 IBM Corp.
+  Copyright 2013,2022 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -24,14 +24,7 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-row credentials" style="display: none;">
-        <label for="node-input-username"><i class="fa fa-user"></i> Username</label>
-        <input type="text" id="node-input-username" placeholder="Username">
-    </div>
-    <div class="form-row credentials" style="display: none;">
-        <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
-        <input type="password" id="node-input-password" placeholder="Password">
-    </div>
+
     <div class="form-row credentials" style="display: none;">
         <label for="node-input-apikey"><i class="fa fa-key"></i> API Key</label>
         <input type="password" id="node-input-apikey" placeholder="API Key"></input>
@@ -224,8 +217,6 @@
                 'service-endpoint' :{value: ""}
             },
             credentials: {
-              username: {type:'text'},
-              password: {type:'password'},
               apikey: {type: 'password'}
             },
             color: "rgb(84,149,230)",
diff --git a/services/tone_analyzer/v3.js b/services/tone_analyzer/v3.js
index 00ac08c7..7646f2c5 100644
--- a/services/tone_analyzer/v3.js
+++ b/services/tone_analyzer/v3.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013,2016 IBM Corp.
+ * Copyright 2013,2022 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,25 +23,14 @@ module.exports = function (RED) {
     serviceutils = require('../../utilities/service-utils'),
     payloadutils = require('../../utilities/payload-utils'),
     toneutils = require('../../utilities/tone-utils'),
-    username = '', password = '', sUsername = '', sPassword = '',
     apikey = '', sApikey = '',
     endpoint = '',
     sEndpoint = 'https://gateway.watsonplatform.net/tone-analyzer/api',
     service = null;
 
-  // Require the Cloud Foundry Module to pull credentials from bound service
-  // If they are found then they are stored in sUsername and sPassword, as the
-  // service credentials. This separation from sUsername and username to allow
-  // the end user to modify the node credentials when the service is not bound.
-  // Otherwise, once set username would never get reset, resulting in a frustrated
-  // user who, when he errenously enters bad credentials, can't figure out why
-  // the edited ones are not being taken.
-
   service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER);
 
   if (service) {
-    sUsername = service.username ? service.username : '';
-    sPassword = service.password ? service.password : '';
     sApikey = service.apikey ? service.apikey : '';
     sEndpoint = service.url;
   }
@@ -57,15 +46,10 @@ module.exports = function (RED) {
   var checkCreds = function(credentials) {
     var taSettings = {};
 
-    username = sUsername || credentials.username;
-    password = sPassword || credentials.password;
     apikey = sApikey || credentials.apikey;
 
     if (apikey) {
       taSettings.iam_apikey = apikey;
-    } else if (username && password) {
-      taSettings.username = username;
-      taSettings.password = password;
     } else {
       taSettings = null;
     }
@@ -110,9 +94,6 @@ module.exports = function (RED) {
 
     if (settings.iam_apikey) {
       authSettings.apikey = settings.iam_apikey;
-    } else {
-      authSettings.username = settings.username;
-      authSettings.password = settings.password;
     }
 
     serviceSettings.authenticator = new IamAuthenticator(authSettings);
@@ -196,8 +177,6 @@ module.exports = function (RED) {
 
   RED.nodes.registerType('watson-tone-analyzer-v3', Node, {
     credentials: {
-      username: {type:'text'},
-      password: {type:'password'},
       apikey: {type:'password'}
     }
   });