Skip to content

Commit

Permalink
fix account error when id token is not found and fix account migration
Browse files Browse the repository at this point in the history
  • Loading branch information
blarfoon committed Nov 18, 2024
1 parent d041c46 commit 4420e7c
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
// packages/mainWindow/vite.config.mjs
import { resolve, join } from "node:path";
import { defineConfig } from "file:///Users/davideceschia/Documents/gitRepos/GDLauncher-Carbon/node_modules/.pnpm/vite@4.5.2_@types+node@20.11.6_less@4.2.0_terser@5.27.0/node_modules/vite/dist/node/index.js";
import solidPlugin from "file:///Users/davideceschia/Documents/gitRepos/GDLauncher-Carbon/node_modules/.pnpm/vite-plugin-solid@2.9.1_@testing-library+jest-dom@5.17.0_solid-js@1.8.15_vite@4.5.2_@types+no_pmzw7f2nprlmdrbn2arr6rg32i/node_modules/vite-plugin-solid/dist/esm/index.mjs";
import Unocss from "file:///Users/davideceschia/Documents/gitRepos/GDLauncher-Carbon/node_modules/.pnpm/unocss@0.62.3_postcss@8.4.35_rollup@4.9.6_vite@5.1.4_@types+node@20.11.6_less@4.2.0_terser@5.27.0_/node_modules/unocss/dist/vite.mjs";

// package.json
var package_default = {
name: "@gd/desktop",
productName: "GDLauncher",
private: true,
description: "GDLauncher Carbon.",
author: "GorillaDevs Inc.",
license: "ARR",
type: "module",
_comment: "DO NOT MANUALLY EDIT THE VERSION",
version: "0.0.0",
main: "dist/main/index.cjs",
scripts: {
dev: "node scripts/watch.mjs",
test: "playwright test",
"build-vite": "node scripts/build.mjs",
"patch-version": "node scripts/monkeypatchVersion.mjs",
"build-electron": "cross-env-shell DEBUG=electron-builder ow-electron-builder --config .electron-builder.config.cjs",

Check failure on line 24 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / windows_x64

Insert `⏎·····`

Check failure on line 24 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / ubuntu_x64

Insert `⏎·····`

Check failure on line 24 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / mac_universal

Insert `⏎·····`
build: "pnpm patch-version && pnpm build-vite && pnpm build-electron",
clean: "node scripts/cleanReleaseFolder.mjs",
lint: 'tsc && eslint --ext .js,.jsx,.ts,.tsx,.mjs,.cjs . && prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}"',
release: "node scripts/releaseDraft.mjs"
},
devDependencies: {
"@formkit/auto-animate": "^0.8.2",
"@gd/config": "workspace:*",
"@gd/core_module": "workspace:*",
"@gd/i18n": "workspace:*",
"@gd/ui": "workspace:*",
"@overwolf/ow-electron": "^31.4.0",
"@overwolf/ow-electron-builder": "^25.0.6",
"@playwright/test": "^1.47.1",
"@rive-app/canvas": "^2.21.5",
"@rspc/client": "^0.2.0",
"@rspc/solid": "^0.2.0",
"@sentry/electron": "^4.23.0",
"@sentry/vite-plugin": "^2.14.2",
"@solid-primitives/deep": "^0.2.3",
"@solid-primitives/keyboard": "^1.2.5",
"@solid-primitives/map": "^0.4.8",
"@solidjs/router": "^0.9.1",
"@tanstack/solid-query": "^5.30.6",
"@tanstack/solid-table": "^8.20.5",
"@tanstack/solid-virtual": "3.4.0",
"@types/marked": "^5.0.2",
"@types/sanitize-html": "^2.9.1",
"@typescript-eslint/parser": "^6.7.3",
"@unocss/eslint-config": "^0.62.3",
chokidar: "^3.5.3",
"date-fns": "^2.30.0",
dotenv: "^16.3.1",
electron: "^31.4.0",
"electron-log": "^5.1.1",
"electron-notarize": "^1.2.2",
"electron-updater": "^6.3.7",
eslint: "^8.31.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-i18next": "6.0.3",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-solid": "^0.14.3",
"fast-xml-parser": "^4.3.6",
"fs-extra": "^11.2.0",
"html-parse-string": "^0.0.9",
jsdom: "^22.1.0",
marked: "^9.0.3",
playwright: "^1.47.1",
prettier: "^3.0.3",
"sanitize-html": "^2.11.0",
"solid-js": "^1.8.15",
"solid-transition-group": "^0.2.3",
typescript: "^5.6.3",
vite: "^4.4.9",
"vite-plugin-solid": "^2.7.0"
},
env: {
"//": "Used in build scripts",
PORT: 3344
}
};

