initial support for login with admin generated auth code (#152)

* initial support for login with admin generated auth code * setting username from url * do not allow resend auth-code in authenticate-with-admin-code mode * beautifying app code
sequentech · Oct 1, 2021 · 06b3947 · 06b3947
1 parent 3469b51
commit 06b3947
Show file tree

Hide file tree

Showing 6 changed files with 4,626 additions and 1,300 deletions.
diff --git a/avRegistration/auth-method-service.js b/avRegistration/auth-method-service.js
@@ -156,6 +156,17 @@ angular.module('avRegistration')
             return $http.post(url, params);
         };
 
+        /**
+         * @returns the http request
+         */
+        authmethod.obtainVoterAuthCode = function (electionId, username)
+        {
+          var params = {username: username};
+          var url = backendUrl + 'auth-event/' + electionId + '/generate-auth-code/';
+
+          return $http.post(url, params);
+        };
+
         /**
          * @returns the http request
          */
@@ -368,6 +379,25 @@ angular.module('avRegistration')
             return fields;
         };
 
+        authmethod.getLoginWithCode = function (_viewEventData) {
+          return [
+            {
+              "name": "__username",
+              "type": "text",
+              "required": true,
+              "min": 3, 
+              "max": 200,
+              "required_on_authentication": true
+            },
+            {
+              "name": "code",
+              "type": "code",
+              "required": true,
+              "required_on_authentication": true
+            }
+          ];
+        };
+
         authmethod.getLoginFields = function (viewEventData) {
             var fields = authmethod.getRegisterFields(
               viewEventData

diff --git a/avRegistration/fields/text-field-directive/text-field-directive.html b/avRegistration/fields/text-field-directive/text-field-directive.html
@@ -3,8 +3,15 @@
     class="form-group"
     ng-class="{'has-error': fieldForm.input.$dirty && fieldForm.input.$invalid}">
     <label for="input{{index}}" class="control-label col-sm-4">
-      <span ng-if="field.name == 'username'" ng-i18next="avRegistration.usernameLabel"></span>
-      <span ng-if="field.name != 'username'">{{field.name}}</span>
+      <span 
+        ng-if="field.name == 'username' || field.name == '__username'"
+        ng-i18next="avRegistration.usernameLabel"
+      ></span>
+      <span 
+        ng-if="field.name != 'username' && field.name != '__username'"
+      >
+        {{field.name}}
+      </span>
     </label>
     <div class="col-sm-8">
       <input

diff --git a/avRegistration/login-controller/login-controller.html b/avRegistration/login-controller/login-controller.html
@@ -5,7 +5,10 @@
       event-id="{{event_id}}"
       code="{{code}}"
       email="{{email}}"
-      ng-if="!isOpenId">
+      with-code="{{withCode}}"
+      username="{{username}}"
+      ng-if="!isOpenId"
+    >
     </div>
     <div
       av-openid-connect

diff --git a/avRegistration/login-controller/login-controller.js b/avRegistration/login-controller/login-controller.js
@@ -20,17 +20,13 @@ angular.module('avRegistration')
     'LoginController',
     function(
       $scope,
-      $stateParams,
-      $filter,
-      $i18next,
-      $cookies,
-      $window,
-      ConfigService,
-      Authmethod)
-    {
+      $stateParams
+    ) {
       $scope.event_id = $stateParams.id;
       $scope.code = $stateParams.code;
       $scope.email = $stateParams.email;
+      $scope.username = $stateParams.username;
       $scope.isOpenId = $stateParams.isOpenId;
+      $scope.withCode = $stateParams.withCode;
     }
   );
diff --git a/avRegistration/login-directive/login-directive.js b/avRegistration/login-directive/login-directive.js
@@ -34,6 +34,8 @@ angular.module('avRegistration')
       function link(scope, element, attrs)
       {
         scope.isCensusQuery = attrs.isCensusQuery;
+        scope.withCode = attrs.withCode;
+        scope.username = attrs.username;
         scope.error = null;
 
         // by default
@@ -372,16 +374,21 @@ angular.module('avRegistration')
               (authevent['census'] === 'open') &&
               (autheventid !== adminId || ConfigService.allowAdminRegistration)
             );
-            if (!scope.isCensusQuery) {
+            if (!scope.isCensusQuery && !scope.withCode) {
               scope.login_fields = Authmethod.getLoginFields(authevent);
-            } else {
+            } else if (scope.withCode) {
+              scope.login_fields = Authmethod.getLoginWithCode(authevent);
+            } else { // scope.isCensusQuery is true
               scope.login_fields = Authmethod.getCensusQueryFields(authevent);
             }
             scope.hide_default_login_lookup_field = authevent.hide_default_login_lookup_field;
             scope.telIndex = -1;
             scope.emailIndex = -1;
             scope.telField = null;
             scope.allowUserResend = (function () {
+              if (scope.withCode) {
+                return false;
+              }
               var ret = false;
               var href = $location.path();
               var adminMatch = href.match(/^\/admin\//);
@@ -434,6 +441,9 @@ angular.module('avRegistration')
                   }
                   scope.telIndex = index+1;
                   scope.telField = el;
+                } else if (el.name === '__username' && scope.withCode) {
+                  el.value = scope.username;
+                  el.disabled = true;
                 }
                 return el;
               });