Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for oidc #2571

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/components/LoginPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
<div>
<a v-t="'titles.login'" class="btn w-auto" @click="login" />
</div>
<ul class="children:pb-3">
<li v-for="provider in oidcProviders" :key="provider.name">
<a class="btn" :href="provider.authUri">Login with {{ provider.name }}</a>
</li>
</ul>
</form>
</div>
</template>
Expand All @@ -41,10 +46,17 @@ export default {
return {
username: null,
password: null,
oidcProviders: null,
};
},
mounted() {
//TODO: Add Server Side check
const session = this.$route.query.session;
if (session) {
this.setPreference("authToken" + this.hashCode(this.authApiUrl()), session);
this.setPreference("isOidcLogin", true);
window.location = import.meta.env.BASE_URL;
}
this.fetchConfig();
if (this.getAuthToken()) {
this.$router.push(import.meta.env.BASE_URL);
}
Expand All @@ -53,6 +65,16 @@ export default {
document.title = this.$t("titles.login") + " - Piped";
},
methods: {
async fetchConfig() {
this.fetchJson(this.apiUrl() + "/config").then(config => {
this.oidcProviders = config?.oidcProviders.map(name => {
return {
name,
authUri: `${this.authApiUrl()}/oidc/${name}/login?redirect=${window.location.origin}/login`,
};
});
});
},
login() {
if (!this.username || !this.password) return;
this.fetchJson(this.authApiUrl() + "/login", null, {
Expand Down
19 changes: 19 additions & 0 deletions src/components/PreferencesPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@
<strong v-t="'actions.delete_account'" />
<div class="flex items-center">
<input
v-if="!isOidcLogin"
id="txtDeleteAccountPassword"
ref="txtDeleteAccountPassword"
v-model="password"
Expand Down Expand Up @@ -415,6 +416,7 @@ export default {
},
data() {
return {
isOidcLogin: false,
mobileChapterLayout: "Vertical",
selectedInstance: null,
authInstance: false,
Expand Down Expand Up @@ -527,14 +529,22 @@ export default {
document.title = this.$t("titles.preferences") + " - Piped";
},
async mounted() {
const deleted = this.$route.query.deleted;
if (deleted) {
this.logout();
}
if (Object.keys(this.$route.query).length > 0) this.$router.replace({ query: {} });

const token = this.getAuthToken();
if (token && this.$route.query.deleted == token) this.logout();

this.fetchInstances();

if (this.testLocalStorage) {
this.selectedInstance = this.getPreferenceString("instance", import.meta.env.VITE_PIPED_API);
this.authInstance = this.getPreferenceBoolean("authInstance", false);
this.selectedAuthInstance = this.getPreferenceString("auth_instance_url", this.selectedInstance);
this.isOidcLogin = this.getPreferenceBoolean("isOidcLogin", false);

this.sponsorBlock = this.getPreferenceBoolean("sponsorblock", true);
var skipOptions, skipList;
Expand Down Expand Up @@ -668,6 +678,13 @@ export default {
return "https://www.ssllabs.com/ssltest/analyze.html?d=" + new URL(url).host + "&latest";
},
async deleteAccount() {
if (this.getPreferenceBoolean("isOidcLogin", false)) {
const url = new URL("/user/delete", this.authApiUrl());
url.searchParams.append("session", this.getAuthToken());
url.searchParams.append("redirect", `${window.location.origin}/preferences`);
window.location = url.href;
return;
}
this.fetchJson(this.authApiUrl() + "/user/delete", null, {
method: "POST",
headers: {
Expand All @@ -685,6 +702,8 @@ export default {
logout() {
// reset the auth token
localStorage.removeItem("authToken" + this.hashCode(this.authApiUrl()));
// Remove oidc state
localStorage.removeItem("isOidcLogin");
// redirect to trending page
window.location = import.meta.env.BASE_URL;
},
Expand Down
Loading