Update demo app, change default provider to solidtest.space

dmitrizagidulin · dmitrizagidulin · commit 2d6fdf48d97a · 2017-04-11T15:11:29.000-04:00
diff --git a/demo/index.html b/demo/index.html
@@ -9,7 +9,8 @@
   <!-- Solid Demo template/stylesheet -->
   <link rel="stylesheet" href="./demo.css" />
   <!-- Relying Party lib, exports a global var: SolidAuth -->
-  <script src="./solid-client.min.js"></script>
+  <!--<script src="./solid-client.min.js"></script>-->
+  <script src="https://solid.github.io/releases/solid.js/solid-client-0.24.0-oidc.min.js"></script>
 </head>
 <body>
 <div class="container">
@@ -34,10 +35,6 @@ <h5>App body</h5>
           </div>
         </div>
       </div>
-      <div class="row">
-        <div class="col-md-1 text-right"><strong>provider</strong></div>
-        <div class="col-md-11"><code id="providerUri"></code></div>
-      </div>
       <br /><br />
       <div class="row" id="getRootAclDiv" class="hidden">
         <div class="col-md-2">
@@ -64,28 +61,15 @@ <h5>App body</h5>
     init()
     SolidClient.currentUser()
       .then(function (webId) {
-        loginSuccess(webId)
+        if (webId) { loginSuccess(webId) }
       })
   })
 
-  function onMessage (event) {
-    console.log('Auth client received event: ', event)
-    if (!event || !event.data) { return }
-    switch (event.data.event_type) {
-      case 'providerSelected':
-        console.log('Provider selected: ', event.data.value)
-        loginTo(event.data.value)
-        break
-      default:
-        console.error('onMessage - unknown event type: ', event)
-        break
-    }
-  }
-
-  function loginTo (providerUri) {
-    SolidClient.login(providerUri)
+  // This is bound to the Login button
+  function login () {
+    SolidClient.login()
       .then(function (webId) {
-        if (webId) { loginSuccess(webId) }
+        loginSuccess(webId)
       })
       .catch(function (error) {
         console.error('Error logging in:', error)
@@ -102,10 +86,6 @@ <h5>App body</h5>
     document.getElementById(id).addEventListener('click', action)
   }
 
-  function login () {
-    SolidClient.login()
-  }
-
   function loginSuccess (webId) {
     console.log('onLoginSuccess() callback! webId: ', webId)
     hide('noWebId')
@@ -151,14 +131,6 @@ <h5>App body</h5>
     return uri.href
   }
 
-  function providerSelected (providerUri) {
-    setField('webId', '')
-    hide('logoutDiv')
-    hide('getRootAclDiv')
-    show('noWebId')
-    setField('providerUri', providerUri)
-  }
-
   function setField (id, value) {
     var field = document.getElementById(id)
     if (field) {
diff --git a/demo/login_iframe_inline.html b/demo/login_iframe_inline.html
diff --git a/src/provider-select-popup.js b/src/provider-select-popup.js
@@ -17,15 +17,15 @@ module.exports = `<!doctype html>
   </div>
   <div class="row">
     <div class="col-xs-12 text-center" style="padding-top: 2em;">
-      <button type="button" class="btn btn-md btn-primary" id="dbProvider">
-        databox2.com
+      <button type="button" class="btn btn-md btn-primary" id="testProvider">
+        solidtest.space
       </button>
     </div>
   </div>
   <div class="row">
     <div class="col-xs-12 text-center" style="padding-top: 2em;">
       or custom:<br />
-      <input type="text" id="customProviderUri" value="https://" placeholder="databox.me" />
+      <input type="text" id="customProviderUri" value="https://" />
       <button type="button" class="btn btn-md" id="customProvider">Go</button>
     </div>
   </div>
@@ -42,8 +42,8 @@ module.exports = `<!doctype html>
   }
 
   function initEvents () {
-    initButton('dbProvider',
-      function () { selectProvider('https://databox2.com') })
+    initButton('testProvider',
+      function () { selectProvider('https://solidtest.space') })
     initButton('customProvider',
       function () {
         var defaultValue = 'https://'
