urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-13 16:03:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

folded /_ back into /~~; 'own' now means "logged in ship if any"

Browse Source
This commit is contained in:
Anton Dyudin 2015-05-19 13:16:44 -07:00
parent a990b50bff
commit b49b65102a
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
base/arvo/eyre.hoon
View File

@ -116,7 +116,7 @@
++ perk-auth :: parsed auth
$% [%at p=pork] :: inject auth
[%del p=(unit ship)]
[%get him=(unit ship) rem=pork]
[%get him=ship rem=pork]
[%js ~]
[%json ~]
[%try him=ship paz=(unit cord)]
@ -280,7 +280,7 @@
urb.foreign = /^\/~\/am/.test(window.location.pathname)
urb.redir = function(ship){
if(ship) document.location.pathname =
document.location.pathname.replace(/^\/_|\/~\/as\/any/,'/~/as/~'+ship)
document.location.pathname.replace(/^\/~~|\/~\/as\/any/,'/~/as/~'+ship)
else document.location =
document.location.hash.match(/#[^?]+/)[0].slice(1) +
document.location.pathname.replace(
@ -294,6 +294,8 @@
function(){urb.redir()})
}
urb.submit = function(){
if(urb.ship !== $ship.text().toLowerCase())
return urb.redir($ship.text().toLowerCase()) // XX redundant?
req(
"/~/auth.json?PUT",
{ship:ship.innerText.toLowerCase(), code:pass.value},
@ -336,15 +338,19 @@
;= ;h1: Please log in
;p.ship
;div.sig: ~
;span#ship;
;span#ship(contenteditable "");
==
;input#pass(type "password");
;pre:code#err;
;script@"/~/at/~/auth.js";
;script:'''
$(function() {
$ship = $('#ship')
$pass = $('#pass')
$ship.on('keydown', function(e) {
if(e.keyCode === 13 || e.keyCode === 9) {
if(urb.ship !== $ship.text().toLowerCase())
urb.redir($ship.text().toLowerCase())
$pass.show()
$pass.focus()
e.preventDefault()
@ -366,8 +372,6 @@
}
})
'''
;pre:code#err;
;script@"/~/at/~/auth.js";
==
::
++ logout-page
@ -378,13 +382,6 @@
;script@"/~/at/~/auth.js";
==
::
++ logside-page
%+ titl 'Verify identify'
;= ;h1: You are ~;{span#ship(contenteditable "")}
;button#act(onclick "urb.redir(ship.innerHTML)"): Go
;pre:code#err;
;script@"/~/at/~/auth.js";
==
++ poke-test
%+ titl 'Poke'
;= ;button(onclick "urb.testPoke('/~/to/hi/txt.json')"): Hi anonymous
@ -505,7 +502,7 @@
%get (pass-note ay/(dray p/uv/~ q.p.kyz p.u.mez) [%e %this q.u.mez])
%got
?. (~(has by pox) p.u.mez)
~& lost-gram-thou/p.u.mez
~& lost-gram-thou/p.kyz^p.u.mez
+>.$
=: hen (~(got by pox) p.u.mez)
pox (~(del by pox) p.u.mez)
@ -862,8 +859,6 @@
|-
?: ?=([%'~~' *] q.pok) :: auth shortcuts
$(q.pok ['~' %as %own t.q.pok])
?: ?=([%'_' *] q.pok)
$(q.pok ['~' %as %any t.q.pok])
?. ?=([%'~' @ *] q.pok) ~
:- ~ ^- perk
=* pef i.t.q.pok
@ -878,10 +873,9 @@
~| bad-ship/?~(but ~ i.but)
?~ but !!
:_ pok(q t.but)
?+ i.but `(slav %p i.but)
%anon `anon
%own `our
%any ~
?+ i.but (slav %p i.but)
%anon anon
%own (fall (ship-from-cookies maf) our)
==
::
%on
@ -1045,18 +1039,13 @@
%get
|-
~| aute/ham
?~ him.ham
=+ him=(ship-from-cookies maf)
?^ him $(him.ham him)
(show-ship-selection)
=* him u.him.ham
?: |(=(anon him) (~(has in aut.yac) him))
=. ..ya abet.yac(him him)
?: |(=(anon him.ham) (~(has in aut.yac) him.ham))
=. ..ya abet.yac(him him.ham)
=+ pez=process(pok rem.ham, aut &)
?: ?=(%| -.pez) pez
[%| (resolve ~ p.pez)]
?. =(our him)
[%| ((teba foreign-auth.yac) him hat rem.ham quy)]
?. =(our him.ham)
[%| ((teba foreign-auth.yac) him.ham hat rem.ham quy)]
(show-login-page ~)
::
%try
@ -1081,7 +1070,7 @@
?: (~(has by wup) u.ses)
[%& %htme login-page:xml]
=+ yac=(new-ya u.ses)
=+ =- lon=(~(has in aut:(fall - *cyst)) our)
=+ =- lon=?~(- | (~(has in aut.u.-) our))
(biff (session-from-cookies cookie-prefix maf) ~(get by wup))
=. yac ?.(lon yac (logon.yac our))
[%| (give-html(..ya abet.yac) 401 cug.yac login-page:xml)]