@knowlearning/agents 0.5.13 → 0.6.0

package/agents/browser/auth.js

@@ -0,0 +1,80 @@
+const client_id = '603559646501-i29ma3u7c590ijimgp809vpdhg52jibd.apps.googleusercontent.com'
+const redirect_uri = 'https://localhost:5173/callback'
+const authEndpoint = 'https://accounts.google.com/o/oauth2/auth'
+const tokenEndpoint = 'https://oauth2.googleapis.com/token'
+
+if (window.location.pathname === '/callback') {
+  const hashParams = parseHash(window.location.hash)
+
+  if (hashParams.access_token && hashParams.id_token) {
+    localStorage.setItem('access_token', hashParams.access_token)
+    localStorage.setItem('id_token', hashParams.id_token)
+  }
+
+  window.location = '/'
+}
+
+
+// Functions
+function parseHash(hash) {
+    const params = hash.substr(1).split('&')
+    const result = {}
+    params.forEach(param => {
+        const parts = param.split('=')
+        result[parts[0]] = parts[1]
+    })
+    return result
+}
+
+function login() {
+    const nonce = Math.random().toString(36).substring(2)
+    const state = Math.random().toString(36).substring(2)
+    localStorage.setItem('oidc_nonce', nonce)
+    localStorage.setItem('oidc_state', state)
+
+    const query = {
+      client_id,
+      redirect_uri,
+      prompt: 'select_account',
+      response_type: "id_token token",
+      scope: "openid profile",
+      nonce,
+      state
+    }
+
+    const queryString = (
+      Object
+        .entries(query)
+        .map(([k,v]) => `${k}=${v}`)
+        .join('&')
+    )
+
+    window.location.href = `${authEndpoint}?${queryString}`
+}
+
+function logout() {
+    localStorage.removeItem('access_token')
+    localStorage.removeItem('id_token')
+    localStorage.removeItem('oidc_nonce')
+    localStorage.removeItem('oidc_state')
+    window.location.reload()
+}
+
+async function getToken() {
+  const token = localStorage.getItem('id_token')
+  if (token) return token
+  else {
+    const randArr = new Uint32Array(16)
+    crypto.getRandomValues(randArr)
+    const anonymousCredential = [...randArr].map(x => x.toString(16).padStart(2, '0')).join('')
+    localStorage.setItem('id_token', anonymousCredential)
+    return anonymousCredential
+  }
+}
+
+export {
+  getToken,
+  login,
+  logout
+}
+

package/agents/browser/root.js

@@ -1,6 +1,6 @@
 import { v1 as uuid } from 'uuid'
 import { applyPatch } from 'fast-json-patch'
-import { onAuth, login, logout } from './firebase-auth.js'
+import { getToken, login, logout } from './auth.js'
 import GenericAgent from '../generic.js'
 
 const DEVELOPMENT_HOST = 'localhost:32001'
@@ -8,15 +8,13 @@ const REMOTE_HOST = 'api.knowlearning.systems'
 
 function isLocal() { return localStorage.getItem('api') === 'local' }
 
-const getIdTokenPromise = new Promise(r => onAuth(({ getIdToken }) => r(getIdToken)))
-
 export default () => {
   const { host, protocol } = window.location
 
   const agent = GenericAgent({
     host: isLocal() ? DEVELOPMENT_HOST : REMOTE_HOST,
     protocol: protocol === 'https:' ? 'wss' : 'ws',
-    token: () => getIdTokenPromise.then(f => f(true)),
+    token: getToken,
     WebSocket,
     uuid,
     fetch,

package/agents/generic.js

@@ -178,7 +178,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
 
               if (states[message.scope].active === undefined) states[message.scope].active = {}
               applyPatch(states[message.scope], standardJSONPatch(message.patch.slice(lastResetPatchIndex + 1)))
-              watchers[message.scope].forEach(fn => fn({ ...message, state: states[message.scope] }))
+              watchers[message.scope].forEach(fn => fn({ ...message, state: states[message.scope].active }))
               if (sub) sub.ii = message.ii
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowlearning/agents",
-  "version": "0.5.13",
+  "version": "0.6.0",
   "description": "API for embedding applications in KnowLearning systems.",
   "main": "node.js",
   "browser": "browser.js",
@@ -23,10 +23,7 @@
   },
   "homepage": "https://github.com/knowlearning/core#readme",
   "dependencies": {
-    "@firebase/app": "^0.9.14",
-    "@firebase/auth": "^1.0.0",
     "fast-json-patch": "^3.1.1",
-    "node-fetch": "^3.3.1",
     "uuid": "^8.3.2"
   }
 }

package/agents/browser/firebase-auth.js

@@ -1,60 +0,0 @@
-import { initializeApp } from '@firebase/app'
-import {
-  getAuth,
-  signOut as firebaseSignOut,
-  GoogleAuthProvider,
-  OAuthProvider,
-  onAuthStateChanged,
-  signInWithRedirect,
-  signInWithEmailAndPassword,
-  signInAnonymously
-} from '@firebase/auth'
-
-initializeApp({
-  "apiKey": "AIzaSyAxjYuF-2JmXxlXnGgNu2CO4Q41EAtUgrY",
-  "authDomain": "opensourcelearningplatform.firebaseapp.com",
-  "databaseURL": "https://opensourcelearningplatform.firebaseio.com",
-  "projectId": "opensourcelearningplatform",
-  "storageBucket": "opensourcelearningplatform.appspot.com",
-  "messagingSenderId": "831020253582",
-  "appId: 1:831020253582": "web:6e1dfc6e89f5c2107164df",
-  "measurementId": "G-8QD6034RJ0"
-})
-
-let currentUser
-const authClient = getAuth()
-const onAuth = fn => onAuthStateChanged(authClient, user => {
-  if (!user) signInAnonymously(authClient)
-  else if (user.uid !== currentUser) {
-    const { uid } = user
-    currentUser = uid
-    const provider = user.isAnonymous ? 'anonymous' : user.providerData[0].providerId
-    fn({ user: uid, provider, getIdToken: () => user.getIdToken() })
-  }
-})
-
-const authProviders = {
-  google: () => new GoogleAuthProvider(),
-  microsoft: () => new OAuthProvider('microsoft.com')
-}
-
-const login = async (provider, username, password) => {
-  if (authProviders[provider]) {
-    signInWithRedirect(authClient, authProviders[provider]())
-    return { success: true }
-  }
-  else if (provider === 'email') {
-    try {
-      await signInWithEmailAndPassword(authClient, username, password)
-      location.reload()
-    }
-    catch (error) { return { success: false } }
-  }
-}
-
-const logout = async () => {
-  await firebaseSignOut(authClient)
-  location.reload()
-}
-
-export { onAuth, login, logout }