// packages/mainWindow/vite.config.mjs
import { unocssConfig, appVersion } from "file:///Users/davideceschia/Documents/gitRepos/GDLauncher-Carbon/packages/config/dist/index.js";

Check failure on line 88 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / windows_x64

Replace `·unocssConfig,·appVersion·` with `⏎··unocssConfig,⏎··appVersion⏎`

Check failure on line 88 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / ubuntu_x64

Replace `·unocssConfig,·appVersion·` with `⏎··unocssConfig,⏎··appVersion⏎`

Check failure on line 88 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / mac_universal

Replace `·unocssConfig,·appVersion·` with `⏎··unocssConfig,⏎··appVersion⏎`
import { dirname } from "path";
import { fileURLToPath } from "url";
var __vite_injected_original_import_meta_url = "file:///Users/davideceschia/Documents/gitRepos/GDLauncher-Carbon/apps/desktop/packages/mainWindow/vite.config.mjs";

Check failure on line 91 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / windows_x64

Insert `⏎·`

Check failure on line 91 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / ubuntu_x64

Insert `⏎·`

Check failure on line 91 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / mac_universal

Insert `⏎·`
var __dirname = dirname(fileURLToPath(__vite_injected_original_import_meta_url));

Check failure on line 92 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / windows_x64

Replace `fileURLToPath(__vite_injected_original_import_meta_url)` with `⏎··fileURLToPath(__vite_injected_original_import_meta_url)⏎`

Check failure on line 92 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / ubuntu_x64

Replace `fileURLToPath(__vite_injected_original_import_meta_url)` with `⏎··fileURLToPath(__vite_injected_original_import_meta_url)⏎`

Check failure on line 92 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / mac_universal

