Allow logging in with email

Author: nygrenh

assets/js/csa.js

@@ -109,7 +109,7 @@ var SITE = {
         $loginError.show();
       }
 
-      var client = new window.TmcClient();
+      var client = new window.TmcClient("2d2084443754c26933fa53548177386c8210bff472e8bd157df84033f24cadd5", "34a49ed3d20b8a524889cc64a4668e9fced34ab41b7c74a11689a4602e906a12");
 
       if(client.getUser()) {
         $loginTrigger.text('Log out ' + client.getUser().username);
@@ -148,16 +148,15 @@ var SITE = {
           } else {
             client.authenticate({ username: username, password: password })
               .then(function(response) {
-                $loginTrigger.text('Log out ' + client.getUser().username);
+
+
+                $loginTrigger.text('Log out');
                 $loginModal.modal('hide');
 
                 SITE.initQuiznator();
               })
               .catch(function() {
                 var error = 'Invalid username or password.';
-                if (username.indexOf("@") != -1) {
-                  error = error + " Note that you're supposed to log in with your username and NOT with your email."
-                }
                 showError(error);
               });
           }

assets/js/tmc-client-js/dist/tmc-client.min.js

@@ -326,26 +326,32 @@ <h2>Read and reflect</h2>
             <div class="modal-content">
               <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">Log into your TestMyCode account</h4>
+                <h4 class="modal-title">Log in with your MOOC.fi account</h4>
               </div>
               <div class="modal-body">
                 <div class="alert alert-info">
-                  Don't have a TestMyCode account? <a href="https://tmc.mooc.fi/user/new" target="_blank">Sign up</a>.
+                  Don't have a MOOC.fi account? <a href="https://tmc.mooc.fi/user/new" target="_blank">Sign up</a>.
                 </div>
 
                 <div class="alert alert-danger" id="tmc-login-error" style="display: none">
                 </div>
 
                 <div class="form-group">
-                  <label>Username</label>
-                  <input type="text" id="tmc-login-username" class="form-control" placeholder="Username"/>
+                  <label>Username or email</label>
+                  <input type="text" id="tmc-login-username" class="form-control" placeholder="Username or email"/>
                 </div>
 
                 <div class="form-group">
                   <label>Password</label>
                   <input type="password" id="tmc-login-password" class="form-control" placeholder="Password"/>
                 </div>
+
+                <div class="form-group">
+                  <a href="https://tmc.mooc.fi/password_reset_keys/new">I forgot my password</a>
+                </div>
               </div>
+
+
               <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                 <button type="button" class="btn btn-primary" id="tmc-login-submit">Log in</button>