feat: 🎸 getSessionCookie and removed News object (#24)
* feat: 🎸 getSessionCookie ✅ Closes: #22 * feat: 🎸 Removed unnecessary News object wrapper BREAKING CHANGE: 🧨 Call signature of getNews changed ✅ Closes: #23
This commit is contained in:
parent
18434e0cde
commit
91ba6833b4
|
@ -42,6 +42,7 @@ const api = init(fetch, () => cookieJar.removeAllCookies());
|
||||||
api.on("login", async () => {
|
api.on("login", async () => {
|
||||||
// do stuff
|
// do stuff
|
||||||
console.log(api.isLoggedIn) // true
|
console.log(api.isLoggedIn) // true
|
||||||
|
console.log(api.getSessionCookie) // session cookie if you want to save it
|
||||||
await api.logout()
|
await api.logout()
|
||||||
});
|
});
|
||||||
api.on('logout', () => {
|
api.on('logout', () => {
|
||||||
|
@ -90,6 +91,10 @@ const menu = await api.getMenu(children[0])
|
||||||
|
|
||||||
// Get notifications
|
// Get notifications
|
||||||
const notifications = await api.getNotifications(children[0])
|
const notifications = await api.getNotifications(children[0])
|
||||||
|
|
||||||
|
// Get image
|
||||||
|
const blob = await api.getImage(news[0].imageUrl)
|
||||||
|
const src = URL.createObjectURL(blob)
|
||||||
```
|
```
|
||||||
|
|
||||||
### Setting session cookie
|
### Setting session cookie
|
||||||
|
|
10
lib/index.ts
10
lib/index.ts
|
@ -4,12 +4,12 @@ import {
|
||||||
checkStatus, getSessionCookie, login, LoginStatus,
|
checkStatus, getSessionCookie, login, LoginStatus,
|
||||||
} from './login'
|
} from './login'
|
||||||
import {
|
import {
|
||||||
CalendarItem, Child, Classmate, Fetch, MenuItem, RequestInit,
|
CalendarItem, Child, Classmate, Fetch, MenuItem, NewsItem, RequestInit,
|
||||||
} from './types'
|
} from './types'
|
||||||
import {
|
import {
|
||||||
calendar, classmates, list, menu, notifications, schedule,
|
calendar, classmates, list, menu, notifications, schedule,
|
||||||
} from './children'
|
} from './children'
|
||||||
import { news, News } from './news'
|
import { news } from './news'
|
||||||
import { user } from './user'
|
import { user } from './user'
|
||||||
import { image } from './image'
|
import { image } from './image'
|
||||||
|
|
||||||
|
@ -30,6 +30,10 @@ export class Api extends EventEmitter {
|
||||||
this.clearCookies = clearCookies
|
this.clearCookies = clearCookies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getSessionCookie() {
|
||||||
|
return this.session?.headers?.Cookie
|
||||||
|
}
|
||||||
|
|
||||||
setSessionCookie(cookie: string) {
|
setSessionCookie(cookie: string) {
|
||||||
this.session = {
|
this.session = {
|
||||||
headers: {
|
headers: {
|
||||||
|
@ -76,7 +80,7 @@ export class Api extends EventEmitter {
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|
||||||
async getNews(child: Child): Promise<News> {
|
async getNews(child: Child): Promise<NewsItem[]> {
|
||||||
const data = await news(this.fetch, this.session)(child.id)
|
const data = await news(this.fetch, this.session)(child.id)
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|
12
lib/news.ts
12
lib/news.ts
|
@ -2,17 +2,9 @@ import { etjanst, newsItem } from './parse'
|
||||||
import routes from './routes'
|
import routes from './routes'
|
||||||
import { Fetch, NewsItem, RequestInit } from './types'
|
import { Fetch, NewsItem, RequestInit } from './types'
|
||||||
|
|
||||||
export class News {
|
export const news = (fetch: Fetch, init?: RequestInit) => async (childId: string): Promise<NewsItem[]> => {
|
||||||
public items: NewsItem[]
|
|
||||||
|
|
||||||
constructor(items: NewsItem[]) {
|
|
||||||
this.items = items
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const news = (fetch: Fetch, init?: RequestInit) => async (childId: string): Promise<News> => {
|
|
||||||
const url = routes.news(childId)
|
const url = routes.news(childId)
|
||||||
const response = await fetch(url, init)
|
const response = await fetch(url, init)
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
return new News(etjanst(data).newsItems.map(newsItem))
|
return etjanst(data).newsItems.map(newsItem)
|
||||||
}
|
}
|
||||||
|
|
8
run.js
8
run.js
|
@ -28,6 +28,8 @@ async function run() {
|
||||||
api.on('login', async () => {
|
api.on('login', async () => {
|
||||||
console.log('Logged in')
|
console.log('Logged in')
|
||||||
|
|
||||||
|
console.log(api.getSessionCookie())
|
||||||
|
|
||||||
// console.log('user')
|
// console.log('user')
|
||||||
// const user = await api.getUser()
|
// const user = await api.getUser()
|
||||||
// console.log(user)
|
// console.log(user)
|
||||||
|
@ -52,9 +54,9 @@ async function run() {
|
||||||
const news = await api.getNews(children[0])
|
const news = await api.getNews(children[0])
|
||||||
console.log(news)
|
console.log(news)
|
||||||
|
|
||||||
console.log('image')
|
// console.log('image')
|
||||||
const blob = await api.getImage(news.items[0].imageUrl)
|
// const blob = await api.getImage(news[0].imageUrl)
|
||||||
console.log(blob)
|
// console.log(blob)
|
||||||
|
|
||||||
// const arrayBuffer = await blob.arrayBuffer()
|
// const arrayBuffer = await blob.arrayBuffer()
|
||||||
// console.log(`data:${blob.type};base64,${Buffer.from(arrayBuffer).toString('base64')}`)
|
// console.log(`data:${blob.type};base64,${Buffer.from(arrayBuffer).toString('base64')}`)
|
||||||
|
|
Loading…
Reference in New Issue