Replace `fileURLToPath(__vite_injected_original_import_meta_url)` with `⏎··fileURLToPath(__vite_injected_original_import_meta_url)⏎`
var vite_config_default = defineConfig({
mode: process.env.NODE_ENV,
root: __dirname,
plugins: [
Unocss({
...unocssConfig,
rules: [
...unocssConfig.rules,
[
/^bg-img-(.*)$/,
([, d]) => {
const img = d.split("-")[0];
return {
background: process.env.NODE_ENV === "development" ? `url('./assets/images/${img}')` : `url('./images/${img}')`,

Check failure on line 106 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / windows_x64

Replace `·process.env.NODE_ENV·===·"development"·?·`url('./assets/images/${img}')`` with `⏎················process.env.NODE_ENV·===·"development"⏎··················?·`url('./assets/images/${img}')`⏎·················`

Check failure on line 106 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / ubuntu_x64

Replace `·process.env.NODE_ENV·===·"development"·?·`url('./assets/images/${img}')`` with `⏎················process.env.NODE_ENV·===·"development"⏎··················?·`url('./assets/images/${img}')`⏎·················`

Check failure on line 106 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / mac_universal

Replace `·process.env.NODE_ENV·===·"development"·?·`url('./assets/images/${img}')`` with `⏎················process.env.NODE_ENV·===·"development"⏎··················?·`url('./assets/images/${img}')`⏎·················`
"background-size": "cover",
"background-repeat": "no-repeat",
"box-sizing": "border-box"
};
}
],
[
/^content-\[(.*)\]$/,
([, content]) => ({ content: JSON.stringify(content) })
]
]
}),
solidPlugin()
],
assetsInclude: ["**/*.riv"],
envDir: resolve(__dirname, "../../../../"),
define: {
__APP_VERSION__: JSON.stringify(appVersion)
},
base: "./",
optimizeDeps: {
exclude: ["@tanstack/solid-query", "path", "fs", "promises"]
},
build: {
target: "esnext",
emptyOutDir: true,
outDir: "../../dist/mainWindow",
sourcemap: true
},
resolve: {
alias: {
"@": join(__dirname, "src"),
"@package_json": resolve(__dirname, "../../package.json")
}
},
server: {
port: package_default.env.PORT
}
});
export {

Check failure on line 146 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / windows_x64

Replace `⏎··vite_config_default·as·default⏎` with `·vite_config_default·as·default·`

Check failure on line 146 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / ubuntu_x64

Replace `⏎··vite_config_default·as·default⏎` with `·vite_config_default·as·default·`

Check failure on line 146 in apps/desktop/packages/mainWindow/vite.config.mjs.timestamp-1731887386854-66d016c430bb9.mjs

View workflow job for this annotation

GitHub Actions / mac_universal

Replace `⏎··vite_config_default·as·default⏎` with `·vite_config_default·as·default·`
vite_config_default as default
};
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["packages/mainWindow/vite.config.mjs", "package.json"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"/Users/davideceschia/Documents/gitRepos/GDLauncher-Carbon/apps/desktop/packages/mainWindow\";const __vite_injected_original_filename = \"/Users/davideceschia/Documents/gitRepos/GDLauncher-Carbon/apps/desktop/packages/mainWindow/vite.config.mjs\";const __vite_injected_original_import_meta_url = \"file:///Users/davideceschia/Documents/gitRepos/GDLauncher-Carbon/apps/desktop/packages/mainWindow/vite.config.mjs\";import { resolve, join } from \"node:path\";\nimport { defineConfig } from \"vite\";\nimport solidPlugin from \"vite-plugin-solid\";\nimport Unocss from \"unocss/vite\";\nimport pkg from \"../../package.json\";\nimport { unocssConfig, appVersion } from \"@gd/config\";\nimport { dirname } from \"path\";\nimport { fileURLToPath } from \"url\";\n\nconst __dirname = dirname(fileURLToPath(import.meta.url));\n\nexport default defineConfig({\n  mode: process.env.NODE_ENV,\n  root: __dirname,\n  plugins: [\n    Unocss({\n      ...unocssConfig,\n      rules: [\n        ...unocssConfig.rules,\n        [\n          /^bg-img-(.*)$/,\n          ([, d]) => {\n            const img = d.split(\"-\")[0];\n            return {\n              background:\n                process.env.NODE_ENV === \"development\"\n                  ? `url('./assets/images/${img}')`\n                  : `url('./images/${img}')`,\n              \"background-size\": \"cover\",\n              \"background-repeat\": \"no-repeat\",\n              \"box-sizing\": \"border-box\"\n            };\n          }\n        ],\n        [\n          /^content-\\[(.*)\\]$/,\n          ([, content]) => ({ content: JSON.stringify(content) })\n        ]\n      ]\n    }),\n    solidPlugin()\n  ],\n  assetsInclude: [\"**/*.riv\"],\n  envDir: resolve(__dirname, \"../../../../\"),\n  define: {\n    __APP_VERSION__: JSON.stringify(appVersion)\n  },\n  base: \"./\",\n  optimizeDeps: {\n    exclude: [\"@tanstack/solid-query\", \"path\", \"fs\", \"promises\"]\n  },\n  build: {\n    target: \"esnext\",\n    emptyOutDir: true,\n    outDir: \"../../dist/mainWindow\",\n    sourcemap: true\n  },\n  resolve: {\n    alias: {\n      \"@\": join(__dirname, \"src\"),\n      \"@package_json\": resolve(__dirname, \"../../package.json\")\n    }\n  },\n  server: {\n    port: pkg.env.PORT\n  }\n});\n", "{\n  \"name\": \"@gd/desktop\",\n  \"productName\": \"GDLauncher\",\n  \"private\": true,\n  \"description\": \"GDLauncher Carbon.\",\n  \"author\": \"GorillaDevs Inc.\",\n  \"license\": \"ARR\",\n  \"type\": \"module\",\n  \"_comment\": \"DO NOT MANUALLY EDIT THE VERSION\",\n  \"version\": \"0.0.0\",\n  \"main\": \"dist/main/index.cjs\",\n  \"scripts\": {\n    \"dev\": \"node scripts/watch.mjs\",\n    \"test\": \"playwright test\",\n    \"build-vite\": \"node scripts/build.mjs\",\n    \"patch-version\": \"node scripts/monkeypatchVersion.mjs\",\n    \"build-electron\": \"cross-env-shell DEBUG=electron-builder ow-electron-builder --config .electron-builder.config.cjs\",\n    \"build\": \"pnpm patch-version && pnpm build-vite && pnpm build-electron\",\n    \"clean\": \"node scripts/cleanReleaseFolder.mjs\",\n    \"lint\": \"tsc && eslint --ext .js,.jsx,.ts,.tsx,.mjs,.cjs . && prettier --check \\\"**/*.{js,jsx,ts,tsx,mjs,cjs}\\\"\",\n    \"release\": \"node scripts/releaseDraft.mjs\"\n  },\n  \"devDependencies\": {\n    \"@formkit/auto-animate\": \"^0.8.2\",\n    \"@gd/config\": \"workspace:*\",\n    \"@gd/core_module\": \"workspace:*\",\n    \"@gd/i18n\": \"workspace:*\",\n    \"@gd/ui\": \"workspace:*\",\n    \"@overwolf/ow-electron\": \"^31.4.0\",\n    \"@overwolf/ow-electron-builder\": \"^25.0.6\",\n    \"@playwright/test\": \"^1.47.1\",\n    \"@rive-app/canvas\": \"^2.21.5\",\n    \"@rspc/client\": \"^0.2.0\",\n    \"@rspc/solid\": \"^0.2.0\",\n    \"@sentry/electron\": \"^4.23.0\",\n    \"@sentry/vite-plugin\": \"^2.14.2\",\n    \"@solid-primitives/deep\": \"^0.2.3\",\n    \"@solid-primitives/keyboard\": \"^1.2.5\",\n    \"@solid-primitives/map\": \"^0.4.8\",\n    \"@solidjs/router\": \"^0.9.1\",\n    \"@tanstack/solid-query\": \"^5.30.6\",\n    \"@tanstack/solid-table\": \"^8.20.5\",\n    \"@tanstack/solid-virtual\": \"3.4.0\",\n    \"@types/marked\": \"^5.0.2\",\n    \"@types/sanitize-html\": \"^2.9.1\",\n    \"@typescript-eslint/parser\": \"^6.7.3\",\n    \"@unocss/eslint-config\": \"^0.62.3\",\n    \"chokidar\": \"^3.5.3\",\n    \"date-fns\": \"^2.30.0\",\n    \"dotenv\": \"^16.3.1\",\n    \"electron\": \"^31.4.0\",\n    \"electron-log\": \"^5.1.1\",\n    \"electron-notarize\": \"^1.2.2\",\n    \"electron-updater\": \"^6.3.7\",\n    \"eslint\": \"^8.31.0\",\n    \"eslint-config-prettier\": \"^9.0.0\",\n    \"eslint-plugin-i18next\": \"6.0.3\",\n    \"eslint-plugin-prettier\": \"^5.0.0\",\n    \"eslint-plugin-solid\": \"^0.14.3\",\n    \"fast-xml-parser\": \"^4.3.6\",\n    \"fs-extra\": \"^11.2.0\",\n    \"html-parse-string\": \"^0.0.9\",\n    \"jsdom\": \"^22.1.0\",\n    \"marked\": \"^9.0.3\",\n    \"playwright\": \"^1.47.1\",\n    \"prettier\": \"^3.0.3\",\n    \"sanitize-html\": \"^2.11.0\",\n    \"solid-js\": \"^1.8.15\",\n    \"solid-transition-group\": \"^0.2.3\",\n    \"typescript\": \"^5.6.3\",\n    \"vite\": \"^4.4.9\",\n    \"vite-plugin-solid\": \"^2.7.0\"\n  },\n  \"env\": {\n    \"//\": \"Used in build scripts\",\n    \"PORT\": 3344\n  }\n}\n"],
  "mappings": ";AAAkc,SAAS,SAAS,YAAY;AAChe,SAAS,oBAAoB;AAC7B,OAAO,iBAAiB;AACxB,OAAO,YAAY;;;ACHnB;AAAA,EACE,MAAQ;AAAA,EACR,aAAe;AAAA,EACf,SAAW;AAAA,EACX,aAAe;AAAA,EACf,QAAU;AAAA,EACV,SAAW;AAAA,EACX,MAAQ;AAAA,EACR,UAAY;AAAA,EACZ,SAAW;AAAA,EACX,MAAQ;AAAA,EACR,SAAW;AAAA,IACT,KAAO;AAAA,IACP,MAAQ;AAAA,IACR,cAAc;AAAA,IACd,iBAAiB;AAAA,IACjB,kBAAkB;AAAA,IAClB,OAAS;AAAA,IACT,OAAS;AAAA,IACT,MAAQ;AAAA,IACR,SAAW;AAAA,EACb;AAAA,EACA,iBAAmB;AAAA,IACjB,yBAAyB;AAAA,IACzB,cAAc;AAAA,IACd,mBAAmB;AAAA,IACnB,YAAY;AAAA,IACZ,UAAU;AAAA,IACV,yBAAyB;AAAA,IACzB,iCAAiC;AAAA,IACjC,oBAAoB;AAAA,IACpB,oBAAoB;AAAA,IACpB,gBAAgB;AAAA,IAChB,eAAe;AAAA,IACf,oBAAoB;AAAA,IACpB,uBAAuB;AAAA,IACvB,0BAA0B;AAAA,IAC1B,8BAA8B;AAAA,IAC9B,yBAAyB;AAAA,IACzB,mBAAmB;AAAA,IACnB,yBAAyB;AAAA,IACzB,yBAAyB;AAAA,IACzB,2BAA2B;AAAA,IAC3B,iBAAiB;AAAA,IACjB,wBAAwB;AAAA,IACxB,6BAA6B;AAAA,IAC7B,yBAAyB;AAAA,IACzB,UAAY;AAAA,IACZ,YAAY;AAAA,IACZ,QAAU;AAAA,IACV,UAAY;AAAA,IACZ,gBAAgB;AAAA,IAChB,qBAAqB;AAAA,IACrB,oBAAoB;AAAA,IACpB,QAAU;AAAA,IACV,0BAA0B;AAAA,IAC1B,yBAAyB;AAAA,IACzB,0BAA0B;AAAA,IAC1B,uBAAuB;AAAA,IACvB,mBAAmB;AAAA,IACnB,YAAY;AAAA,IACZ,qBAAqB;AAAA,IACrB,OAAS;AAAA,IACT,QAAU;AAAA,IACV,YAAc;AAAA,IACd,UAAY;AAAA,IACZ,iBAAiB;AAAA,IACjB,YAAY;AAAA,IACZ,0BAA0B;AAAA,IAC1B,YAAc;AAAA,IACd,MAAQ;AAAA,IACR,qBAAqB;AAAA,EACvB;AAAA,EACA,KAAO;AAAA,IACL,MAAM;AAAA,IACN,MAAQ;AAAA,EACV;AACF;;;ADxEA,SAAS,cAAc,kBAAkB;AACzC,SAAS,eAAe;AACxB,SAAS,qBAAqB;AAP+P,IAAM,2CAA2C;AAS9U,IAAM,YAAY,QAAQ,cAAc,wCAAe,CAAC;AAExD,IAAO,sBAAQ,aAAa;AAAA,EAC1B,MAAM,QAAQ,IAAI;AAAA,EAClB,MAAM;AAAA,EACN,SAAS;AAAA,IACP,OAAO;AAAA,MACL,GAAG;AAAA,MACH,OAAO;AAAA,QACL,GAAG,aAAa;AAAA,QAChB;AAAA,UACE;AAAA,UACA,CAAC,CAAC,EAAE,CAAC,MAAM;AACT,kBAAM,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC;AAC1B,mBAAO;AAAA,cACL,YACE,QAAQ,IAAI,aAAa,gBACrB,wBAAwB,GAAG,OAC3B,iBAAiB,GAAG;AAAA,cAC1B,mBAAmB;AAAA,cACnB,qBAAqB;AAAA,cACrB,cAAc;AAAA,YAChB;AAAA,UACF;AAAA,QACF;AAAA,QACA;AAAA,UACE;AAAA,UACA,CAAC,CAAC,EAAE,OAAO,OAAO,EAAE,SAAS,KAAK,UAAU,OAAO,EAAE;AAAA,QACvD;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IACD,YAAY;AAAA,EACd;AAAA,EACA,eAAe,CAAC,UAAU;AAAA,EAC1B,QAAQ,QAAQ,WAAW,cAAc;AAAA,EACzC,QAAQ;AAAA,IACN,iBAAiB,KAAK,UAAU,UAAU;AAAA,EAC5C;AAAA,EACA,MAAM;AAAA,EACN,cAAc;AAAA,IACZ,SAAS,CAAC,yBAAyB,QAAQ,MAAM,UAAU;AAAA,EAC7D;AAAA,EACA,OAAO;AAAA,IACL,QAAQ;AAAA,IACR,aAAa;AAAA,IACb,QAAQ;AAAA,IACR,WAAW;AAAA,EACb;AAAA,EACA,SAAS;AAAA,IACP,OAAO;AAAA,MACL,KAAK,KAAK,WAAW,KAAK;AAAA,MAC1B,iBAAiB,QAAQ,WAAW,oBAAoB;AAAA,IAC1D;AAAA,EACF;AAAA,EACA,QAAQ;AAAA,IACN,MAAM,gBAAI,IAAI;AAAA,EAChB;AACF,CAAC;",
  "names": []
}

Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ALTER TABLE "new_AppConfiguration" RENAME TO "AppConfiguration";
CREATE UNIQUE INDEX "AppConfiguration_id_key" ON "AppConfiguration"("id");

