WIP PWA for Grain
fix: ensure user DID is available for notifications query
+7
-5
+4
-2
src/services/auth.js
+4
-2
src/services/auth.js
···
30
30
}
31
31
32
32
async #loadUser() {
33
-
const { did } = this.#client.getUser();
33
+
const clientUser = this.#client.getUser();
34
+
const did = clientUser?.did || clientUser?.sub;
34
35
const result = await this.#client.query(`
35
36
query {
36
37
viewer {
38
+
did
37
39
handle
38
40
socialGrainActorProfileByDid {
39
41
displayName
···
45
47
const viewer = result.viewer;
46
48
const grainProfile = viewer?.socialGrainActorProfileByDid;
47
49
this.#user = {
48
-
did,
50
+
did: did || viewer?.did,
49
51
handle: viewer?.handle,
50
52
displayName: grainProfile?.displayName || '',
51
53
avatar: grainProfile?.avatar || null
+3
-3
src/services/grain-api.js
+3
-3
src/services/grain-api.js
···
557
557
558
558
async getNotifications(viewerDid, { first = 20, after = null } = {}) {
559
559
const query = `
560
-
query Notifications($viewerDid: String!, $first: Int, $after: String) {
561
-
notifications(viewerDid: $viewerDid, first: $first, after: $after) {
560
+
query Notifications($first: Int, $after: String) {
561
+
notifications(viewerDid: "${viewerDid}", first: $first, after: $after) {
562
562
edges {
563
563
node {
564
564
__typename
···
683
683
}
684
684
`;
685
685
686
-
const response = await this.#execute(query, { viewerDid, first, after });
686
+
const response = await this.#execute(query, { first, after });
687
687
return this.#transformNotificationsResponse(response, viewerDid);
688
688
}
689
689