Merge branch 'daplie.me'

.gitignore

@@ -1,3 +1,4 @@
 *.*sw*
 bower_components/
 assets/
+.DS_Store

css/daplie-installer-overrides.css

@@ -445,3 +445,6 @@ span.dap-small-text.js-scope-desc.noselect {
   color : #808080;
   color : rgb(128, 128, 128);
 }
+.error-msg {
+  color: #FDA748;
+}

index.html

@@ -23,8 +23,8 @@
     <!-- Step 5: ask for permissions -->
 
     <div class="dap-bordered js-userid-container">
-      <p class="org-title">Safelogin.org</p>
+      <p class="org-title">daplie.me</p>
-      <p class="dap-centered-text dap-normal-text welcome-text center-it">Welcome to a new way to login. Safelogin.org helps you create an Internet ID that allows you to choose what info is shared about you when you login into a site or app online.</p>
+      <p class="dap-centered-text dap-normal-text welcome-text center-it">Welcome to a new way to login. daplie.me helps you create an Internet ID that allows you to choose what info is shared about you when you login into a site or app online.</p>
       <form method="post" action="">
         <div class="form-group">
           <input type="email" class="form-control dap-input js-oauth3-email emailInput" placeholder="Enter an email address to start"></input>
@@ -45,7 +45,7 @@
     </div>
 
     <div class="dap-bordered js-authn">
-      <p class="org-title">Safelogin.org</p>
+      <p class="org-title">daplie.me</p>
       <!-- <div class="dap-normal-text">
         <span class="fa fa-3x icon-centered-3x fa-purple fa-envelope"></span>
       </div>
@@ -61,6 +61,7 @@
           <p class="code-lasts-text">Code lasts for 15 minutes.</p>
           <input type="hidden" class="js-authn-otp-uuid">
           <input class="dap-input js-authn-otp-code form-control" placeholder="XXXX-XXXX-XXXX" maxlength="14"></input>
+          <p class="error-msg"></p>
         </div>
         <div class="dap-centered-div dap-space-on-top form-group">
           <label class="js-remember-label dap-normal-text">
@@ -71,7 +72,7 @@
           </label>
         </div>
         <!-- <button class="dap-full-button-green js-remember-btn js-authz-remember-me">SIGN IN ONCE</button> -->
-        <button type="submit" class="btn btn-primary submit-btn dap-full-button-green js-remember-btn js-authz-remember-me">Submit</button>
+        <button type="submit" class="btn btn-primary submit-btn dap-full-button-green js-remember-btn js-authz-remember-me" disabled>Submit</button>
         <!-- <a href="./authnocode.html" target="_blank" class="btn btn-primary">Send Code Again</a> -->
         <button class="btn btn-primary js-edit-email-button" type="button">Edit My Email</button>
       </form>
@@ -85,14 +86,14 @@
     </div>
 
     <div class="dap-bordered dap-normal-text js-authz">
-      <p class="org-title">Safelogin.org</p>
+      <p class="org-title">daplie.me</p>
       <!-- <br> -->
       <!-- <div class="dap-user-plus-app">
         <span class="fa fa-3x fa-purple fa-user-circle"></span>
         <span class="fa fa-2x fa-gray fa-plus"></span>
         <img class="dap-lab-logo" src="./img/Daplie-Badge-Purple.png" alt="Daplie Labs Logo">
       </div> -->
-      <p class="dap-centered-text dap-normal-text almost-done-text">Almost done. Now it’s time to set your preferences.</p>
+      <p class="dap-centered-text dap-normal-text almost-done-text">Almost done. Now it's time to set your preferences.</p>
       <br>
 
       <form class="js-authorization-decision" action="#">

js/issuer.js

@@ -106,6 +106,7 @@ $(function () {
     var callbackUrl;
     // TODO put in directives.json or similar
     var grantDescriptions = {
+      // deprecated
       'oauth3_authn': "Basic secure authentication"
     , 'wallet': "Access to payments and subscriptions"
     , 'bucket': "Access to file storage"
@@ -114,6 +115,17 @@ $(function () {
     , 'domains:glue': "Glue Record management (for vanity nameservers)"
     , 'domains:ns': "Name Server management"
     , 'dns': "DNS records (A/AAAA, TXT, SRV, MX, etc)"
+
+      // new
+    , 'hello@example.com': "Hello World Example Access"
+    , 'authn@oauth3.org': "Basic secure authentication"
+    , 'wallet@oauth3.org': "Access to payments and subscriptions"
+    , 'bucket@oauth3.org': "Access to file storage"
+    , 'db@oauth3.org': "Access to app data"
+    , 'domains@oauth3.org': "Domain registration (and Glue and NS records)" // TODO make an alias
+    , 'domains:glue@oauth3.org': "Glue Record management (for vanity nameservers)"
+    , 'domains:ns@oauth3.org': "Name Server management"
+    , 'dns@oauth3.org': "DNS records (A/AAAA, TXT, SRV, MX, etc)"
     , '*': "FULL ACCOUNT ACCESS"
     };
 
@@ -311,6 +323,8 @@ $(function () {
       return getAccount(session).then(function () {
         return getGrants(session);
       });
+    }, function (error) {
+      $('.error-msg').text('Incorrect code');
     });
 
   };

js/script.js

@@ -69,28 +69,34 @@ $('body').on('click', '.js-auth-li-enabled', function (ev) {
   }
 });
 
-// $('body').on('keyup keypress', '.js-authn-otp-code', function (e) {
+$('body').on('keyup keypress', '.js-authn-otp-code', function (e) {
-//   'use strict';
+  'use strict';
-//   var keyCode = e.keyCode || e.which;
+  // var keyCode = e.keyCode || e.which;
-//   var regex = new RegExp('^[0-9 \-]+$');
+  // var regex = new RegExp('^[0-9 \-]+$');
-//   var key = String.fromCharCode(!e.charCode ? e.which : e.charCode);
+  // var key = String.fromCharCode(!e.charCode ? e.which : e.charCode);
-//   var oauthCode = $(this).val().split('-').join('').replace(/\s/g, '');
+  // var oauthCode = $(this).val().split('-').join('').replace(/\s/g, '');
-//
+  //
-//   if (!regex.test(key)) {
+  // if (!regex.test(key)) {
-//      event.preventDefault();
+  //    event.preventDefault();
-//      return false;
+  //    return false;
-//   }
+  // }
-//
+  //
-//   if (oauthCode.length > 0) {
+  // if (oauthCode.length > 0) {
-//     oauthCode = oauthCode.match(new RegExp('.{1,4}', 'g')).join("-");
+  //   oauthCode = oauthCode.match(new RegExp('.{1,4}', 'g')).join("-");
-//   }
+  // }
-//
+  //
-//   $(this).val(oauthCode);
+  // $(this).val(oauthCode);
-//
+  //
-//   if($(this).val().length === $(this).attr("maxlength")){
+  // if($(this).val().length === $(this).attr("maxlength")){
-//     $('.submit-btn').prop("disabled", false);
+  //   $('.submit-btn').prop("disabled", false);
-//   }
+  // }
-// });
+  if ($(this).val().length === 14) {
+    $('.submit-btn').prop('disabled', false);
+  } else {
+    $('.error-msg').empty();
+    $('.submit-btn').prop('disabled', true);
+  }
+});
 
 $('.js-authn-otp-code').mask('####-####-####');