-- reset since azure app id changed
UPDATE "Account" SET "accessToken" = NULL, "tokenExpires" = NULL, "msRefreshToken" = NULL, "idToken" = NULL;
UPDATE "Account" SET "accessToken" = "invalid", "msRefreshToken" = "invalid", "idToken" = "invalid";

PRAGMA foreign_key_check;
PRAGMA foreign_keys=ON;
14 changes: 7 additions & 7 deletions crates/carbon_app/src/managers/account/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ impl<'s> ManagerRef<'s, AccountManager> {
))?
.id_token
else {
bail!("attempted to get an account that does not exist");
bail!("this account is present in the db but the id_token is missing. Presumably offline account. (uuid: {uuid})");
};

info!("Waiting for account validation");
Expand All @@ -232,7 +232,7 @@ impl<'s> ManagerRef<'s, AccountManager> {
))?
.id_token
else {
bail!("attempted to get an account that does not exist");
bail!("this account is present in the db but the id_token is missing. Presumably offline account. (uuid: {uuid})");
};

let account = self.gdl_account_task.read().await;
Expand All @@ -257,7 +257,7 @@ impl<'s> ManagerRef<'s, AccountManager> {
.id_token
else {
return Err(RequestGDLAccountDeletionError::RequestFailed(
anyhow::anyhow!("attempted to get an account that does not exist"),
anyhow::anyhow!("this account is present in the db but the id_token is missing. Presumably offline account. (uuid: {uuid})")
));
};

Expand Down Expand Up @@ -294,7 +294,7 @@ impl<'s> ManagerRef<'s, AccountManager> {
))?
.id_token
else {
bail!("attempted to get an account that does not exist");
bail!("this account is present in the db but the id_token is missing. Presumably offline account. (uuid: {uuid})");
};

let lock = self.gdl_account_task.write().await;
Expand Down Expand Up @@ -354,7 +354,7 @@ impl<'s> ManagerRef<'s, AccountManager> {
))?
.id_token
else {
bail!("attempted to get an account that does not exist");
bail!("this account is present in the db but the id_token is missing. Presumably offline account. (uuid: {saved_gdl_account_uuid})")
};

let Some(user) = self
Expand Down Expand Up @@ -386,7 +386,7 @@ impl<'s> ManagerRef<'s, AccountManager> {
.id_token
else {
return Err(RequestNewVerificationTokenError::RequestFailed(
anyhow::anyhow!("attempted to get an account that does not exist"),
anyhow::anyhow!("this account is present in the db but the id_token is missing. Presumably offline account. (uuid: {uuid})")
));
};

Expand Down Expand Up @@ -419,7 +419,7 @@ impl<'s> ManagerRef<'s, AccountManager> {
.id_token
else {
return Err(RequestNewEmailChangeError::RequestFailed(anyhow::anyhow!(
"attempted to get an account that does not exist"
"this account is present in the db but the id_token is missing. Presumably offline account. (uuid: {uuid})"
)));
};

Expand Down

0 comments on commit 4420e7c

Please sign in to comment.