diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index f5341fb..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 4249b68..1791af7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.*sw* bower_components/ assets/ +.DS_Store diff --git a/css/daplie-installer-overrides.css b/css/daplie-installer-overrides.css index 2d8abfc..a00cb00 100644 --- a/css/daplie-installer-overrides.css +++ b/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; +} diff --git a/img/.DS_Store b/img/.DS_Store deleted file mode 100644 index a0da656..0000000 Binary files a/img/.DS_Store and /dev/null differ diff --git a/index.html b/index.html index 835a38d..ed27a01 100644 --- a/index.html +++ b/index.html @@ -1,30 +1,30 @@ - - - - Login Facilitator: OAuth3.org - - - - - - + + + + Login Facilitator: OAuth3.org + + + + + + - + - - - - + + + + - + - +
-

Safelogin.org

-

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.

+

daplie.me

+

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.

@@ -45,7 +45,7 @@
-

Safelogin.org

+

daplie.me

- + @@ -85,14 +86,14 @@
-

Safelogin.org

+

daplie.me

-

Almost done. Now it’s time to set your preferences.

+

Almost done. Now it's time to set your preferences.


@@ -151,5 +152,5 @@ - + diff --git a/js/issuer.js b/js/issuer.js index eff27af..438b163 100644 --- a/js/issuer.js +++ b/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'); }); }; diff --git a/js/script.js b/js/script.js index ae26237..2f567ba 100644 --- a/js/script.js +++ b/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) { -// 'use strict'; -// var keyCode = e.keyCode || e.which; -// var regex = new RegExp('^[0-9 \-]+$'); -// var key = String.fromCharCode(!e.charCode ? e.which : e.charCode); -// var oauthCode = $(this).val().split('-').join('').replace(/\s/g, ''); -// -// if (!regex.test(key)) { -// event.preventDefault(); -// return false; -// } -// -// if (oauthCode.length > 0) { -// oauthCode = oauthCode.match(new RegExp('.{1,4}', 'g')).join("-"); -// } -// -// $(this).val(oauthCode); -// -// if($(this).val().length === $(this).attr("maxlength")){ -// $('.submit-btn').prop("disabled", false); -// } -// }); +$('body').on('keyup keypress', '.js-authn-otp-code', function (e) { + 'use strict'; + // var keyCode = e.keyCode || e.which; + // var regex = new RegExp('^[0-9 \-]+$'); + // var key = String.fromCharCode(!e.charCode ? e.which : e.charCode); + // var oauthCode = $(this).val().split('-').join('').replace(/\s/g, ''); + // + // if (!regex.test(key)) { + // event.preventDefault(); + // return false; + // } + // + // if (oauthCode.length > 0) { + // oauthCode = oauthCode.match(new RegExp('.{1,4}', 'g')).join("-"); + // } + // + // $(this).val(oauthCode); + // + // if($(this).val().length === $(this).attr("maxlength")){ + // $('.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('####-####-####');